Refactored options

7 files changed, 29 insertions, 20 deletions

diff --git a/protos/google/protobuf/csharp_options.proto b/protos/google/protobuf/csharp_options.proto
index 5ebaebd1..6d81c5cd 100644
--- a/protos/google/protobuf/csharp_options.proto
+++ b/protos/google/protobuf/csharp_options.proto
@@ -4,13 +4,22 @@ import "google/protobuf/descriptor.proto";
 
 package google.protobuf;
 
-option (CSharpNamespace) = "Google.ProtocolBuffers.DescriptorProtos";
-option (CSharpUmbrellaClassname) = "CSharpOptions";
+message CSharpFileOptions {
+  optional string namespace = 1;
+  optional string umbrella_classname= 2;
+  optional bool public_classes = 3;
+  optional bool multiple_files = 4;
+  optional bool nest_classes = 5;
 
-extend FileOptions {
-  optional string CSharpNamespace = 20000;
-  optional string CSharpUmbrellaClassname = 20001;
-  optional bool CSharpMultipleFiles = 20002;
-  optional bool CSharpNestClasses = 20003;
-  optional bool CSharpPublicClasses = 20004;
+  extend FileOptions {
+    optional CSharpFileOptions csharp_options = 1000;
+  }
+}
+
+message CSharpFieldOptions {
+  optional string property_name = 1;
+
+  extend FieldOptions {
+    optional CSharpFieldOptions csharp_options = 1000;
+  }
 }
diff --git a/protos/google/protobuf/unittest.proto b/protos/google/protobuf/unittest.proto
index cf5322b6..45ee42b1 100644
--- a/protos/google/protobuf/unittest.proto
+++ b/protos/google/protobuf/unittest.proto
@@ -2,8 +2,8 @@
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
 import "google/protobuf/descriptor.proto";
-option (google.protobuf.CSharpNamespace) = "Google.ProtocolBuffers.TestProtos";
-option (google.protobuf.CSharpUmbrellaClassname) = "UnitTestProtoFile";
+option (google.protobuf.CSharpFileOptions.csharp_options).namespace = "Google.ProtocolBuffers.TestProtos";
+option (google.protobuf.CSharpFileOptions.csharp_options).umbrella_classname = "UnitTestProtoFile";
 
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
diff --git a/protos/google/protobuf/unittest_custom_options.proto b/protos/google/protobuf/unittest_custom_options.proto
index 09a481a2..44525279 100644
--- a/protos/google/protobuf/unittest_custom_options.proto
+++ b/protos/google/protobuf/unittest_custom_options.proto
@@ -1,8 +1,8 @@
 // Additional options required for C# generation. File from copyright
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
-option (google.protobuf.CSharpNamespace) = "Google.ProtocolBuffers.TestProtos";
-option (google.protobuf.CSharpUmbrellaClassname) = "UnitTestCustomOptionsProtoFile";
+option (google.protobuf.CSharpFileOptions.csharp_options).namespace = "Google.ProtocolBuffers.TestProtos";
+option (google.protobuf.CSharpFileOptions.csharp_options).umbrella_classname = "UnitTestCustomOptionsProtoFile";
 
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
diff --git a/protos/google/protobuf/unittest_embed_optimize_for.proto b/protos/google/protobuf/unittest_embed_optimize_for.proto
index 4af6e58a..9ab1092a 100644
--- a/protos/google/protobuf/unittest_embed_optimize_for.proto
+++ b/protos/google/protobuf/unittest_embed_optimize_for.proto
@@ -2,8 +2,8 @@
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
 import "google/protobuf/descriptor.proto";
-option (google.protobuf.CSharpNamespace) = "Google.ProtocolBuffers.TestProtos";
-option (google.protobuf.CSharpUmbrellaClassname) = "UnitTestEmbedOptimizeForProtoFile";
+option (google.protobuf.CSharpFileOptions.csharp_options).namespace = "Google.ProtocolBuffers.TestProtos";
+option (google.protobuf.CSharpFileOptions.csharp_options).umbrella_classname = "UnitTestEmbedOptimizeForProtoFile";
 
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
diff --git a/protos/google/protobuf/unittest_import.proto b/protos/google/protobuf/unittest_import.proto
index d2ebad90..7af5b74c 100644
--- a/protos/google/protobuf/unittest_import.proto
+++ b/protos/google/protobuf/unittest_import.proto
@@ -2,8 +2,8 @@
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
 import "google/protobuf/descriptor.proto";
-option (google.protobuf.CSharpNamespace) = "Google.ProtocolBuffers.TestProtos";
-option (google.protobuf.CSharpUmbrellaClassname) = "UnitTestImportProtoFile";
+option (google.protobuf.CSharpFileOptions.csharp_options).namespace = "Google.ProtocolBuffers.TestProtos";
+option (google.protobuf.CSharpFileOptions.csharp_options).umbrella_classname = "UnitTestImportProtoFile";
 
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
diff --git a/protos/google/protobuf/unittest_mset.proto b/protos/google/protobuf/unittest_mset.proto
index 75a2771b..74f30021 100644
--- a/protos/google/protobuf/unittest_mset.proto
+++ b/protos/google/protobuf/unittest_mset.proto
@@ -2,8 +2,8 @@
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
 import "google/protobuf/descriptor.proto";
-option (google.protobuf.CSharpNamespace) = "Google.ProtocolBuffers.TestProtos";
-option (google.protobuf.CSharpUmbrellaClassname) = "UnitTestMessageSetProtoFile";
+option (google.protobuf.CSharpFileOptions.csharp_options).namespace = "Google.ProtocolBuffers.TestProtos";
+option (google.protobuf.CSharpFileOptions.csharp_options).umbrella_classname = "UnitTestMessageSetProtoFile";
 
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
diff --git a/protos/google/protobuf/unittest_optimize_for.proto b/protos/google/protobuf/unittest_optimize_for.proto
index 8e4ec113..204d09f9 100644
--- a/protos/google/protobuf/unittest_optimize_for.proto
+++ b/protos/google/protobuf/unittest_optimize_for.proto
@@ -2,8 +2,8 @@
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
 import "google/protobuf/descriptor.proto";
-option (google.protobuf.CSharpNamespace) = "Google.ProtocolBuffers.TestProtos";
-option (google.protobuf.CSharpUmbrellaClassname) = "UnitTestOptimizeForProtoFile";
+option (google.protobuf.CSharpFileOptions.csharp_options).namespace = "Google.ProtocolBuffers.TestProtos";
+option (google.protobuf.CSharpFileOptions.csharp_options).umbrella_classname = "UnitTestOptimizeForProtoFile";
 
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.