diff options
| author | csharptest <roger@csharptest.net> | 2012-10-10 17:41:28 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2012-10-10 17:41:28 -0500 |
| commit | 0e152e438622b4faa34a8eb50369f3bc51986eac (patch) | |
| tree | 4c809a751f5d6122e0f2845a37b171d777f190a9 | |
| parent | 9c73660d559290c7a41d537df3f25210103ab000 (diff) | |
| download | protobuf-0e152e438622b4faa34a8eb50369f3bc51986eac.tar.gz protobuf-0e152e438622b4faa34a8eb50369f3bc51986eac.tar.bz2 protobuf-0e152e438622b4faa34a8eb50369f3bc51986eac.zip | |
addressbook.proto - Imported the options and set the expected namespace and umbrella class
| -rw-r--r-- | protos/tutorial/addressbook.proto | 4 | ||||
| -rw-r--r-- | src/AddressBook/AddressBookProtos.cs | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/protos/tutorial/addressbook.proto b/protos/tutorial/addressbook.proto index da019424..5abe35ce 100644 --- a/protos/tutorial/addressbook.proto +++ b/protos/tutorial/addressbook.proto @@ -1,5 +1,9 @@ package tutorial; +import "google/protobuf/csharp_options.proto"; +option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.Examples.AddressBook"; +option (google.protobuf.csharp_file_options).umbrella_classname = "AddressBookProtos"; + option optimize_for = SPEED; message Person { diff --git a/src/AddressBook/AddressBookProtos.cs b/src/AddressBook/AddressBookProtos.cs index 783edde5..3e39bacc 100644 --- a/src/AddressBook/AddressBookProtos.cs +++ b/src/AddressBook/AddressBookProtos.cs @@ -33,13 +33,16 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { static AddressBookProtos() {
byte[] descriptorData = global::System.Convert.FromBase64String(
- "Chp0dXRvcmlhbC9hZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwi2gEKBlBl" +
- "cnNvbhIMCgRuYW1lGAEgAigJEgoKAmlkGAIgAigFEg0KBWVtYWlsGAMgASgJ" +
- "EisKBXBob25lGAQgAygLMhwudHV0b3JpYWwuUGVyc29uLlBob25lTnVtYmVy" +
- "Gk0KC1Bob25lTnVtYmVyEg4KBm51bWJlchgBIAIoCRIuCgR0eXBlGAIgASgO" +
- "MhoudHV0b3JpYWwuUGVyc29uLlBob25lVHlwZToESE9NRSIrCglQaG9uZVR5" +
- "cGUSCgoGTU9CSUxFEAASCAoESE9NRRABEggKBFdPUksQAiIvCgtBZGRyZXNz" +
- "Qm9vaxIgCgZwZXJzb24YASADKAsyEC50dXRvcmlhbC5QZXJzb25CAkgB");
+ "Chp0dXRvcmlhbC9hZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwaJGdvb2ds" +
+ "ZS9wcm90b2J1Zi9jc2hhcnBfb3B0aW9ucy5wcm90byLaAQoGUGVyc29uEgwK" +
+ "BG5hbWUYASACKAkSCgoCaWQYAiACKAUSDQoFZW1haWwYAyABKAkSKwoFcGhv" +
+ "bmUYBCADKAsyHC50dXRvcmlhbC5QZXJzb24uUGhvbmVOdW1iZXIaTQoLUGhv" +
+ "bmVOdW1iZXISDgoGbnVtYmVyGAEgAigJEi4KBHR5cGUYAiABKA4yGi50dXRv" +
+ "cmlhbC5QZXJzb24uUGhvbmVUeXBlOgRIT01FIisKCVBob25lVHlwZRIKCgZN" +
+ "T0JJTEUQABIICgRIT01FEAESCAoEV09SSxACIi8KC0FkZHJlc3NCb29rEiAK" +
+ "BnBlcnNvbhgBIAMoCzIQLnR1dG9yaWFsLlBlcnNvbkJFSAHCPkAKK0dvb2ds" +
+ "ZS5Qcm90b2NvbEJ1ZmZlcnMuRXhhbXBsZXMuQWRkcmVzc0Jvb2sSEUFkZHJl" +
+ "c3NCb29rUHJvdG9z");
pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
descriptor = root;
internal__static_tutorial_Person__Descriptor = Descriptor.MessageTypes[0];
@@ -54,10 +57,14 @@ namespace Google.ProtocolBuffers.Examples.AddressBook { internal__static_tutorial_AddressBook__FieldAccessorTable =
new pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook, global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook.Builder>(internal__static_tutorial_AddressBook__Descriptor,
new string[] { "Person", });
- return null;
+ pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance();
+ RegisterAllExtensions(registry);
+ global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.RegisterAllExtensions(registry);
+ return registry;
};
pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbd::FileDescriptor[] {
+ global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor,
}, assigner);
}
#endregion
|