From a85c4a329917f641b98bf71723285ccae14f2a8f Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Wed, 30 Oct 2019 14:10:36 -0500 Subject: [PATCH 1/9] Move generated test code to a seperate lib --- csharp/generate_protos.sh | 2 +- .../ForeignMessagePartial.cs | 0 .../Google.Protobuf.Test.CodeGen.csproj | 15 +++++++++++++++ .../MapUnittestProto3.cs | 0 .../TestMessagesProto2.cs | 0 .../TestMessagesProto3.cs | 0 .../Unittest.cs | 0 .../UnittestCustomOptionsProto3.cs | 0 .../UnittestImport.cs | 0 .../UnittestImportProto3.cs | 0 .../UnittestImportPublic.cs | 0 .../UnittestImportPublicProto3.cs | 0 .../UnittestIssues.cs | 0 .../UnittestProto3.cs | 0 .../UnittestWellKnownTypes.cs | 0 .../Google.Protobuf.Test.csproj | 1 + 16 files changed, 17 insertions(+), 1 deletion(-) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/ForeignMessagePartial.cs (100%) create mode 100644 csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/MapUnittestProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/TestMessagesProto2.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/TestMessagesProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/Unittest.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestCustomOptionsProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestImport.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestImportProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestImportPublic.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestImportPublicProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestIssues.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/UnittestWellKnownTypes.cs (100%) diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index 1083d671c1d6..b37bdc6134fc 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -45,7 +45,7 @@ $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf \ # and old_extensions2.proto, which are generated with an older version # of protoc. $PROTOC -Isrc -Icsharp/protos \ - --csharp_out=csharp/src/Google.Protobuf.Test/TestProtos \ + --csharp_out=csharp/src/Google.Protobuf.Test.CodeGen \ --descriptor_set_out=csharp/src/Google.Protobuf.Test/testprotos.pb \ --include_source_info \ --include_imports \ diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs b/csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj b/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj new file mode 100644 index 000000000000..dd4cd84e56b9 --- /dev/null +++ b/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj @@ -0,0 +1,15 @@ + + + + net451;netstandard1.0 + ../../keys/Google.Protobuf.snk + true + true + False + + + + + + + diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs b/csharp/src/Google.Protobuf.Test.CodeGen/MapUnittestProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/MapUnittestProto3.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto2.cs b/csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto2.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto2.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto2.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs b/csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto3.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/Unittest.cs b/csharp/src/Google.Protobuf.Test.CodeGen/Unittest.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/Unittest.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/Unittest.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestCustomOptionsProto3.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestCustomOptionsProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestCustomOptionsProto3.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestCustomOptionsProto3.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImport.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImport.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestImport.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestImport.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportProto3.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublic.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublic.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublic.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublic.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublicProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublicProto3.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestIssues.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestIssues.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestProto3.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs b/csharp/src/Google.Protobuf.Test.CodeGen/UnittestWellKnownTypes.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/UnittestWellKnownTypes.cs diff --git a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj index 7fff91283b90..102c7acf2b7a 100644 --- a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj +++ b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj @@ -10,6 +10,7 @@ + From 63780dfb281681a87203b7ce2ff2237725941a04 Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Mon, 4 Nov 2019 12:45:43 -0600 Subject: [PATCH 2/9] Rebase on master --- .../TestProtos => Google.Protobuf.Test.CodeGen}/OldExtensions1.cs | 0 .../TestProtos => Google.Protobuf.Test.CodeGen}/OldExtensions2.cs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/OldExtensions1.cs (100%) rename csharp/src/{Google.Protobuf.Test/TestProtos => Google.Protobuf.Test.CodeGen}/OldExtensions2.cs (100%) diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/OldExtensions1.cs b/csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions1.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/OldExtensions1.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions1.cs diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/OldExtensions2.cs b/csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions2.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test/TestProtos/OldExtensions2.cs rename to csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions2.cs From 2bb49712aa6bdb17503c481c2bed52fe479515ad Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Mon, 4 Nov 2019 12:47:56 -0600 Subject: [PATCH 3/9] Add comment to summarize project Set lang version to C# 3.0 Add .NET Standard 2.0 target Fix partial diagnostic string since it requires C# 6 --- .../Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs | 2 +- .../Google.Protobuf.Test.CodeGen.csproj | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs b/csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs index 5663a69902e5..909bcea96e59 100644 --- a/csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs +++ b/csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs @@ -39,7 +39,7 @@ public partial class ForeignMessage : ICustomDiagnosticMessage { public string ToDiagnosticString() { - return $"{{ \"c\": {C}, \"@cInHex\": \"{C:x}\" }}"; + return string.Format("{{ \"c\": {0}, \"@cInHex\": \"{0:x}\" }}", C); } } } diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj b/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj index dd4cd84e56b9..d756b0f75702 100644 --- a/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj +++ b/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj @@ -1,7 +1,13 @@ + - net451;netstandard1.0 + net451;netstandard1.0;netstandard2.0 + 3.0 ../../keys/Google.Protobuf.snk true true From 7e4be173ad42890ccdd7efb623f9f2d24a056bb4 Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Mon, 4 Nov 2019 12:48:18 -0600 Subject: [PATCH 4/9] Move generated files in Makefile.am --- Makefile.am | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index 755355f421c7..b7b0051d9ae1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,21 +127,21 @@ csharp_EXTRA_DIST= \ csharp/src/Google.Protobuf.Test/SampleMessages.cs \ csharp/src/Google.Protobuf.Test/SampleNaNs.cs \ csharp/src/Google.Protobuf.Test/TestCornerCases.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/OldExtensions1.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/OldExtensions2.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto2.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestCustomOptionsProto3.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublic.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestImport.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs \ - csharp/src/Google.Protobuf.Test/TestProtos/Unittest.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/MapUnittestProto3.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions1.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions2.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto2.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto3.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestCustomOptionsProto3.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportProto3.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublicProto3.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublic.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestImport.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestIssues.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestProto3.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/UnittestWellKnownTypes.cs \ + csharp/src/Google.Protobuf.Test.CodeGen/Unittest.cs \ csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs \ csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs \ csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs \ From 8da87c620283d57e438dd330f2bea4a92e771e8d Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Tue, 5 Nov 2019 16:44:10 -0600 Subject: [PATCH 5/9] Rename Google.Protobuf.Test.CodeGen to Google.Protobuf.Test.TestProtos --- .../ForeignMessagePartial.cs | 0 .../Google.Protobuf.Test.TestProtos.csproj} | 5 +++++ .../MapUnittestProto3.cs | 0 .../OldExtensions1.cs | 0 .../OldExtensions2.cs | 0 .../TestMessagesProto2.cs | 0 .../TestMessagesProto3.cs | 0 .../Unittest.cs | 0 .../UnittestCustomOptionsProto3.cs | 0 .../UnittestImport.cs | 0 .../UnittestImportProto3.cs | 0 .../UnittestImportPublic.cs | 0 .../UnittestImportPublicProto3.cs | 0 .../UnittestIssues.cs | 0 .../UnittestProto3.cs | 0 .../UnittestWellKnownTypes.cs | 0 csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj | 2 +- 17 files changed, 6 insertions(+), 1 deletion(-) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/ForeignMessagePartial.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj => Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj} (75%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/MapUnittestProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/OldExtensions1.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/OldExtensions2.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/TestMessagesProto2.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/TestMessagesProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/Unittest.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestCustomOptionsProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestImport.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestImportProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestImportPublic.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestImportPublicProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestIssues.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestProto3.cs (100%) rename csharp/src/{Google.Protobuf.Test.CodeGen => Google.Protobuf.Test.TestProtos}/UnittestWellKnownTypes.cs (100%) diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs b/csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj b/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj similarity index 75% rename from csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj rename to csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj index d756b0f75702..4de9fe6723b6 100644 --- a/csharp/src/Google.Protobuf.Test.CodeGen/Google.Protobuf.Test.CodeGen.csproj +++ b/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj @@ -14,6 +14,11 @@ False + + + + + diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/MapUnittestProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/MapUnittestProto3.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions1.cs b/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions1.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions2.cs b/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions2.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions2.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions2.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto2.cs b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto2.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto3.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/Unittest.cs b/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/Unittest.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestCustomOptionsProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestCustomOptionsProto3.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImport.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestImport.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportProto3.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublic.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublic.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublicProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublicProto3.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestIssues.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestIssues.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestProto3.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs diff --git a/csharp/src/Google.Protobuf.Test.CodeGen/UnittestWellKnownTypes.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs similarity index 100% rename from csharp/src/Google.Protobuf.Test.CodeGen/UnittestWellKnownTypes.cs rename to csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs diff --git a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj index 102c7acf2b7a..1a7953d6b786 100644 --- a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj +++ b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj @@ -10,7 +10,7 @@ - + From a70c796988cdcb6185596ad50113e380dc357f8b Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Tue, 5 Nov 2019 16:44:24 -0600 Subject: [PATCH 6/9] Add project to solution --- csharp/src/Google.Protobuf.sln | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/csharp/src/Google.Protobuf.sln b/csharp/src/Google.Protobuf.sln index 262a43b78f3b..b571e53c12eb 100644 --- a/csharp/src/Google.Protobuf.sln +++ b/csharp/src/Google.Protobuf.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26114.2 MinimumVisualStudioVersion = 10.0.40219.1 @@ -14,6 +14,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf.JsonDump", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Protobuf.Benchmarks", "Google.Protobuf.Benchmarks\Google.Protobuf.Benchmarks.csproj", "{D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Protobuf.Test.TestProtos", "Google.Protobuf.Test.TestProtos\Google.Protobuf.Test.TestProtos.csproj", "{ADF24BEB-A318-4530-8448-356B72B820EA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,6 +46,10 @@ Global {D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}.Debug|Any CPU.Build.0 = Debug|Any CPU {D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}.Release|Any CPU.ActiveCfg = Release|Any CPU {D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}.Release|Any CPU.Build.0 = Release|Any CPU + {ADF24BEB-A318-4530-8448-356B72B820EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADF24BEB-A318-4530-8448-356B72B820EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADF24BEB-A318-4530-8448-356B72B820EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADF24BEB-A318-4530-8448-356B72B820EA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 51fa766baa89f3e32362ff6f7a2571128b7b5a53 Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Thu, 7 Nov 2019 15:08:52 -0600 Subject: [PATCH 7/9] Fix typos Bring .NET Framework target down to 4.5 Rename project in comment --- .../Google.Protobuf.Test.TestProtos.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj b/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj index 4de9fe6723b6..5b705804aa27 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj +++ b/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj @@ -1,12 +1,12 @@ - net451;netstandard1.0;netstandard2.0 + net45;netstandard1.0;netstandard2.0 3.0 ../../keys/Google.Protobuf.snk true From b84929f7fbb775770e0afef58ef2b6081ab5eea5 Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Fri, 8 Nov 2019 08:41:26 -0600 Subject: [PATCH 8/9] Rename .CodeGen to .TestProtos in Makefile and script --- Makefile.am | 30 +++++++++++++++--------------- csharp/generate_protos.sh | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index b7b0051d9ae1..746b7fde7f5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,21 +127,21 @@ csharp_EXTRA_DIST= \ csharp/src/Google.Protobuf.Test/SampleMessages.cs \ csharp/src/Google.Protobuf.Test/SampleNaNs.cs \ csharp/src/Google.Protobuf.Test/TestCornerCases.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/ForeignMessagePartial.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/MapUnittestProto3.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions1.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/OldExtensions2.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto2.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/TestMessagesProto3.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestCustomOptionsProto3.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportProto3.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublicProto3.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestImportPublic.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestImport.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestIssues.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestProto3.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/UnittestWellKnownTypes.cs \ - csharp/src/Google.Protobuf.Test.CodeGen/Unittest.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions2.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs \ csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs \ csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs \ csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs \ diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index b37bdc6134fc..66d87c02f711 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -45,7 +45,7 @@ $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf \ # and old_extensions2.proto, which are generated with an older version # of protoc. $PROTOC -Isrc -Icsharp/protos \ - --csharp_out=csharp/src/Google.Protobuf.Test.CodeGen \ + --csharp_out=csharp/src/Google.Protobuf.Test.TestProtos \ --descriptor_set_out=csharp/src/Google.Protobuf.Test/testprotos.pb \ --include_source_info \ --include_imports \ From cbafc68d9e7e4bb6cedf966fd6240fc27ebd5908 Mon Sep 17 00:00:00 2001 From: Sydney Acksman Date: Mon, 11 Nov 2019 10:29:40 -0600 Subject: [PATCH 9/9] Add project to Makefile.am --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 746b7fde7f5d..8fd66c79ee2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,6 +127,7 @@ csharp_EXTRA_DIST= \ csharp/src/Google.Protobuf.Test/SampleMessages.cs \ csharp/src/Google.Protobuf.Test/SampleNaNs.cs \ csharp/src/Google.Protobuf.Test/TestCornerCases.cs \ + csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj \ csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs \ csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs \ csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs \