- Added CSharpServiceType NONE to skip service generation.

- Defaulted service_generator_type to NONE
- Added /protos/extest/unittest_generic_services.proto to test services
- Migrated unit tests to use the new generic services for testing

2 files changed, 32 insertions, 1 deletions

diff --git a/protos/extest/unittest_generic_services.proto b/protos/extest/unittest_generic_services.proto
new file mode 100644
index 00000000..3fe2e8eb
--- /dev/null
+++ b/protos/extest/unittest_generic_services.proto
@@ -0,0 +1,29 @@
+// Additional options required for C# generation. File from copyright

+// line onwards is as per original distribution.

+import "google/protobuf/csharp_options.proto";

+import "google/protobuf/unittest.proto";

+import "google/protobuf/unittest_custom_options.proto";

+option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos";

+option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestGenericServices";

+

+option (google.protobuf.csharp_file_options).service_generator_type = GENERIC;

+

+// We don't put this in a package within proto2 because we need to make sure
+// that the generated code doesn't depend on being in the proto2 namespace.
+package protobuf_unittest;
+
+option optimize_for = SPEED;

+

+service TestGenericService {

+  rpc Foo(FooRequest) returns (FooResponse);

+  rpc Bar(BarRequest) returns (BarResponse);

+}

+
+service TestGenericServiceWithCustomOptions {
+  option (service_opt1) = -9876543210;
+
+  rpc Foo(CustomOptionFooRequest) returns (CustomOptionFooResponse) {
+    option (method_opt1) = METHODOPT1_VAL2;
+  }
+}
+
diff --git a/protos/google/protobuf/csharp_options.proto b/protos/google/protobuf/csharp_options.proto
index d9fe04e1..33a7b03d 100644
--- a/protos/google/protobuf/csharp_options.proto
+++ b/protos/google/protobuf/csharp_options.proto
@@ -58,10 +58,12 @@ message CSharpFileOptions {
   // Controls how services are generated, GENERIC is the deprecated original implementation

   // INTERFACE generates service interfaces only, RPCINTEROP generates interfaces and 

   // implementations using the included Windows RPC interop libarary.

-  optional CSharpServiceType service_generator_type = 225 [default = GENERIC];

+  optional CSharpServiceType service_generator_type = 225 [default = NONE];

 }

 

 enum CSharpServiceType {

+  // Services are ignored by the generator

+  NONE = 0;

   // Generates the original Java generic service implementations

   GENERIC = 1;

   // Generates an interface for the service and nothing else