From aa77eab622fe0ccc6cf7ec8a3fce1005dd759562 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Fri, 10 Nov 2017 09:50:02 +0000 Subject: Move C#-only test protos to csharp/protos unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#. --- Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index cd1cfc3e..fa652ee5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,8 +61,13 @@ csharp_EXTRA_DIST= \ csharp/keys/Google.Protobuf.public.snk \ csharp/keys/Google.Protobuf.snk \ csharp/keys/README.md \ + csharp/protos/README.md \ + csharp/protos/map_unittest_proto3.proto \ csharp/protos/unittest_custom_options_proto3.proto \ + csharp/protos/unittest_import_public_proto3.proto \ + csharp/protos/unittest_import_proto3.proto \ csharp/protos/unittest_issues.proto \ + csharp/protos/unittest_proto3.proto \ csharp/src/AddressBook/AddPerson.cs \ csharp/src/AddressBook/Addressbook.cs \ csharp/src/AddressBook/AddressBook.csproj \ -- cgit v1.2.3