diff options
| author | Jon Skeet <jonskeet@google.com> | 2017-11-10 09:50:02 +0000 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2017-11-12 15:29:15 +0000 |
| commit | aa77eab622fe0ccc6cf7ec8a3fce1005dd759562 (patch) | |
| tree | 20ecf0bcb607b2c3661f91b476e21478ba93d10d /Makefile.am | |
| parent | 9a9a66e71557a5b19c96677eb26f97067c0a06d6 (diff) | |
| download | protobuf-aa77eab622fe0ccc6cf7ec8a3fce1005dd759562.tar.gz protobuf-aa77eab622fe0ccc6cf7ec8a3fce1005dd759562.tar.bz2 protobuf-aa77eab622fe0ccc6cf7ec8a3fce1005dd759562.zip | |
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#.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
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 \ |