diff options
17 files changed, 129 insertions, 511 deletions
diff --git a/csharp/src/AddressBook/Addressbook.cs b/csharp/src/AddressBook/Addressbook.cs index 92257064..231f1d09 100644 --- a/csharp/src/AddressBook/Addressbook.cs +++ b/csharp/src/AddressBook/Addressbook.cs @@ -29,10 +29,13 @@ namespace Google.Protobuf.Examples.AddressBook { "EggKBEhPTUUQARIICgRXT1JLEAIiLwoLQWRkcmVzc0Jvb2sSIAoGcGVvcGxl", "GAEgAygLMhAudHV0b3JpYWwuUGVyc29uQlAKFGNvbS5leGFtcGxlLnR1dG9y", "aWFsQhFBZGRyZXNzQm9va1Byb3Rvc6oCJEdvb2dsZS5Qcm90b2J1Zi5FeGFt", - "cGxlcy5BZGRyZXNzQm9va2IGcHJvdG8z")); + "cGxlcy5BZGRyZXNzQm9va2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.Examples.AddressBook.Person), typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType), typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person), new[]{ "Name", "Id", "Email", "Phones" }, null, new[]{ typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) }, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), new[]{ "Number", "Type" }, null, null, null)}), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), new[]{ "People" }, null, null, null) + })); } #endregion @@ -43,8 +46,6 @@ namespace Google.Protobuf.Examples.AddressBook { private static readonly pb::MessageParser<Person> _parser = new pb::MessageParser<Person>(() => new Person()); public static pb::MessageParser<Person> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "email", "id", "name", "phones" }; - private static readonly uint[] _fieldTags = new uint[] { 26, 16, 10, 34 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[0]; } } @@ -83,7 +84,6 @@ namespace Google.Protobuf.Examples.AddressBook { public const int NameFieldNumber = 1; private string name_ = ""; - [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -94,7 +94,6 @@ namespace Google.Protobuf.Examples.AddressBook { public const int IdFieldNumber = 2; private int id_; - [pbr::ProtobufField(2, "id")] public int Id { get { return id_; } set { @@ -105,7 +104,6 @@ namespace Google.Protobuf.Examples.AddressBook { public const int EmailFieldNumber = 3; private string email_ = ""; - [pbr::ProtobufField(3, "email")] public string Email { get { return email_; } set { @@ -118,7 +116,6 @@ namespace Google.Protobuf.Examples.AddressBook { private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> _repeated_phones_codec = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> phones_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber>(); - [pbr::ProtobufField(4, "phones")] public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> Phones { get { return phones_; } } @@ -246,8 +243,6 @@ namespace Google.Protobuf.Examples.AddressBook { private static readonly pb::MessageParser<PhoneNumber> _parser = new pb::MessageParser<PhoneNumber>(() => new PhoneNumber()); public static pb::MessageParser<PhoneNumber> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "number", "type" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 16 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.Examples.AddressBook.Person.Descriptor.NestedTypes[0]; } } @@ -283,7 +278,6 @@ namespace Google.Protobuf.Examples.AddressBook { public const int NumberFieldNumber = 1; private string number_ = ""; - [pbr::ProtobufField(1, "number")] public string Number { get { return number_; } set { @@ -294,7 +288,6 @@ namespace Google.Protobuf.Examples.AddressBook { public const int TypeFieldNumber = 2; private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE; - [pbr::ProtobufField(2, "type")] public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type { get { return type_; } set { @@ -399,8 +392,6 @@ namespace Google.Protobuf.Examples.AddressBook { private static readonly pb::MessageParser<AddressBook> _parser = new pb::MessageParser<AddressBook>(() => new AddressBook()); public static pb::MessageParser<AddressBook> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "people" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[1]; } } @@ -438,7 +429,6 @@ namespace Google.Protobuf.Examples.AddressBook { private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person> _repeated_people_codec = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Examples.AddressBook.Person.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> people_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person>(); - [pbr::ProtobufField(1, "people")] public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> People { get { return people_; } } diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs index 4eeb7423..7da82bf0 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs @@ -144,10 +144,18 @@ namespace Google.Protobuf.TestProtos { "dHJ5LkVudHJ5RW50cnkaLAoKRW50cnlFbnRyeRILCgNrZXkYASABKAUSDQoF", "dmFsdWUYAiABKAU6AjgBKj8KB01hcEVudW0SEAoMTUFQX0VOVU1fRk9PEAAS", "EAoMTUFQX0VOVU1fQkFSEAESEAoMTUFQX0VOVU1fQkFaEAJCIPgBAaoCGkdv", - "b2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zYgZwcm90bzM=")); + "b2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor, }, - new global::System.Type[] { typeof(global::Google.Protobuf.TestProtos.TestMap), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, typeof(global::Google.Protobuf.TestProtos.TestMapSubmessage), typeof(global::Google.Protobuf.TestProtos.TestMessageMap), null, typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap), null, null, typeof(global::Google.Protobuf.TestProtos.TestArenaMap), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType), null, typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Types.Type), typeof(global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry), null, typeof(global::Google.Protobuf.TestProtos.MapEnum), }); + new pbr::GeneratedCodeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.MapEnum), }, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestMap), new[]{ "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapInt32Bytes", "MapInt32Enum", "MapInt32ForeignMessage" }, null, null, new pbr::GeneratedCodeInfo[] { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, }), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestMapSubmessage), new[]{ "TestMap" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestMessageMap), new[]{ "MapInt32Message" }, null, null, new pbr::GeneratedCodeInfo[] { null, }), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap), new[]{ "Map1", "Map2" }, null, null, new pbr::GeneratedCodeInfo[] { null, null, }), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestArenaMap), new[]{ "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapInt32Enum", "MapInt32ForeignMessage" }, null, null, new pbr::GeneratedCodeInfo[] { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, }), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType), new[]{ "Type" }, null, new[]{ typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Types.Type) }, new pbr::GeneratedCodeInfo[] { null, }), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry), new[]{ "Entry" }, null, null, new pbr::GeneratedCodeInfo[] { null, }) + })); } #endregion @@ -167,8 +175,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestMap> _parser = new pb::MessageParser<TestMap>(() => new TestMap()); public static pb::MessageParser<TestMap> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "map_bool_bool", "map_fixed32_fixed32", "map_fixed64_fixed64", "map_int32_bytes", "map_int32_double", "map_int32_enum", "map_int32_float", "map_int32_foreign_message", "map_int32_int32", "map_int64_int64", "map_sfixed32_sfixed32", "map_sfixed64_sfixed64", "map_sint32_sint32", "map_sint64_sint64", "map_string_string", "map_uint32_uint32", "map_uint64_uint64" }; - private static readonly uint[] _fieldTags = new uint[] { 106, 58, 66, 122, 98, 130, 90, 138, 10, 18, 74, 82, 42, 50, 114, 26, 34 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[0]; } } @@ -238,7 +244,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10); private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(1, "map_int32_int32")] public pbc::MapField<int, int> MapInt32Int32 { get { return mapInt32Int32_; } } @@ -247,7 +252,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8), pb::FieldCodec.ForInt64(16), 18); private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>(); - [pbr::ProtobufField(2, "map_int64_int64")] public pbc::MapField<long, long> MapInt64Int64 { get { return mapInt64Int64_; } } @@ -256,7 +260,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8), pb::FieldCodec.ForUInt32(16), 26); private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>(); - [pbr::ProtobufField(3, "map_uint32_uint32")] public pbc::MapField<uint, uint> MapUint32Uint32 { get { return mapUint32Uint32_; } } @@ -265,7 +268,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8), pb::FieldCodec.ForUInt64(16), 34); private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>(); - [pbr::ProtobufField(4, "map_uint64_uint64")] public pbc::MapField<ulong, ulong> MapUint64Uint64 { get { return mapUint64Uint64_; } } @@ -274,7 +276,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8), pb::FieldCodec.ForSInt32(16), 42); private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(5, "map_sint32_sint32")] public pbc::MapField<int, int> MapSint32Sint32 { get { return mapSint32Sint32_; } } @@ -283,7 +284,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8), pb::FieldCodec.ForSInt64(16), 50); private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>(); - [pbr::ProtobufField(6, "map_sint64_sint64")] public pbc::MapField<long, long> MapSint64Sint64 { get { return mapSint64Sint64_; } } @@ -292,7 +292,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13), pb::FieldCodec.ForFixed32(21), 58); private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>(); - [pbr::ProtobufField(7, "map_fixed32_fixed32")] public pbc::MapField<uint, uint> MapFixed32Fixed32 { get { return mapFixed32Fixed32_; } } @@ -301,7 +300,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9), pb::FieldCodec.ForFixed64(17), 66); private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>(); - [pbr::ProtobufField(8, "map_fixed64_fixed64")] public pbc::MapField<ulong, ulong> MapFixed64Fixed64 { get { return mapFixed64Fixed64_; } } @@ -310,7 +308,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13), pb::FieldCodec.ForSFixed32(21), 74); private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(9, "map_sfixed32_sfixed32")] public pbc::MapField<int, int> MapSfixed32Sfixed32 { get { return mapSfixed32Sfixed32_; } } @@ -319,7 +316,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9), pb::FieldCodec.ForSFixed64(17), 82); private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>(); - [pbr::ProtobufField(10, "map_sfixed64_sfixed64")] public pbc::MapField<long, long> MapSfixed64Sfixed64 { get { return mapSfixed64Sfixed64_; } } @@ -328,7 +324,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForFloat(21), 90); private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>(); - [pbr::ProtobufField(11, "map_int32_float")] public pbc::MapField<int, float> MapInt32Float { get { return mapInt32Float_; } } @@ -337,7 +332,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForDouble(17), 98); private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>(); - [pbr::ProtobufField(12, "map_int32_double")] public pbc::MapField<int, double> MapInt32Double { get { return mapInt32Double_; } } @@ -346,7 +340,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8), pb::FieldCodec.ForBool(16), 106); private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>(); - [pbr::ProtobufField(13, "map_bool_bool")] public pbc::MapField<bool, bool> MapBoolBool { get { return mapBoolBool_; } } @@ -355,7 +348,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<string, string>.Codec _map_mapStringString_codec = new pbc::MapField<string, string>.Codec(pb::FieldCodec.ForString(10), pb::FieldCodec.ForString(18), 114); private readonly pbc::MapField<string, string> mapStringString_ = new pbc::MapField<string, string>(); - [pbr::ProtobufField(14, "map_string_string")] public pbc::MapField<string, string> MapStringString { get { return mapStringString_; } } @@ -364,7 +356,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, pb::ByteString>.Codec _map_mapInt32Bytes_codec = new pbc::MapField<int, pb::ByteString>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForBytes(18), 122); private readonly pbc::MapField<int, pb::ByteString> mapInt32Bytes_ = new pbc::MapField<int, pb::ByteString>(); - [pbr::ProtobufField(15, "map_int32_bytes")] public pbc::MapField<int, pb::ByteString> MapInt32Bytes { get { return mapInt32Bytes_; } } @@ -373,7 +364,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec _map_mapInt32Enum_codec = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::Google.Protobuf.TestProtos.MapEnum) x), 130); private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> mapInt32Enum_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>(); - [pbr::ProtobufField(16, "map_int32_enum")] public pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> MapInt32Enum { get { return mapInt32Enum_; } } @@ -382,7 +372,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec _map_mapInt32ForeignMessage_codec = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.ForeignMessage.Parser), 138); private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> mapInt32ForeignMessage_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>(); - [pbr::ProtobufField(17, "map_int32_foreign_message")] public pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> MapInt32ForeignMessage { get { return mapInt32ForeignMessage_; } } @@ -599,8 +588,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestMapSubmessage> _parser = new pb::MessageParser<TestMapSubmessage>(() => new TestMapSubmessage()); public static pb::MessageParser<TestMapSubmessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "test_map" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[1]; } } @@ -636,7 +623,6 @@ namespace Google.Protobuf.TestProtos { public const int TestMapFieldNumber = 1; private global::Google.Protobuf.TestProtos.TestMap testMap_; - [pbr::ProtobufField(1, "test_map")] public global::Google.Protobuf.TestProtos.TestMap TestMap { get { return testMap_; } set { @@ -726,8 +712,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestMessageMap> _parser = new pb::MessageParser<TestMessageMap>(() => new TestMessageMap()); public static pb::MessageParser<TestMessageMap> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "map_int32_message" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[2]; } } @@ -765,7 +749,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>.Codec _map_mapInt32Message_codec = new pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.TestAllTypes.Parser), 10); private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes> mapInt32Message_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>(); - [pbr::ProtobufField(1, "map_int32_message")] public pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes> MapInt32Message { get { return mapInt32Message_; } } @@ -838,8 +821,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestSameTypeMap> _parser = new pb::MessageParser<TestSameTypeMap>(() => new TestSameTypeMap()); public static pb::MessageParser<TestSameTypeMap> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "map1", "map2" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[3]; } } @@ -879,7 +860,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_map1_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10); private readonly pbc::MapField<int, int> map1_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(1, "map1")] public pbc::MapField<int, int> Map1 { get { return map1_; } } @@ -888,7 +868,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_map2_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 18); private readonly pbc::MapField<int, int> map2_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(2, "map2")] public pbc::MapField<int, int> Map2 { get { return map2_; } } @@ -970,8 +949,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestArenaMap> _parser = new pb::MessageParser<TestArenaMap>(() => new TestArenaMap()); public static pb::MessageParser<TestArenaMap> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "map_bool_bool", "map_fixed32_fixed32", "map_fixed64_fixed64", "map_int32_double", "map_int32_enum", "map_int32_float", "map_int32_foreign_message", "map_int32_int32", "map_int64_int64", "map_sfixed32_sfixed32", "map_sfixed64_sfixed64", "map_sint32_sint32", "map_sint64_sint64", "map_uint32_uint32", "map_uint64_uint64" }; - private static readonly uint[] _fieldTags = new uint[] { 106, 58, 66, 98, 114, 90, 122, 10, 18, 74, 82, 42, 50, 26, 34 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[4]; } } @@ -1037,7 +1014,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10); private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(1, "map_int32_int32")] public pbc::MapField<int, int> MapInt32Int32 { get { return mapInt32Int32_; } } @@ -1046,7 +1022,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8), pb::FieldCodec.ForInt64(16), 18); private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>(); - [pbr::ProtobufField(2, "map_int64_int64")] public pbc::MapField<long, long> MapInt64Int64 { get { return mapInt64Int64_; } } @@ -1055,7 +1030,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8), pb::FieldCodec.ForUInt32(16), 26); private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>(); - [pbr::ProtobufField(3, "map_uint32_uint32")] public pbc::MapField<uint, uint> MapUint32Uint32 { get { return mapUint32Uint32_; } } @@ -1064,7 +1038,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8), pb::FieldCodec.ForUInt64(16), 34); private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>(); - [pbr::ProtobufField(4, "map_uint64_uint64")] public pbc::MapField<ulong, ulong> MapUint64Uint64 { get { return mapUint64Uint64_; } } @@ -1073,7 +1046,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8), pb::FieldCodec.ForSInt32(16), 42); private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(5, "map_sint32_sint32")] public pbc::MapField<int, int> MapSint32Sint32 { get { return mapSint32Sint32_; } } @@ -1082,7 +1054,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8), pb::FieldCodec.ForSInt64(16), 50); private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>(); - [pbr::ProtobufField(6, "map_sint64_sint64")] public pbc::MapField<long, long> MapSint64Sint64 { get { return mapSint64Sint64_; } } @@ -1091,7 +1062,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13), pb::FieldCodec.ForFixed32(21), 58); private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>(); - [pbr::ProtobufField(7, "map_fixed32_fixed32")] public pbc::MapField<uint, uint> MapFixed32Fixed32 { get { return mapFixed32Fixed32_; } } @@ -1100,7 +1070,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9), pb::FieldCodec.ForFixed64(17), 66); private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>(); - [pbr::ProtobufField(8, "map_fixed64_fixed64")] public pbc::MapField<ulong, ulong> MapFixed64Fixed64 { get { return mapFixed64Fixed64_; } } @@ -1109,7 +1078,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13), pb::FieldCodec.ForSFixed32(21), 74); private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(9, "map_sfixed32_sfixed32")] public pbc::MapField<int, int> MapSfixed32Sfixed32 { get { return mapSfixed32Sfixed32_; } } @@ -1118,7 +1086,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9), pb::FieldCodec.ForSFixed64(17), 82); private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>(); - [pbr::ProtobufField(10, "map_sfixed64_sfixed64")] public pbc::MapField<long, long> MapSfixed64Sfixed64 { get { return mapSfixed64Sfixed64_; } } @@ -1127,7 +1094,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForFloat(21), 90); private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>(); - [pbr::ProtobufField(11, "map_int32_float")] public pbc::MapField<int, float> MapInt32Float { get { return mapInt32Float_; } } @@ -1136,7 +1102,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForDouble(17), 98); private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>(); - [pbr::ProtobufField(12, "map_int32_double")] public pbc::MapField<int, double> MapInt32Double { get { return mapInt32Double_; } } @@ -1145,7 +1110,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8), pb::FieldCodec.ForBool(16), 106); private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>(); - [pbr::ProtobufField(13, "map_bool_bool")] public pbc::MapField<bool, bool> MapBoolBool { get { return mapBoolBool_; } } @@ -1154,7 +1118,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec _map_mapInt32Enum_codec = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::Google.Protobuf.TestProtos.MapEnum) x), 114); private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> mapInt32Enum_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>(); - [pbr::ProtobufField(14, "map_int32_enum")] public pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> MapInt32Enum { get { return mapInt32Enum_; } } @@ -1163,7 +1126,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec _map_mapInt32ForeignMessage_codec = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.ForeignMessage.Parser), 122); private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> mapInt32ForeignMessage_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>(); - [pbr::ProtobufField(15, "map_int32_foreign_message")] public pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> MapInt32ForeignMessage { get { return mapInt32ForeignMessage_; } } @@ -1362,8 +1324,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<MessageContainingEnumCalledType> _parser = new pb::MessageParser<MessageContainingEnumCalledType>(() => new MessageContainingEnumCalledType()); public static pb::MessageParser<MessageContainingEnumCalledType> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "type" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[5]; } } @@ -1401,7 +1361,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>.Codec _map_type_codec = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Parser), 10); private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType> type_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>(); - [pbr::ProtobufField(1, "type")] public pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType> Type { get { return type_; } } @@ -1484,8 +1443,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<MessageContainingMapCalledEntry> _parser = new pb::MessageParser<MessageContainingMapCalledEntry>(() => new MessageContainingMapCalledEntry()); public static pb::MessageParser<MessageContainingMapCalledEntry> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "entry" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[6]; } } @@ -1523,7 +1480,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int>.Codec _map_entry_codec = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10); private readonly pbc::MapField<int, int> entry_ = new pbc::MapField<int, int>(); - [pbr::ProtobufField(1, "entry")] public pbc::MapField<int, int> Entry { get { return entry_; } } diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs index 87bec2af..517225b6 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs @@ -28,10 +28,12 @@ namespace Google.Protobuf.TestProtos { "VU1fVU5TUEVDSUZJRUQQABIOCgpJTVBPUlRfRk9PEAcSDgoKSU1QT1JUX0JB", "UhAIEg4KCklNUE9SVF9CQVoQCUI8Chhjb20uZ29vZ2xlLnByb3RvYnVmLnRl", "c3RIAfgBAaoCGkdvb2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zUABiBnByb3Rv", - "Mw==")); + "Mw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.Descriptor, }, - new global::System.Type[] { typeof(global::Google.Protobuf.TestProtos.ImportMessage), typeof(global::Google.Protobuf.TestProtos.ImportEnum), }); + new pbr::GeneratedCodeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.ImportEnum), }, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.ImportMessage), new[]{ "D" }, null, null, null) + })); } #endregion @@ -52,8 +54,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<ImportMessage> _parser = new pb::MessageParser<ImportMessage>(() => new ImportMessage()); public static pb::MessageParser<ImportMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "d" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestImportProto3.Descriptor.MessageTypes[0]; } } @@ -88,7 +88,6 @@ namespace Google.Protobuf.TestProtos { public const int DFieldNumber = 1; private int d_; - [pbr::ProtobufField(1, "d")] public int D { get { return d_; } set { diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs index a983dfa8..11ec29dd 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs @@ -24,10 +24,12 @@ namespace Google.Protobuf.TestProtos { "CjNnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfaW1wb3J0X3B1YmxpY19wcm90", "bzMucHJvdG8SGHByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydCIgChNQdWJsaWNJ", "bXBvcnRNZXNzYWdlEgkKAWUYASABKAVCNwoYY29tLmdvb2dsZS5wcm90b2J1", - "Zi50ZXN0qgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw==")); + "Zi50ZXN0qgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.TestProtos.PublicImportMessage), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.PublicImportMessage), new[]{ "E" }, null, null, null) + })); } #endregion @@ -38,8 +40,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<PublicImportMessage> _parser = new pb::MessageParser<PublicImportMessage>(() => new PublicImportMessage()); public static pb::MessageParser<PublicImportMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "e" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.Descriptor.MessageTypes[0]; } } @@ -74,7 +74,6 @@ namespace Google.Protobuf.TestProtos { public const int EFieldNumber = 1; private int e_; - [pbr::ProtobufField(1, "e")] public int E { get { return e_; } set { diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs index 9a656f25..07466650 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs @@ -38,10 +38,16 @@ namespace UnitTest.Issues.TestProtos { "dGl2ZUVudW0SFgoSTkVHQVRJVkVfRU5VTV9aRVJPEAASFgoJRml2ZUJlbG93", "EPv//////////wESFQoITWludXNPbmUQ////////////ASouCg5EZXByZWNh", "dGVkRW51bRITCg9ERVBSRUNBVEVEX1pFUk8QABIHCgNvbmUQAUIfSAGqAhpV", - "bml0VGVzdC5Jc3N1ZXMuVGVzdFByb3Rvc2IGcHJvdG8z")); + "bml0VGVzdC5Jc3N1ZXMuVGVzdFByb3Rvc2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::UnitTest.Issues.TestProtos.Issue307), typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce), typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Types.NestedTwice), typeof(global::UnitTest.Issues.TestProtos.NegativeEnumMessage), typeof(global::UnitTest.Issues.TestProtos.DeprecatedChild), typeof(global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage), typeof(global::UnitTest.Issues.TestProtos.ItemField), typeof(global::UnitTest.Issues.TestProtos.NegativeEnum), typeof(global::UnitTest.Issues.TestProtos.DeprecatedEnum), }); + new pbr::GeneratedCodeInfo(new[] {typeof(global::UnitTest.Issues.TestProtos.NegativeEnum), typeof(global::UnitTest.Issues.TestProtos.DeprecatedEnum), }, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::UnitTest.Issues.TestProtos.Issue307), null, null, null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce), null, null, null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Types.NestedTwice), null, null, null, null)})}), + new pbr::GeneratedCodeInfo(typeof(global::UnitTest.Issues.TestProtos.NegativeEnumMessage), new[]{ "Value", "Values", "PackedValues" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::UnitTest.Issues.TestProtos.DeprecatedChild), null, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage), new[]{ "PrimitiveValue", "PrimitiveArray", "MessageValue", "MessageArray", "EnumValue", "EnumArray" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::UnitTest.Issues.TestProtos.ItemField), new[]{ "Item" }, null, null, null) + })); } #endregion @@ -66,8 +72,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::MessageParser<Issue307> _parser = new pb::MessageParser<Issue307>(() => new Issue307()); public static pb::MessageParser<Issue307> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[0]; } } @@ -159,8 +163,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::MessageParser<NestedOnce> _parser = new pb::MessageParser<NestedOnce>(() => new NestedOnce()); public static pb::MessageParser<NestedOnce> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::UnitTest.Issues.TestProtos.Issue307.Descriptor.NestedTypes[0]; } } @@ -252,8 +254,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::MessageParser<NestedTwice> _parser = new pb::MessageParser<NestedTwice>(() => new NestedTwice()); public static pb::MessageParser<NestedTwice> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Descriptor.NestedTypes[0]; } } @@ -354,8 +354,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::MessageParser<NegativeEnumMessage> _parser = new pb::MessageParser<NegativeEnumMessage>(() => new NegativeEnumMessage()); public static pb::MessageParser<NegativeEnumMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "packed_values", "value", "values" }; - private static readonly uint[] _fieldTags = new uint[] { 26, 8, 16 }; public static pbr::MessageDescriptor Descriptor { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[1]; } } @@ -394,7 +392,6 @@ namespace UnitTest.Issues.TestProtos { public const int ValueFieldNumber = 1; private global::UnitTest.Issues.TestProtos.NegativeEnum value_ = global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO; - [pbr::ProtobufField(1, "value")] public global::UnitTest.Issues.TestProtos.NegativeEnum Value { get { return value_; } set { @@ -407,7 +404,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.NegativeEnum> _repeated_values_codec = pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::UnitTest.Issues.TestProtos.NegativeEnum) x); private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> values_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum>(); - [pbr::ProtobufField(2, "values")] public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> Values { get { return values_; } } @@ -416,7 +412,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.NegativeEnum> _repeated_packedValues_codec = pb::FieldCodec.ForEnum(26, x => (int) x, x => (global::UnitTest.Issues.TestProtos.NegativeEnum) x); private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> packedValues_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum>(); - [pbr::ProtobufField(3, "packed_values")] public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> PackedValues { get { return packedValues_; } } @@ -516,8 +511,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::MessageParser<DeprecatedChild> _parser = new pb::MessageParser<DeprecatedChild>(() => new DeprecatedChild()); public static pb::MessageParser<DeprecatedChild> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[2]; } } @@ -608,8 +601,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::MessageParser<DeprecatedFieldsMessage> _parser = new pb::MessageParser<DeprecatedFieldsMessage>(() => new DeprecatedFieldsMessage()); public static pb::MessageParser<DeprecatedFieldsMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "EnumArray", "EnumValue", "MessageArray", "MessageValue", "PrimitiveArray", "PrimitiveValue" }; - private static readonly uint[] _fieldTags = new uint[] { 50, 40, 34, 26, 18, 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[3]; } } @@ -654,7 +645,6 @@ namespace UnitTest.Issues.TestProtos { public const int PrimitiveValueFieldNumber = 1; private int primitiveValue_; [global::System.ObsoleteAttribute()] - [pbr::ProtobufField(1, "PrimitiveValue")] public int PrimitiveValue { get { return primitiveValue_; } set { @@ -668,7 +658,6 @@ namespace UnitTest.Issues.TestProtos { = pb::FieldCodec.ForInt32(18); private readonly pbc::RepeatedField<int> primitiveArray_ = new pbc::RepeatedField<int>(); [global::System.ObsoleteAttribute()] - [pbr::ProtobufField(2, "PrimitiveArray")] public pbc::RepeatedField<int> PrimitiveArray { get { return primitiveArray_; } } @@ -676,7 +665,6 @@ namespace UnitTest.Issues.TestProtos { public const int MessageValueFieldNumber = 3; private global::UnitTest.Issues.TestProtos.DeprecatedChild messageValue_; [global::System.ObsoleteAttribute()] - [pbr::ProtobufField(3, "MessageValue")] public global::UnitTest.Issues.TestProtos.DeprecatedChild MessageValue { get { return messageValue_; } set { @@ -690,7 +678,6 @@ namespace UnitTest.Issues.TestProtos { = pb::FieldCodec.ForMessage(34, global::UnitTest.Issues.TestProtos.DeprecatedChild.Parser); private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild> messageArray_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild>(); [global::System.ObsoleteAttribute()] - [pbr::ProtobufField(4, "MessageArray")] public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild> MessageArray { get { return messageArray_; } } @@ -698,7 +685,6 @@ namespace UnitTest.Issues.TestProtos { public const int EnumValueFieldNumber = 5; private global::UnitTest.Issues.TestProtos.DeprecatedEnum enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO; [global::System.ObsoleteAttribute()] - [pbr::ProtobufField(5, "EnumValue")] public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue { get { return enumValue_; } set { @@ -712,7 +698,6 @@ namespace UnitTest.Issues.TestProtos { = pb::FieldCodec.ForEnum(50, x => (int) x, x => (global::UnitTest.Issues.TestProtos.DeprecatedEnum) x); private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum> enumArray_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum>(); [global::System.ObsoleteAttribute()] - [pbr::ProtobufField(6, "EnumArray")] public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum> EnumArray { get { return enumArray_; } } @@ -859,8 +844,6 @@ namespace UnitTest.Issues.TestProtos { private static readonly pb::MessageParser<ItemField> _parser = new pb::MessageParser<ItemField>(() => new ItemField()); public static pb::MessageParser<ItemField> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "item" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[4]; } } @@ -895,7 +878,6 @@ namespace UnitTest.Issues.TestProtos { public const int ItemFieldNumber = 1; private int item_; - [pbr::ProtobufField(1, "item")] public int Item { get { return item_; } set { diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs index 55ed08af..01492b29 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs @@ -147,10 +147,44 @@ namespace Google.Protobuf.TestProtos { "cXVlc3QaHi5wcm90b2J1Zl91bml0dGVzdC5Gb29SZXNwb25zZRJECgNCYXIS", "HS5wcm90b2J1Zl91bml0dGVzdC5CYXJSZXF1ZXN0Gh4ucHJvdG9idWZfdW5p", "dHRlc3QuQmFyUmVzcG9uc2VCOkINVW5pdHRlc3RQcm90b0gBgAEBiAEBkAEB", - "+AEBqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw==")); + "+AEBqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.UnittestImportProto3.Descriptor, }, - new global::System.Type[] { typeof(global::Google.Protobuf.TestProtos.TestAllTypes), typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage), typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum), typeof(global::Google.Protobuf.TestProtos.NestedTestAllTypes), typeof(global::Google.Protobuf.TestProtos.TestDeprecatedFields), typeof(global::Google.Protobuf.TestProtos.ForeignMessage), typeof(global::Google.Protobuf.TestProtos.TestReservedFields), typeof(global::Google.Protobuf.TestProtos.TestForeignNested), typeof(global::Google.Protobuf.TestProtos.TestReallyLargeTagNumber), typeof(global::Google.Protobuf.TestProtos.TestRecursiveMessage), typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionA), typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionB), typeof(global::Google.Protobuf.TestProtos.TestCamelCaseFieldNames), typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings), typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage), typeof(global::Google.Protobuf.TestProtos.SparseEnumMessage), typeof(global::Google.Protobuf.TestProtos.OneString), typeof(global::Google.Protobuf.TestProtos.MoreString), typeof(global::Google.Protobuf.TestProtos.OneBytes), typeof(global::Google.Protobuf.TestProtos.MoreBytes), typeof(global::Google.Protobuf.TestProtos.Int32Message), typeof(global::Google.Protobuf.TestProtos.Uint32Message), typeof(global::Google.Protobuf.TestProtos.Int64Message), typeof(global::Google.Protobuf.TestProtos.Uint64Message), typeof(global::Google.Protobuf.TestProtos.BoolMessage), typeof(global::Google.Protobuf.TestProtos.TestOneof), typeof(global::Google.Protobuf.TestProtos.TestPackedTypes), typeof(global::Google.Protobuf.TestProtos.TestUnpackedTypes), typeof(global::Google.Protobuf.TestProtos.TestRepeatedScalarDifferentTagSizes), typeof(global::Google.Protobuf.TestProtos.TestCommentInjectionMessage), typeof(global::Google.Protobuf.TestProtos.FooRequest), typeof(global::Google.Protobuf.TestProtos.FooResponse), typeof(global::Google.Protobuf.TestProtos.FooClientMessage), typeof(global::Google.Protobuf.TestProtos.FooServerMessage), typeof(global::Google.Protobuf.TestProtos.BarRequest), typeof(global::Google.Protobuf.TestProtos.BarResponse), typeof(global::Google.Protobuf.TestProtos.ForeignEnum), typeof(global::Google.Protobuf.TestProtos.TestEnumWithDupValue), typeof(global::Google.Protobuf.TestProtos.TestSparseEnum), }); + new pbr::GeneratedCodeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.ForeignEnum), typeof(global::Google.Protobuf.TestProtos.TestEnumWithDupValue), typeof(global::Google.Protobuf.TestProtos.TestSparseEnum), }, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestAllTypes), new[]{ "SingleInt32", "SingleInt64", "SingleUint32", "SingleUint64", "SingleSint32", "SingleSint64", "SingleFixed32", "SingleFixed64", "SingleSfixed32", "SingleSfixed64", "SingleFloat", "SingleDouble", "SingleBool", "SingleString", "SingleBytes", "SingleNestedMessage", "SingleForeignMessage", "SingleImportMessage", "SingleNestedEnum", "SingleForeignEnum", "SingleImportEnum", "SinglePublicImportMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedImportMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedImportEnum", "RepeatedPublicImportMessage", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes" }, new[]{ "OneofField" }, new[]{ typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) }, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage), new[]{ "Bb" }, null, null, null)}), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.NestedTestAllTypes), new[]{ "Child", "Payload", "RepeatedChild" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestDeprecatedFields), new[]{ "DeprecatedInt32" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.ForeignMessage), new[]{ "C" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestReservedFields), null, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestForeignNested), new[]{ "ForeignNested" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestReallyLargeTagNumber), new[]{ "A", "Bb" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestRecursiveMessage), new[]{ "A", "I" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionA), new[]{ "Bb" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionB), new[]{ "A", "OptionalInt32" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestCamelCaseFieldNames), new[]{ "PrimitiveField", "StringField", "EnumField", "MessageField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedEnumField", "RepeatedMessageField" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings), new[]{ "MyString", "MyInt", "MyFloat", "SingleNestedMessage" }, null, null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage), new[]{ "Oo", "Bb" }, null, null, null)}), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.SparseEnumMessage), new[]{ "SparseEnum" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.OneString), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.MoreString), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.OneBytes), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.MoreBytes), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.Int32Message), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.Uint32Message), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.Int64Message), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.Uint64Message), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.BoolMessage), new[]{ "Data" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestOneof), new[]{ "FooInt", "FooString", "FooMessage" }, new[]{ "Foo" }, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestPackedTypes), new[]{ "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedEnum" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestUnpackedTypes), new[]{ "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedEnum" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestRepeatedScalarDifferentTagSizes), new[]{ "RepeatedFixed32", "RepeatedInt32", "RepeatedFixed64", "RepeatedInt64", "RepeatedFloat", "RepeatedUint64" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestCommentInjectionMessage), new[]{ "A" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.FooRequest), null, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.FooResponse), null, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.FooClientMessage), null, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.FooServerMessage), null, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.BarRequest), null, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.BarResponse), null, null, null, null) + })); } #endregion @@ -190,8 +224,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestAllTypes> _parser = new pb::MessageParser<TestAllTypes>(() => new TestAllTypes()); public static pb::MessageParser<TestAllTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "oneof_bytes", "oneof_nested_message", "oneof_string", "oneof_uint32", "repeated_bool", "repeated_bytes", "repeated_double", "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_foreign_enum", "repeated_foreign_message", "repeated_import_enum", "repeated_import_message", "repeated_int32", "repeated_int64", "repeated_nested_enum", "repeated_nested_message", "repeated_public_import_message", "repeated_sfixed32", "repeated_sfixed64", "repeated_sint32", "repeated_sint64", "repeated_string", "repeated_uint32", "repeated_uint64", "single_bool", "single_bytes", "single_double", "single_fixed32", "single_fixed64", "single_float", "single_foreign_enum", "single_foreign_message", "single_import_enum", "single_import_message", "single_int32", "single_int64", "single_nested_enum", "single_nested_message", "single_public_import_message", "single_sfixed32", "single_sfixed64", "single_sint32", "single_sint64", "single_string", "single_uint32", "single_uint64" }; - private static readonly uint[] _fieldTags = new uint[] { 914, 898, 906, 888, 346, 362, 338, 298, 306, 330, 418, 394, 426, 402, 250, 258, 410, 386, 434, 314, 322, 282, 290, 354, 266, 274, 104, 122, 97, 61, 65, 93, 176, 154, 184, 162, 8, 16, 168, 146, 210, 77, 81, 40, 48, 114, 24, 32 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[0]; } } @@ -311,7 +343,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleInt32FieldNumber = 1; private int singleInt32_; - [pbr::ProtobufField(1, "single_int32")] public int SingleInt32 { get { return singleInt32_; } set { @@ -322,7 +353,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleInt64FieldNumber = 2; private long singleInt64_; - [pbr::ProtobufField(2, "single_int64")] public long SingleInt64 { get { return singleInt64_; } set { @@ -333,7 +363,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleUint32FieldNumber = 3; private uint singleUint32_; - [pbr::ProtobufField(3, "single_uint32")] public uint SingleUint32 { get { return singleUint32_; } set { @@ -344,7 +373,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleUint64FieldNumber = 4; private ulong singleUint64_; - [pbr::ProtobufField(4, "single_uint64")] public ulong SingleUint64 { get { return singleUint64_; } set { @@ -355,7 +383,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleSint32FieldNumber = 5; private int singleSint32_; - [pbr::ProtobufField(5, "single_sint32")] public int SingleSint32 { get { return singleSint32_; } set { @@ -366,7 +393,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleSint64FieldNumber = 6; private long singleSint64_; - [pbr::ProtobufField(6, "single_sint64")] public long SingleSint64 { get { return singleSint64_; } set { @@ -377,7 +403,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleFixed32FieldNumber = 7; private uint singleFixed32_; - [pbr::ProtobufField(7, "single_fixed32")] public uint SingleFixed32 { get { return singleFixed32_; } set { @@ -388,7 +413,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleFixed64FieldNumber = 8; private ulong singleFixed64_; - [pbr::ProtobufField(8, "single_fixed64")] public ulong SingleFixed64 { get { return singleFixed64_; } set { @@ -399,7 +423,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleSfixed32FieldNumber = 9; private int singleSfixed32_; - [pbr::ProtobufField(9, "single_sfixed32")] public int SingleSfixed32 { get { return singleSfixed32_; } set { @@ -410,7 +433,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleSfixed64FieldNumber = 10; private long singleSfixed64_; - [pbr::ProtobufField(10, "single_sfixed64")] public long SingleSfixed64 { get { return singleSfixed64_; } set { @@ -421,7 +443,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleFloatFieldNumber = 11; private float singleFloat_; - [pbr::ProtobufField(11, "single_float")] public float SingleFloat { get { return singleFloat_; } set { @@ -432,7 +453,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleDoubleFieldNumber = 12; private double singleDouble_; - [pbr::ProtobufField(12, "single_double")] public double SingleDouble { get { return singleDouble_; } set { @@ -443,7 +463,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleBoolFieldNumber = 13; private bool singleBool_; - [pbr::ProtobufField(13, "single_bool")] public bool SingleBool { get { return singleBool_; } set { @@ -454,7 +473,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleStringFieldNumber = 14; private string singleString_ = ""; - [pbr::ProtobufField(14, "single_string")] public string SingleString { get { return singleString_; } set { @@ -465,7 +483,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleBytesFieldNumber = 15; private pb::ByteString singleBytes_ = pb::ByteString.Empty; - [pbr::ProtobufField(15, "single_bytes")] public pb::ByteString SingleBytes { get { return singleBytes_; } set { @@ -476,7 +493,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleNestedMessageFieldNumber = 18; private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage singleNestedMessage_; - [pbr::ProtobufField(18, "single_nested_message")] public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage SingleNestedMessage { get { return singleNestedMessage_; } set { @@ -487,7 +503,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleForeignMessageFieldNumber = 19; private global::Google.Protobuf.TestProtos.ForeignMessage singleForeignMessage_; - [pbr::ProtobufField(19, "single_foreign_message")] public global::Google.Protobuf.TestProtos.ForeignMessage SingleForeignMessage { get { return singleForeignMessage_; } set { @@ -498,7 +513,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleImportMessageFieldNumber = 20; private global::Google.Protobuf.TestProtos.ImportMessage singleImportMessage_; - [pbr::ProtobufField(20, "single_import_message")] public global::Google.Protobuf.TestProtos.ImportMessage SingleImportMessage { get { return singleImportMessage_; } set { @@ -509,7 +523,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleNestedEnumFieldNumber = 21; private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum singleNestedEnum_ = global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED; - [pbr::ProtobufField(21, "single_nested_enum")] public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum SingleNestedEnum { get { return singleNestedEnum_; } set { @@ -520,7 +533,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleForeignEnumFieldNumber = 22; private global::Google.Protobuf.TestProtos.ForeignEnum singleForeignEnum_ = global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED; - [pbr::ProtobufField(22, "single_foreign_enum")] public global::Google.Protobuf.TestProtos.ForeignEnum SingleForeignEnum { get { return singleForeignEnum_; } set { @@ -531,7 +543,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleImportEnumFieldNumber = 23; private global::Google.Protobuf.TestProtos.ImportEnum singleImportEnum_ = global::Google.Protobuf.TestProtos.ImportEnum.IMPORT_ENUM_UNSPECIFIED; - [pbr::ProtobufField(23, "single_import_enum")] public global::Google.Protobuf.TestProtos.ImportEnum SingleImportEnum { get { return singleImportEnum_; } set { @@ -542,7 +553,6 @@ namespace Google.Protobuf.TestProtos { public const int SinglePublicImportMessageFieldNumber = 26; private global::Google.Protobuf.TestProtos.PublicImportMessage singlePublicImportMessage_; - [pbr::ProtobufField(26, "single_public_import_message")] public global::Google.Protobuf.TestProtos.PublicImportMessage SinglePublicImportMessage { get { return singlePublicImportMessage_; } set { @@ -555,7 +565,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec = pb::FieldCodec.ForInt32(250); private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(31, "repeated_int32")] public pbc::RepeatedField<int> RepeatedInt32 { get { return repeatedInt32_; } } @@ -564,7 +573,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec = pb::FieldCodec.ForInt64(258); private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(32, "repeated_int64")] public pbc::RepeatedField<long> RepeatedInt64 { get { return repeatedInt64_; } } @@ -573,7 +581,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint> _repeated_repeatedUint32_codec = pb::FieldCodec.ForUInt32(266); private readonly pbc::RepeatedField<uint> repeatedUint32_ = new pbc::RepeatedField<uint>(); - [pbr::ProtobufField(33, "repeated_uint32")] public pbc::RepeatedField<uint> RepeatedUint32 { get { return repeatedUint32_; } } @@ -582,7 +589,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec = pb::FieldCodec.ForUInt64(274); private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(34, "repeated_uint64")] public pbc::RepeatedField<ulong> RepeatedUint64 { get { return repeatedUint64_; } } @@ -591,7 +597,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_repeatedSint32_codec = pb::FieldCodec.ForSInt32(282); private readonly pbc::RepeatedField<int> repeatedSint32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(35, "repeated_sint32")] public pbc::RepeatedField<int> RepeatedSint32 { get { return repeatedSint32_; } } @@ -600,7 +605,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_repeatedSint64_codec = pb::FieldCodec.ForSInt64(290); private readonly pbc::RepeatedField<long> repeatedSint64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(36, "repeated_sint64")] public pbc::RepeatedField<long> RepeatedSint64 { get { return repeatedSint64_; } } @@ -609,7 +613,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec = pb::FieldCodec.ForFixed32(298); private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>(); - [pbr::ProtobufField(37, "repeated_fixed32")] public pbc::RepeatedField<uint> RepeatedFixed32 { get { return repeatedFixed32_; } } @@ -618,7 +621,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec = pb::FieldCodec.ForFixed64(306); private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(38, "repeated_fixed64")] public pbc::RepeatedField<ulong> RepeatedFixed64 { get { return repeatedFixed64_; } } @@ -627,7 +629,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_repeatedSfixed32_codec = pb::FieldCodec.ForSFixed32(314); private readonly pbc::RepeatedField<int> repeatedSfixed32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(39, "repeated_sfixed32")] public pbc::RepeatedField<int> RepeatedSfixed32 { get { return repeatedSfixed32_; } } @@ -636,7 +637,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_repeatedSfixed64_codec = pb::FieldCodec.ForSFixed64(322); private readonly pbc::RepeatedField<long> repeatedSfixed64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(40, "repeated_sfixed64")] public pbc::RepeatedField<long> RepeatedSfixed64 { get { return repeatedSfixed64_; } } @@ -645,7 +645,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec = pb::FieldCodec.ForFloat(330); private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>(); - [pbr::ProtobufField(41, "repeated_float")] public pbc::RepeatedField<float> RepeatedFloat { get { return repeatedFloat_; } } @@ -654,7 +653,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<double> _repeated_repeatedDouble_codec = pb::FieldCodec.ForDouble(338); private readonly pbc::RepeatedField<double> repeatedDouble_ = new pbc::RepeatedField<double>(); - [pbr::ProtobufField(42, "repeated_double")] public pbc::RepeatedField<double> RepeatedDouble { get { return repeatedDouble_; } } @@ -663,7 +661,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<bool> _repeated_repeatedBool_codec = pb::FieldCodec.ForBool(346); private readonly pbc::RepeatedField<bool> repeatedBool_ = new pbc::RepeatedField<bool>(); - [pbr::ProtobufField(43, "repeated_bool")] public pbc::RepeatedField<bool> RepeatedBool { get { return repeatedBool_; } } @@ -672,7 +669,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<string> _repeated_repeatedString_codec = pb::FieldCodec.ForString(354); private readonly pbc::RepeatedField<string> repeatedString_ = new pbc::RepeatedField<string>(); - [pbr::ProtobufField(44, "repeated_string")] public pbc::RepeatedField<string> RepeatedString { get { return repeatedString_; } } @@ -681,7 +677,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<pb::ByteString> _repeated_repeatedBytes_codec = pb::FieldCodec.ForBytes(362); private readonly pbc::RepeatedField<pb::ByteString> repeatedBytes_ = new pbc::RepeatedField<pb::ByteString>(); - [pbr::ProtobufField(45, "repeated_bytes")] public pbc::RepeatedField<pb::ByteString> RepeatedBytes { get { return repeatedBytes_; } } @@ -690,7 +685,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> _repeated_repeatedNestedMessage_codec = pb::FieldCodec.ForMessage(386, global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> repeatedNestedMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage>(); - [pbr::ProtobufField(48, "repeated_nested_message")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> RepeatedNestedMessage { get { return repeatedNestedMessage_; } } @@ -699,7 +693,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignMessage> _repeated_repeatedForeignMessage_codec = pb::FieldCodec.ForMessage(394, global::Google.Protobuf.TestProtos.ForeignMessage.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> repeatedForeignMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage>(); - [pbr::ProtobufField(49, "repeated_foreign_message")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> RepeatedForeignMessage { get { return repeatedForeignMessage_; } } @@ -708,7 +701,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ImportMessage> _repeated_repeatedImportMessage_codec = pb::FieldCodec.ForMessage(402, global::Google.Protobuf.TestProtos.ImportMessage.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage> repeatedImportMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage>(); - [pbr::ProtobufField(50, "repeated_import_message")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage> RepeatedImportMessage { get { return repeatedImportMessage_; } } @@ -717,7 +709,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> _repeated_repeatedNestedEnum_codec = pb::FieldCodec.ForEnum(410, x => (int) x, x => (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) x); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> repeatedNestedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum>(); - [pbr::ProtobufField(51, "repeated_nested_enum")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> RepeatedNestedEnum { get { return repeatedNestedEnum_; } } @@ -726,7 +717,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_repeatedForeignEnum_codec = pb::FieldCodec.ForEnum(418, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> repeatedForeignEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>(); - [pbr::ProtobufField(52, "repeated_foreign_enum")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> RepeatedForeignEnum { get { return repeatedForeignEnum_; } } @@ -735,7 +725,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ImportEnum> _repeated_repeatedImportEnum_codec = pb::FieldCodec.ForEnum(426, x => (int) x, x => (global::Google.Protobuf.TestProtos.ImportEnum) x); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum> repeatedImportEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum>(); - [pbr::ProtobufField(53, "repeated_import_enum")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum> RepeatedImportEnum { get { return repeatedImportEnum_; } } @@ -744,13 +733,11 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.PublicImportMessage> _repeated_repeatedPublicImportMessage_codec = pb::FieldCodec.ForMessage(434, global::Google.Protobuf.TestProtos.PublicImportMessage.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage> repeatedPublicImportMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage>(); - [pbr::ProtobufField(54, "repeated_public_import_message")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage> RepeatedPublicImportMessage { get { return repeatedPublicImportMessage_; } } public const int OneofUint32FieldNumber = 111; - [pbr::ProtobufField(111, "oneof_uint32")] public uint OneofUint32 { get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint32 ? (uint) oneofField_ : 0; } set { @@ -761,7 +748,6 @@ namespace Google.Protobuf.TestProtos { } public const int OneofNestedMessageFieldNumber = 112; - [pbr::ProtobufField(112, "oneof_nested_message")] public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage OneofNestedMessage { get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage ? (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage) oneofField_ : null; } set { @@ -772,7 +758,6 @@ namespace Google.Protobuf.TestProtos { } public const int OneofStringFieldNumber = 113; - [pbr::ProtobufField(113, "oneof_string")] public string OneofString { get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString ? (string) oneofField_ : ""; } set { @@ -783,7 +768,6 @@ namespace Google.Protobuf.TestProtos { } public const int OneofBytesFieldNumber = 114; - [pbr::ProtobufField(114, "oneof_bytes")] public pb::ByteString OneofBytes { get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; } set { @@ -1544,8 +1528,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage()); public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "bb" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.TestAllTypes.Descriptor.NestedTypes[0]; } } @@ -1580,7 +1562,6 @@ namespace Google.Protobuf.TestProtos { public const int BbFieldNumber = 1; private int bb_; - [pbr::ProtobufField(1, "bb")] public int Bb { get { return bb_; } set { @@ -1669,8 +1650,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<NestedTestAllTypes> _parser = new pb::MessageParser<NestedTestAllTypes>(() => new NestedTestAllTypes()); public static pb::MessageParser<NestedTestAllTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "child", "payload", "repeated_child" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18, 26 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[1]; } } @@ -1710,7 +1689,6 @@ namespace Google.Protobuf.TestProtos { public const int ChildFieldNumber = 1; private global::Google.Protobuf.TestProtos.NestedTestAllTypes child_; - [pbr::ProtobufField(1, "child")] public global::Google.Protobuf.TestProtos.NestedTestAllTypes Child { get { return child_; } set { @@ -1721,7 +1699,6 @@ namespace Google.Protobuf.TestProtos { public const int PayloadFieldNumber = 2; private global::Google.Protobuf.TestProtos.TestAllTypes payload_; - [pbr::ProtobufField(2, "payload")] public global::Google.Protobuf.TestProtos.TestAllTypes Payload { get { return payload_; } set { @@ -1734,7 +1711,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.NestedTestAllTypes> _repeated_repeatedChild_codec = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.TestProtos.NestedTestAllTypes.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes> repeatedChild_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes>(); - [pbr::ProtobufField(3, "repeated_child")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes> RepeatedChild { get { return repeatedChild_; } } @@ -1851,8 +1827,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestDeprecatedFields> _parser = new pb::MessageParser<TestDeprecatedFields>(() => new TestDeprecatedFields()); public static pb::MessageParser<TestDeprecatedFields> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "deprecated_int32" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[2]; } } @@ -1888,7 +1862,6 @@ namespace Google.Protobuf.TestProtos { public const int DeprecatedInt32FieldNumber = 1; private int deprecatedInt32_; [global::System.ObsoleteAttribute()] - [pbr::ProtobufField(1, "deprecated_int32")] public int DeprecatedInt32 { get { return deprecatedInt32_; } set { @@ -1972,8 +1945,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<ForeignMessage> _parser = new pb::MessageParser<ForeignMessage>(() => new ForeignMessage()); public static pb::MessageParser<ForeignMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "c" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[3]; } } @@ -2008,7 +1979,6 @@ namespace Google.Protobuf.TestProtos { public const int CFieldNumber = 1; private int c_; - [pbr::ProtobufField(1, "c")] public int C { get { return c_; } set { @@ -2092,8 +2062,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestReservedFields> _parser = new pb::MessageParser<TestReservedFields>(() => new TestReservedFields()); public static pb::MessageParser<TestReservedFields> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[4]; } } @@ -2184,8 +2152,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestForeignNested> _parser = new pb::MessageParser<TestForeignNested>(() => new TestForeignNested()); public static pb::MessageParser<TestForeignNested> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "foreign_nested" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[5]; } } @@ -2221,7 +2187,6 @@ namespace Google.Protobuf.TestProtos { public const int ForeignNestedFieldNumber = 1; private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage foreignNested_; - [pbr::ProtobufField(1, "foreign_nested")] public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage ForeignNested { get { return foreignNested_; } set { @@ -2311,8 +2276,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestReallyLargeTagNumber> _parser = new pb::MessageParser<TestReallyLargeTagNumber>(() => new TestReallyLargeTagNumber()); public static pb::MessageParser<TestReallyLargeTagNumber> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "a", "bb" }; - private static readonly uint[] _fieldTags = new uint[] { 8, 2147483640 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[6]; } } @@ -2348,7 +2311,6 @@ namespace Google.Protobuf.TestProtos { public const int AFieldNumber = 1; private int a_; - [pbr::ProtobufField(1, "a")] public int A { get { return a_; } set { @@ -2359,7 +2321,6 @@ namespace Google.Protobuf.TestProtos { public const int BbFieldNumber = 268435455; private int bb_; - [pbr::ProtobufField(268435455, "bb")] public int Bb { get { return bb_; } set { @@ -2459,8 +2420,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestRecursiveMessage> _parser = new pb::MessageParser<TestRecursiveMessage>(() => new TestRecursiveMessage()); public static pb::MessageParser<TestRecursiveMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "a", "i" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 16 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[7]; } } @@ -2497,7 +2456,6 @@ namespace Google.Protobuf.TestProtos { public const int AFieldNumber = 1; private global::Google.Protobuf.TestProtos.TestRecursiveMessage a_; - [pbr::ProtobufField(1, "a")] public global::Google.Protobuf.TestProtos.TestRecursiveMessage A { get { return a_; } set { @@ -2508,7 +2466,6 @@ namespace Google.Protobuf.TestProtos { public const int IFieldNumber = 2; private int i_; - [pbr::ProtobufField(2, "i")] public int I { get { return i_; } set { @@ -2614,8 +2571,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestMutualRecursionA> _parser = new pb::MessageParser<TestMutualRecursionA>(() => new TestMutualRecursionA()); public static pb::MessageParser<TestMutualRecursionA> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "bb" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[8]; } } @@ -2651,7 +2606,6 @@ namespace Google.Protobuf.TestProtos { public const int BbFieldNumber = 1; private global::Google.Protobuf.TestProtos.TestMutualRecursionB bb_; - [pbr::ProtobufField(1, "bb")] public global::Google.Protobuf.TestProtos.TestMutualRecursionB Bb { get { return bb_; } set { @@ -2741,8 +2695,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestMutualRecursionB> _parser = new pb::MessageParser<TestMutualRecursionB>(() => new TestMutualRecursionB()); public static pb::MessageParser<TestMutualRecursionB> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "a", "optional_int32" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 16 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[9]; } } @@ -2779,7 +2731,6 @@ namespace Google.Protobuf.TestProtos { public const int AFieldNumber = 1; private global::Google.Protobuf.TestProtos.TestMutualRecursionA a_; - [pbr::ProtobufField(1, "a")] public global::Google.Protobuf.TestProtos.TestMutualRecursionA A { get { return a_; } set { @@ -2790,7 +2741,6 @@ namespace Google.Protobuf.TestProtos { public const int OptionalInt32FieldNumber = 2; private int optionalInt32_; - [pbr::ProtobufField(2, "optional_int32")] public int OptionalInt32 { get { return optionalInt32_; } set { @@ -2896,8 +2846,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestCamelCaseFieldNames> _parser = new pb::MessageParser<TestCamelCaseFieldNames>(() => new TestCamelCaseFieldNames()); public static pb::MessageParser<TestCamelCaseFieldNames> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "EnumField", "MessageField", "PrimitiveField", "RepeatedEnumField", "RepeatedMessageField", "RepeatedPrimitiveField", "RepeatedStringField", "StringField" }; - private static readonly uint[] _fieldTags = new uint[] { 24, 34, 8, 74, 82, 58, 66, 18 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[10]; } } @@ -2944,7 +2892,6 @@ namespace Google.Protobuf.TestProtos { public const int PrimitiveFieldFieldNumber = 1; private int primitiveField_; - [pbr::ProtobufField(1, "PrimitiveField")] public int PrimitiveField { get { return primitiveField_; } set { @@ -2955,7 +2902,6 @@ namespace Google.Protobuf.TestProtos { public const int StringFieldFieldNumber = 2; private string stringField_ = ""; - [pbr::ProtobufField(2, "StringField")] public string StringField { get { return stringField_; } set { @@ -2966,7 +2912,6 @@ namespace Google.Protobuf.TestProtos { public const int EnumFieldFieldNumber = 3; private global::Google.Protobuf.TestProtos.ForeignEnum enumField_ = global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED; - [pbr::ProtobufField(3, "EnumField")] public global::Google.Protobuf.TestProtos.ForeignEnum EnumField { get { return enumField_; } set { @@ -2977,7 +2922,6 @@ namespace Google.Protobuf.TestProtos { public const int MessageFieldFieldNumber = 4; private global::Google.Protobuf.TestProtos.ForeignMessage messageField_; - [pbr::ProtobufField(4, "MessageField")] public global::Google.Protobuf.TestProtos.ForeignMessage MessageField { get { return messageField_; } set { @@ -2990,7 +2934,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_repeatedPrimitiveField_codec = pb::FieldCodec.ForInt32(58); private readonly pbc::RepeatedField<int> repeatedPrimitiveField_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(7, "RepeatedPrimitiveField")] public pbc::RepeatedField<int> RepeatedPrimitiveField { get { return repeatedPrimitiveField_; } } @@ -2999,7 +2942,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<string> _repeated_repeatedStringField_codec = pb::FieldCodec.ForString(66); private readonly pbc::RepeatedField<string> repeatedStringField_ = new pbc::RepeatedField<string>(); - [pbr::ProtobufField(8, "RepeatedStringField")] public pbc::RepeatedField<string> RepeatedStringField { get { return repeatedStringField_; } } @@ -3008,7 +2950,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_repeatedEnumField_codec = pb::FieldCodec.ForEnum(74, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> repeatedEnumField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>(); - [pbr::ProtobufField(9, "RepeatedEnumField")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> RepeatedEnumField { get { return repeatedEnumField_; } } @@ -3017,7 +2958,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignMessage> _repeated_repeatedMessageField_codec = pb::FieldCodec.ForMessage(82, global::Google.Protobuf.TestProtos.ForeignMessage.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> repeatedMessageField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage>(); - [pbr::ProtobufField(10, "RepeatedMessageField")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> RepeatedMessageField { get { return repeatedMessageField_; } } @@ -3189,8 +3129,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestFieldOrderings> _parser = new pb::MessageParser<TestFieldOrderings>(() => new TestFieldOrderings()); public static pb::MessageParser<TestFieldOrderings> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "my_float", "my_int", "my_string", "single_nested_message" }; - private static readonly uint[] _fieldTags = new uint[] { 813, 8, 90, 1602 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[11]; } } @@ -3229,7 +3167,6 @@ namespace Google.Protobuf.TestProtos { public const int MyStringFieldNumber = 11; private string myString_ = ""; - [pbr::ProtobufField(11, "my_string")] public string MyString { get { return myString_; } set { @@ -3240,7 +3177,6 @@ namespace Google.Protobuf.TestProtos { public const int MyIntFieldNumber = 1; private long myInt_; - [pbr::ProtobufField(1, "my_int")] public long MyInt { get { return myInt_; } set { @@ -3251,7 +3187,6 @@ namespace Google.Protobuf.TestProtos { public const int MyFloatFieldNumber = 101; private float myFloat_; - [pbr::ProtobufField(101, "my_float")] public float MyFloat { get { return myFloat_; } set { @@ -3262,7 +3197,6 @@ namespace Google.Protobuf.TestProtos { public const int SingleNestedMessageFieldNumber = 200; private global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage singleNestedMessage_; - [pbr::ProtobufField(200, "single_nested_message")] public global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage SingleNestedMessage { get { return singleNestedMessage_; } set { @@ -3401,8 +3335,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage()); public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "bb", "oo" }; - private static readonly uint[] _fieldTags = new uint[] { 8, 16 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.TestFieldOrderings.Descriptor.NestedTypes[0]; } } @@ -3438,7 +3370,6 @@ namespace Google.Protobuf.TestProtos { public const int OoFieldNumber = 2; private long oo_; - [pbr::ProtobufField(2, "oo")] public long Oo { get { return oo_; } set { @@ -3449,7 +3380,6 @@ namespace Google.Protobuf.TestProtos { public const int BbFieldNumber = 1; private int bb_; - [pbr::ProtobufField(1, "bb")] public int Bb { get { return bb_; } set { @@ -3554,8 +3484,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<SparseEnumMessage> _parser = new pb::MessageParser<SparseEnumMessage>(() => new SparseEnumMessage()); public static pb::MessageParser<SparseEnumMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "sparse_enum" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[12]; } } @@ -3590,7 +3518,6 @@ namespace Google.Protobuf.TestProtos { public const int SparseEnumFieldNumber = 1; private global::Google.Protobuf.TestProtos.TestSparseEnum sparseEnum_ = global::Google.Protobuf.TestProtos.TestSparseEnum.TEST_SPARSE_ENUM_UNSPECIFIED; - [pbr::ProtobufField(1, "sparse_enum")] public global::Google.Protobuf.TestProtos.TestSparseEnum SparseEnum { get { return sparseEnum_; } set { @@ -3674,8 +3601,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<OneString> _parser = new pb::MessageParser<OneString>(() => new OneString()); public static pb::MessageParser<OneString> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[13]; } } @@ -3710,7 +3635,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private string data_ = ""; - [pbr::ProtobufField(1, "data")] public string Data { get { return data_; } set { @@ -3794,8 +3718,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<MoreString> _parser = new pb::MessageParser<MoreString>(() => new MoreString()); public static pb::MessageParser<MoreString> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[14]; } } @@ -3833,7 +3755,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<string> _repeated_data_codec = pb::FieldCodec.ForString(10); private readonly pbc::RepeatedField<string> data_ = new pbc::RepeatedField<string>(); - [pbr::ProtobufField(1, "data")] public pbc::RepeatedField<string> Data { get { return data_; } } @@ -3906,8 +3827,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<OneBytes> _parser = new pb::MessageParser<OneBytes>(() => new OneBytes()); public static pb::MessageParser<OneBytes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[15]; } } @@ -3942,7 +3861,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private pb::ByteString data_ = pb::ByteString.Empty; - [pbr::ProtobufField(1, "data")] public pb::ByteString Data { get { return data_; } set { @@ -4026,8 +3944,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<MoreBytes> _parser = new pb::MessageParser<MoreBytes>(() => new MoreBytes()); public static pb::MessageParser<MoreBytes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[16]; } } @@ -4062,7 +3978,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private pb::ByteString data_ = pb::ByteString.Empty; - [pbr::ProtobufField(1, "data")] public pb::ByteString Data { get { return data_; } set { @@ -4146,8 +4061,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<Int32Message> _parser = new pb::MessageParser<Int32Message>(() => new Int32Message()); public static pb::MessageParser<Int32Message> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[17]; } } @@ -4182,7 +4095,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private int data_; - [pbr::ProtobufField(1, "data")] public int Data { get { return data_; } set { @@ -4266,8 +4178,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<Uint32Message> _parser = new pb::MessageParser<Uint32Message>(() => new Uint32Message()); public static pb::MessageParser<Uint32Message> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[18]; } } @@ -4302,7 +4212,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private uint data_; - [pbr::ProtobufField(1, "data")] public uint Data { get { return data_; } set { @@ -4386,8 +4295,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<Int64Message> _parser = new pb::MessageParser<Int64Message>(() => new Int64Message()); public static pb::MessageParser<Int64Message> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[19]; } } @@ -4422,7 +4329,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private long data_; - [pbr::ProtobufField(1, "data")] public long Data { get { return data_; } set { @@ -4506,8 +4412,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<Uint64Message> _parser = new pb::MessageParser<Uint64Message>(() => new Uint64Message()); public static pb::MessageParser<Uint64Message> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[20]; } } @@ -4542,7 +4446,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private ulong data_; - [pbr::ProtobufField(1, "data")] public ulong Data { get { return data_; } set { @@ -4626,8 +4529,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<BoolMessage> _parser = new pb::MessageParser<BoolMessage>(() => new BoolMessage()); public static pb::MessageParser<BoolMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "data" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[21]; } } @@ -4662,7 +4563,6 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private bool data_; - [pbr::ProtobufField(1, "data")] public bool Data { get { return data_; } set { @@ -4746,8 +4646,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestOneof> _parser = new pb::MessageParser<TestOneof>(() => new TestOneof()); public static pb::MessageParser<TestOneof> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "foo_int", "foo_message", "foo_string" }; - private static readonly uint[] _fieldTags = new uint[] { 8, 26, 18 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[22]; } } @@ -4793,7 +4691,6 @@ namespace Google.Protobuf.TestProtos { } public const int FooIntFieldNumber = 1; - [pbr::ProtobufField(1, "foo_int")] public int FooInt { get { return fooCase_ == FooOneofCase.FooInt ? (int) foo_ : 0; } set { @@ -4804,7 +4701,6 @@ namespace Google.Protobuf.TestProtos { } public const int FooStringFieldNumber = 2; - [pbr::ProtobufField(2, "foo_string")] public string FooString { get { return fooCase_ == FooOneofCase.FooString ? (string) foo_ : ""; } set { @@ -4815,7 +4711,6 @@ namespace Google.Protobuf.TestProtos { } public const int FooMessageFieldNumber = 3; - [pbr::ProtobufField(3, "foo_message")] public global::Google.Protobuf.TestProtos.TestAllTypes FooMessage { get { return fooCase_ == FooOneofCase.FooMessage ? (global::Google.Protobuf.TestProtos.TestAllTypes) foo_ : null; } set { @@ -4960,8 +4855,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestPackedTypes> _parser = new pb::MessageParser<TestPackedTypes>(() => new TestPackedTypes()); public static pb::MessageParser<TestPackedTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "packed_bool", "packed_double", "packed_enum", "packed_fixed32", "packed_fixed64", "packed_float", "packed_int32", "packed_int64", "packed_sfixed32", "packed_sfixed64", "packed_sint32", "packed_sint64", "packed_uint32", "packed_uint64" }; - private static readonly uint[] _fieldTags = new uint[] { 818, 810, 826, 770, 778, 802, 722, 730, 786, 794, 754, 762, 738, 746 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[23]; } } @@ -5025,7 +4918,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_packedInt32_codec = pb::FieldCodec.ForInt32(722); private readonly pbc::RepeatedField<int> packedInt32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(90, "packed_int32")] public pbc::RepeatedField<int> PackedInt32 { get { return packedInt32_; } } @@ -5034,7 +4926,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_packedInt64_codec = pb::FieldCodec.ForInt64(730); private readonly pbc::RepeatedField<long> packedInt64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(91, "packed_int64")] public pbc::RepeatedField<long> PackedInt64 { get { return packedInt64_; } } @@ -5043,7 +4934,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint> _repeated_packedUint32_codec = pb::FieldCodec.ForUInt32(738); private readonly pbc::RepeatedField<uint> packedUint32_ = new pbc::RepeatedField<uint>(); - [pbr::ProtobufField(92, "packed_uint32")] public pbc::RepeatedField<uint> PackedUint32 { get { return packedUint32_; } } @@ -5052,7 +4942,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_packedUint64_codec = pb::FieldCodec.ForUInt64(746); private readonly pbc::RepeatedField<ulong> packedUint64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(93, "packed_uint64")] public pbc::RepeatedField<ulong> PackedUint64 { get { return packedUint64_; } } @@ -5061,7 +4950,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_packedSint32_codec = pb::FieldCodec.ForSInt32(754); private readonly pbc::RepeatedField<int> packedSint32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(94, "packed_sint32")] public pbc::RepeatedField<int> PackedSint32 { get { return packedSint32_; } } @@ -5070,7 +4958,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_packedSint64_codec = pb::FieldCodec.ForSInt64(762); private readonly pbc::RepeatedField<long> packedSint64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(95, "packed_sint64")] public pbc::RepeatedField<long> PackedSint64 { get { return packedSint64_; } } @@ -5079,7 +4966,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint> _repeated_packedFixed32_codec = pb::FieldCodec.ForFixed32(770); private readonly pbc::RepeatedField<uint> packedFixed32_ = new pbc::RepeatedField<uint>(); - [pbr::ProtobufField(96, "packed_fixed32")] public pbc::RepeatedField<uint> PackedFixed32 { get { return packedFixed32_; } } @@ -5088,7 +4974,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_packedFixed64_codec = pb::FieldCodec.ForFixed64(778); private readonly pbc::RepeatedField<ulong> packedFixed64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(97, "packed_fixed64")] public pbc::RepeatedField<ulong> PackedFixed64 { get { return packedFixed64_; } } @@ -5097,7 +4982,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_packedSfixed32_codec = pb::FieldCodec.ForSFixed32(786); private readonly pbc::RepeatedField<int> packedSfixed32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(98, "packed_sfixed32")] public pbc::RepeatedField<int> PackedSfixed32 { get { return packedSfixed32_; } } @@ -5106,7 +4990,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_packedSfixed64_codec = pb::FieldCodec.ForSFixed64(794); private readonly pbc::RepeatedField<long> packedSfixed64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(99, "packed_sfixed64")] public pbc::RepeatedField<long> PackedSfixed64 { get { return packedSfixed64_; } } @@ -5115,7 +4998,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<float> _repeated_packedFloat_codec = pb::FieldCodec.ForFloat(802); private readonly pbc::RepeatedField<float> packedFloat_ = new pbc::RepeatedField<float>(); - [pbr::ProtobufField(100, "packed_float")] public pbc::RepeatedField<float> PackedFloat { get { return packedFloat_; } } @@ -5124,7 +5006,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<double> _repeated_packedDouble_codec = pb::FieldCodec.ForDouble(810); private readonly pbc::RepeatedField<double> packedDouble_ = new pbc::RepeatedField<double>(); - [pbr::ProtobufField(101, "packed_double")] public pbc::RepeatedField<double> PackedDouble { get { return packedDouble_; } } @@ -5133,7 +5014,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<bool> _repeated_packedBool_codec = pb::FieldCodec.ForBool(818); private readonly pbc::RepeatedField<bool> packedBool_ = new pbc::RepeatedField<bool>(); - [pbr::ProtobufField(102, "packed_bool")] public pbc::RepeatedField<bool> PackedBool { get { return packedBool_; } } @@ -5142,7 +5022,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_packedEnum_codec = pb::FieldCodec.ForEnum(826, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> packedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>(); - [pbr::ProtobufField(103, "packed_enum")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> PackedEnum { get { return packedEnum_; } } @@ -5346,8 +5225,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestUnpackedTypes> _parser = new pb::MessageParser<TestUnpackedTypes>(() => new TestUnpackedTypes()); public static pb::MessageParser<TestUnpackedTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "unpacked_bool", "unpacked_double", "unpacked_enum", "unpacked_fixed32", "unpacked_fixed64", "unpacked_float", "unpacked_int32", "unpacked_int64", "unpacked_sfixed32", "unpacked_sfixed64", "unpacked_sint32", "unpacked_sint64", "unpacked_uint32", "unpacked_uint64" }; - private static readonly uint[] _fieldTags = new uint[] { 816, 809, 824, 773, 777, 805, 720, 728, 789, 793, 752, 760, 736, 744 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[24]; } } @@ -5411,7 +5288,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_unpackedInt32_codec = pb::FieldCodec.ForInt32(720); private readonly pbc::RepeatedField<int> unpackedInt32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(90, "unpacked_int32")] public pbc::RepeatedField<int> UnpackedInt32 { get { return unpackedInt32_; } } @@ -5420,7 +5296,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_unpackedInt64_codec = pb::FieldCodec.ForInt64(728); private readonly pbc::RepeatedField<long> unpackedInt64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(91, "unpacked_int64")] public pbc::RepeatedField<long> UnpackedInt64 { get { return unpackedInt64_; } } @@ -5429,7 +5304,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint> _repeated_unpackedUint32_codec = pb::FieldCodec.ForUInt32(736); private readonly pbc::RepeatedField<uint> unpackedUint32_ = new pbc::RepeatedField<uint>(); - [pbr::ProtobufField(92, "unpacked_uint32")] public pbc::RepeatedField<uint> UnpackedUint32 { get { return unpackedUint32_; } } @@ -5438,7 +5312,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_unpackedUint64_codec = pb::FieldCodec.ForUInt64(744); private readonly pbc::RepeatedField<ulong> unpackedUint64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(93, "unpacked_uint64")] public pbc::RepeatedField<ulong> UnpackedUint64 { get { return unpackedUint64_; } } @@ -5447,7 +5320,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_unpackedSint32_codec = pb::FieldCodec.ForSInt32(752); private readonly pbc::RepeatedField<int> unpackedSint32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(94, "unpacked_sint32")] public pbc::RepeatedField<int> UnpackedSint32 { get { return unpackedSint32_; } } @@ -5456,7 +5328,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_unpackedSint64_codec = pb::FieldCodec.ForSInt64(760); private readonly pbc::RepeatedField<long> unpackedSint64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(95, "unpacked_sint64")] public pbc::RepeatedField<long> UnpackedSint64 { get { return unpackedSint64_; } } @@ -5465,7 +5336,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint> _repeated_unpackedFixed32_codec = pb::FieldCodec.ForFixed32(773); private readonly pbc::RepeatedField<uint> unpackedFixed32_ = new pbc::RepeatedField<uint>(); - [pbr::ProtobufField(96, "unpacked_fixed32")] public pbc::RepeatedField<uint> UnpackedFixed32 { get { return unpackedFixed32_; } } @@ -5474,7 +5344,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_unpackedFixed64_codec = pb::FieldCodec.ForFixed64(777); private readonly pbc::RepeatedField<ulong> unpackedFixed64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(97, "unpacked_fixed64")] public pbc::RepeatedField<ulong> UnpackedFixed64 { get { return unpackedFixed64_; } } @@ -5483,7 +5352,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_unpackedSfixed32_codec = pb::FieldCodec.ForSFixed32(789); private readonly pbc::RepeatedField<int> unpackedSfixed32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(98, "unpacked_sfixed32")] public pbc::RepeatedField<int> UnpackedSfixed32 { get { return unpackedSfixed32_; } } @@ -5492,7 +5360,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_unpackedSfixed64_codec = pb::FieldCodec.ForSFixed64(793); private readonly pbc::RepeatedField<long> unpackedSfixed64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(99, "unpacked_sfixed64")] public pbc::RepeatedField<long> UnpackedSfixed64 { get { return unpackedSfixed64_; } } @@ -5501,7 +5368,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<float> _repeated_unpackedFloat_codec = pb::FieldCodec.ForFloat(805); private readonly pbc::RepeatedField<float> unpackedFloat_ = new pbc::RepeatedField<float>(); - [pbr::ProtobufField(100, "unpacked_float")] public pbc::RepeatedField<float> UnpackedFloat { get { return unpackedFloat_; } } @@ -5510,7 +5376,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<double> _repeated_unpackedDouble_codec = pb::FieldCodec.ForDouble(809); private readonly pbc::RepeatedField<double> unpackedDouble_ = new pbc::RepeatedField<double>(); - [pbr::ProtobufField(101, "unpacked_double")] public pbc::RepeatedField<double> UnpackedDouble { get { return unpackedDouble_; } } @@ -5519,7 +5384,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<bool> _repeated_unpackedBool_codec = pb::FieldCodec.ForBool(816); private readonly pbc::RepeatedField<bool> unpackedBool_ = new pbc::RepeatedField<bool>(); - [pbr::ProtobufField(102, "unpacked_bool")] public pbc::RepeatedField<bool> UnpackedBool { get { return unpackedBool_; } } @@ -5528,7 +5392,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_unpackedEnum_codec = pb::FieldCodec.ForEnum(824, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x); private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> unpackedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>(); - [pbr::ProtobufField(103, "unpacked_enum")] public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> UnpackedEnum { get { return unpackedEnum_; } } @@ -5732,8 +5595,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestRepeatedScalarDifferentTagSizes> _parser = new pb::MessageParser<TestRepeatedScalarDifferentTagSizes>(() => new TestRepeatedScalarDifferentTagSizes()); public static pb::MessageParser<TestRepeatedScalarDifferentTagSizes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_int32", "repeated_int64", "repeated_uint64" }; - private static readonly uint[] _fieldTags = new uint[] { 98, 16370, 2097138, 106, 16378, 2097146 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[25]; } } @@ -5781,7 +5642,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec = pb::FieldCodec.ForFixed32(98); private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>(); - [pbr::ProtobufField(12, "repeated_fixed32")] public pbc::RepeatedField<uint> RepeatedFixed32 { get { return repeatedFixed32_; } } @@ -5790,7 +5650,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec = pb::FieldCodec.ForInt32(106); private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>(); - [pbr::ProtobufField(13, "repeated_int32")] public pbc::RepeatedField<int> RepeatedInt32 { get { return repeatedInt32_; } } @@ -5799,7 +5658,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec = pb::FieldCodec.ForFixed64(16370); private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(2046, "repeated_fixed64")] public pbc::RepeatedField<ulong> RepeatedFixed64 { get { return repeatedFixed64_; } } @@ -5808,7 +5666,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec = pb::FieldCodec.ForInt64(16378); private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>(); - [pbr::ProtobufField(2047, "repeated_int64")] public pbc::RepeatedField<long> RepeatedInt64 { get { return repeatedInt64_; } } @@ -5817,7 +5674,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec = pb::FieldCodec.ForFloat(2097138); private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>(); - [pbr::ProtobufField(262142, "repeated_float")] public pbc::RepeatedField<float> RepeatedFloat { get { return repeatedFloat_; } } @@ -5826,7 +5682,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec = pb::FieldCodec.ForUInt64(2097146); private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>(); - [pbr::ProtobufField(262143, "repeated_uint64")] public pbc::RepeatedField<ulong> RepeatedUint64 { get { return repeatedUint64_; } } @@ -5950,8 +5805,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestCommentInjectionMessage> _parser = new pb::MessageParser<TestCommentInjectionMessage>(() => new TestCommentInjectionMessage()); public static pb::MessageParser<TestCommentInjectionMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "a" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[26]; } } @@ -5986,7 +5839,6 @@ namespace Google.Protobuf.TestProtos { public const int AFieldNumber = 1; private string a_ = ""; - [pbr::ProtobufField(1, "a")] public string A { get { return a_; } set { @@ -6070,8 +5922,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<FooRequest> _parser = new pb::MessageParser<FooRequest>(() => new FooRequest()); public static pb::MessageParser<FooRequest> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[27]; } } @@ -6162,8 +6012,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<FooResponse> _parser = new pb::MessageParser<FooResponse>(() => new FooResponse()); public static pb::MessageParser<FooResponse> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[28]; } } @@ -6254,8 +6102,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<FooClientMessage> _parser = new pb::MessageParser<FooClientMessage>(() => new FooClientMessage()); public static pb::MessageParser<FooClientMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[29]; } } @@ -6346,8 +6192,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<FooServerMessage> _parser = new pb::MessageParser<FooServerMessage>(() => new FooServerMessage()); public static pb::MessageParser<FooServerMessage> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[30]; } } @@ -6438,8 +6282,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<BarRequest> _parser = new pb::MessageParser<BarRequest>(() => new BarRequest()); public static pb::MessageParser<BarRequest> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[31]; } } @@ -6530,8 +6372,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<BarResponse> _parser = new pb::MessageParser<BarResponse>(() => new BarResponse()); public static pb::MessageParser<BarResponse> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[32]; } } diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs index cbfa2d5e..3de1cbb7 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs @@ -156,10 +156,15 @@ namespace Google.Protobuf.TestProtos { "AjgBGk4KD0J5dGVzRmllbGRFbnRyeRILCgNrZXkYASABKAUSKgoFdmFsdWUY", "AiABKAsyGy5nb29nbGUucHJvdG9idWYuQnl0ZXNWYWx1ZToCOAFCOQoYY29t", "Lmdvb2dsZS5wcm90b2J1Zi50ZXN0UAGqAhpHb29nbGUuUHJvdG9idWYuVGVz", - "dFByb3Rvc2IGcHJvdG8z")); + "dFByb3Rvc2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Api.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Duration.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Empty.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.FieldMask.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Timestamp.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor, global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor, }, - new global::System.Type[] { typeof(global::Google.Protobuf.TestProtos.TestWellKnownTypes), typeof(global::Google.Protobuf.TestProtos.RepeatedWellKnownTypes), typeof(global::Google.Protobuf.TestProtos.OneofWellKnownTypes), typeof(global::Google.Protobuf.TestProtos.MapWellKnownTypes), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.TestWellKnownTypes), new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.RepeatedWellKnownTypes), new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.OneofWellKnownTypes), new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField" }, new[]{ "OneofField" }, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.TestProtos.MapWellKnownTypes), new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField" }, null, null, new pbr::GeneratedCodeInfo[] { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, }) + })); } #endregion @@ -170,8 +175,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<TestWellKnownTypes> _parser = new pb::MessageParser<TestWellKnownTypes>(() => new TestWellKnownTypes()); public static pb::MessageParser<TestWellKnownTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[0]; } } @@ -232,7 +235,6 @@ namespace Google.Protobuf.TestProtos { public const int AnyFieldFieldNumber = 1; private global::Google.Protobuf.WellKnownTypes.Any anyField_; - [pbr::ProtobufField(1, "any_field")] public global::Google.Protobuf.WellKnownTypes.Any AnyField { get { return anyField_; } set { @@ -243,7 +245,6 @@ namespace Google.Protobuf.TestProtos { public const int ApiFieldFieldNumber = 2; private global::Google.Protobuf.WellKnownTypes.Api apiField_; - [pbr::ProtobufField(2, "api_field")] public global::Google.Protobuf.WellKnownTypes.Api ApiField { get { return apiField_; } set { @@ -254,7 +255,6 @@ namespace Google.Protobuf.TestProtos { public const int DurationFieldFieldNumber = 3; private global::Google.Protobuf.WellKnownTypes.Duration durationField_; - [pbr::ProtobufField(3, "duration_field")] public global::Google.Protobuf.WellKnownTypes.Duration DurationField { get { return durationField_; } set { @@ -265,7 +265,6 @@ namespace Google.Protobuf.TestProtos { public const int EmptyFieldFieldNumber = 4; private global::Google.Protobuf.WellKnownTypes.Empty emptyField_; - [pbr::ProtobufField(4, "empty_field")] public global::Google.Protobuf.WellKnownTypes.Empty EmptyField { get { return emptyField_; } set { @@ -276,7 +275,6 @@ namespace Google.Protobuf.TestProtos { public const int FieldMaskFieldFieldNumber = 5; private global::Google.Protobuf.WellKnownTypes.FieldMask fieldMaskField_; - [pbr::ProtobufField(5, "field_mask_field")] public global::Google.Protobuf.WellKnownTypes.FieldMask FieldMaskField { get { return fieldMaskField_; } set { @@ -287,7 +285,6 @@ namespace Google.Protobuf.TestProtos { public const int SourceContextFieldFieldNumber = 6; private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContextField_; - [pbr::ProtobufField(6, "source_context_field")] public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContextField { get { return sourceContextField_; } set { @@ -298,7 +295,6 @@ namespace Google.Protobuf.TestProtos { public const int StructFieldFieldNumber = 7; private global::Google.Protobuf.WellKnownTypes.Struct structField_; - [pbr::ProtobufField(7, "struct_field")] public global::Google.Protobuf.WellKnownTypes.Struct StructField { get { return structField_; } set { @@ -309,7 +305,6 @@ namespace Google.Protobuf.TestProtos { public const int TimestampFieldFieldNumber = 8; private global::Google.Protobuf.WellKnownTypes.Timestamp timestampField_; - [pbr::ProtobufField(8, "timestamp_field")] public global::Google.Protobuf.WellKnownTypes.Timestamp TimestampField { get { return timestampField_; } set { @@ -320,7 +315,6 @@ namespace Google.Protobuf.TestProtos { public const int TypeFieldFieldNumber = 9; private global::Google.Protobuf.WellKnownTypes.Type typeField_; - [pbr::ProtobufField(9, "type_field")] public global::Google.Protobuf.WellKnownTypes.Type TypeField { get { return typeField_; } set { @@ -332,7 +326,6 @@ namespace Google.Protobuf.TestProtos { public const int DoubleFieldFieldNumber = 10; private static readonly pb::FieldCodec<double?> _single_doubleField_codec = pb::FieldCodec.ForStructWrapper<double>(82); private double? doubleField_; - [pbr::ProtobufField(10, "double_field")] public double? DoubleField { get { return doubleField_; } set { @@ -344,7 +337,6 @@ namespace Google.Protobuf.TestProtos { public const int FloatFieldFieldNumber = 11; private static readonly pb::FieldCodec<float?> _single_floatField_codec = pb::FieldCodec.ForStructWrapper<float>(90); private float? floatField_; - [pbr::ProtobufField(11, "float_field")] public float? FloatField { get { return floatField_; } set { @@ -356,7 +348,6 @@ namespace Google.Protobuf.TestProtos { public const int Int64FieldFieldNumber = 12; private static readonly pb::FieldCodec<long?> _single_int64Field_codec = pb::FieldCodec.ForStructWrapper<long>(98); private long? int64Field_; - [pbr::ProtobufField(12, "int64_field")] public long? Int64Field { get { return int64Field_; } set { @@ -368,7 +359,6 @@ namespace Google.Protobuf.TestProtos { public const int Uint64FieldFieldNumber = 13; private static readonly pb::FieldCodec<ulong?> _single_uint64Field_codec = pb::FieldCodec.ForStructWrapper<ulong>(106); private ulong? uint64Field_; - [pbr::ProtobufField(13, "uint64_field")] public ulong? Uint64Field { get { return uint64Field_; } set { @@ -380,7 +370,6 @@ namespace Google.Protobuf.TestProtos { public const int Int32FieldFieldNumber = 14; private static readonly pb::FieldCodec<int?> _single_int32Field_codec = pb::FieldCodec.ForStructWrapper<int>(114); private int? int32Field_; - [pbr::ProtobufField(14, "int32_field")] public int? Int32Field { get { return int32Field_; } set { @@ -392,7 +381,6 @@ namespace Google.Protobuf.TestProtos { public const int Uint32FieldFieldNumber = 15; private static readonly pb::FieldCodec<uint?> _single_uint32Field_codec = pb::FieldCodec.ForStructWrapper<uint>(122); private uint? uint32Field_; - [pbr::ProtobufField(15, "uint32_field")] public uint? Uint32Field { get { return uint32Field_; } set { @@ -404,7 +392,6 @@ namespace Google.Protobuf.TestProtos { public const int BoolFieldFieldNumber = 16; private static readonly pb::FieldCodec<bool?> _single_boolField_codec = pb::FieldCodec.ForStructWrapper<bool>(130); private bool? boolField_; - [pbr::ProtobufField(16, "bool_field")] public bool? BoolField { get { return boolField_; } set { @@ -416,7 +403,6 @@ namespace Google.Protobuf.TestProtos { public const int StringFieldFieldNumber = 17; private static readonly pb::FieldCodec<string> _single_stringField_codec = pb::FieldCodec.ForClassWrapper<string>(138); private string stringField_; - [pbr::ProtobufField(17, "string_field")] public string StringField { get { return stringField_; } set { @@ -428,7 +414,6 @@ namespace Google.Protobuf.TestProtos { public const int BytesFieldFieldNumber = 18; private static readonly pb::FieldCodec<pb::ByteString> _single_bytesField_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146); private pb::ByteString bytesField_; - [pbr::ProtobufField(18, "bytes_field")] public pb::ByteString BytesField { get { return bytesField_; } set { @@ -874,8 +859,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<RepeatedWellKnownTypes> _parser = new pb::MessageParser<RepeatedWellKnownTypes>(() => new RepeatedWellKnownTypes()); public static pb::MessageParser<RepeatedWellKnownTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[1]; } } @@ -947,7 +930,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Any> _repeated_anyField_codec = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.WellKnownTypes.Any.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> anyField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any>(); - [pbr::ProtobufField(1, "any_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> AnyField { get { return anyField_; } } @@ -956,7 +938,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Api> _repeated_apiField_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Api.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api> apiField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api>(); - [pbr::ProtobufField(2, "api_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api> ApiField { get { return apiField_; } } @@ -965,7 +946,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Duration> _repeated_durationField_codec = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Duration.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> durationField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration>(); - [pbr::ProtobufField(3, "duration_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> DurationField { get { return durationField_; } } @@ -974,7 +954,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Empty> _repeated_emptyField_codec = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.WellKnownTypes.Empty.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty> emptyField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty>(); - [pbr::ProtobufField(4, "empty_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty> EmptyField { get { return emptyField_; } } @@ -983,7 +962,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.FieldMask> _repeated_fieldMaskField_codec = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.WellKnownTypes.FieldMask.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> fieldMaskField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask>(); - [pbr::ProtobufField(5, "field_mask_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> FieldMaskField { get { return fieldMaskField_; } } @@ -992,7 +970,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.SourceContext> _repeated_sourceContextField_codec = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.WellKnownTypes.SourceContext.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext> sourceContextField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext>(); - [pbr::ProtobufField(6, "source_context_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext> SourceContextField { get { return sourceContextField_; } } @@ -1001,7 +978,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Struct> _repeated_structField_codec = pb::FieldCodec.ForMessage(58, global::Google.Protobuf.WellKnownTypes.Struct.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> structField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct>(); - [pbr::ProtobufField(7, "struct_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> StructField { get { return structField_; } } @@ -1010,7 +986,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Timestamp> _repeated_timestampField_codec = pb::FieldCodec.ForMessage(66, global::Google.Protobuf.WellKnownTypes.Timestamp.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> timestampField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp>(); - [pbr::ProtobufField(8, "timestamp_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> TimestampField { get { return timestampField_; } } @@ -1019,7 +994,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Type> _repeated_typeField_codec = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.WellKnownTypes.Type.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type> typeField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type>(); - [pbr::ProtobufField(9, "type_field")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type> TypeField { get { return typeField_; } } @@ -1028,7 +1002,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<double?> _repeated_doubleField_codec = pb::FieldCodec.ForStructWrapper<double>(82); private readonly pbc::RepeatedField<double?> doubleField_ = new pbc::RepeatedField<double?>(); - [pbr::ProtobufField(10, "double_field")] public pbc::RepeatedField<double?> DoubleField { get { return doubleField_; } } @@ -1037,7 +1010,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<float?> _repeated_floatField_codec = pb::FieldCodec.ForStructWrapper<float>(90); private readonly pbc::RepeatedField<float?> floatField_ = new pbc::RepeatedField<float?>(); - [pbr::ProtobufField(11, "float_field")] public pbc::RepeatedField<float?> FloatField { get { return floatField_; } } @@ -1046,7 +1018,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<long?> _repeated_int64Field_codec = pb::FieldCodec.ForStructWrapper<long>(98); private readonly pbc::RepeatedField<long?> int64Field_ = new pbc::RepeatedField<long?>(); - [pbr::ProtobufField(12, "int64_field")] public pbc::RepeatedField<long?> Int64Field { get { return int64Field_; } } @@ -1055,7 +1026,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<ulong?> _repeated_uint64Field_codec = pb::FieldCodec.ForStructWrapper<ulong>(106); private readonly pbc::RepeatedField<ulong?> uint64Field_ = new pbc::RepeatedField<ulong?>(); - [pbr::ProtobufField(13, "uint64_field")] public pbc::RepeatedField<ulong?> Uint64Field { get { return uint64Field_; } } @@ -1064,7 +1034,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<int?> _repeated_int32Field_codec = pb::FieldCodec.ForStructWrapper<int>(114); private readonly pbc::RepeatedField<int?> int32Field_ = new pbc::RepeatedField<int?>(); - [pbr::ProtobufField(14, "int32_field")] public pbc::RepeatedField<int?> Int32Field { get { return int32Field_; } } @@ -1073,7 +1042,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<uint?> _repeated_uint32Field_codec = pb::FieldCodec.ForStructWrapper<uint>(122); private readonly pbc::RepeatedField<uint?> uint32Field_ = new pbc::RepeatedField<uint?>(); - [pbr::ProtobufField(15, "uint32_field")] public pbc::RepeatedField<uint?> Uint32Field { get { return uint32Field_; } } @@ -1082,7 +1050,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<bool?> _repeated_boolField_codec = pb::FieldCodec.ForStructWrapper<bool>(130); private readonly pbc::RepeatedField<bool?> boolField_ = new pbc::RepeatedField<bool?>(); - [pbr::ProtobufField(16, "bool_field")] public pbc::RepeatedField<bool?> BoolField { get { return boolField_; } } @@ -1091,7 +1058,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<string> _repeated_stringField_codec = pb::FieldCodec.ForClassWrapper<string>(138); private readonly pbc::RepeatedField<string> stringField_ = new pbc::RepeatedField<string>(); - [pbr::ProtobufField(17, "string_field")] public pbc::RepeatedField<string> StringField { get { return stringField_; } } @@ -1100,7 +1066,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::FieldCodec<pb::ByteString> _repeated_bytesField_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146); private readonly pbc::RepeatedField<pb::ByteString> bytesField_ = new pbc::RepeatedField<pb::ByteString>(); - [pbr::ProtobufField(18, "bytes_field")] public pbc::RepeatedField<pb::ByteString> BytesField { get { return bytesField_; } } @@ -1326,8 +1291,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<OneofWellKnownTypes> _parser = new pb::MessageParser<OneofWellKnownTypes>(() => new OneofWellKnownTypes()); public static pb::MessageParser<OneofWellKnownTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[2]; } } @@ -1418,7 +1381,6 @@ namespace Google.Protobuf.TestProtos { } public const int AnyFieldFieldNumber = 1; - [pbr::ProtobufField(1, "any_field")] public global::Google.Protobuf.WellKnownTypes.Any AnyField { get { return oneofFieldCase_ == OneofFieldOneofCase.AnyField ? (global::Google.Protobuf.WellKnownTypes.Any) oneofField_ : null; } set { @@ -1429,7 +1391,6 @@ namespace Google.Protobuf.TestProtos { } public const int ApiFieldFieldNumber = 2; - [pbr::ProtobufField(2, "api_field")] public global::Google.Protobuf.WellKnownTypes.Api ApiField { get { return oneofFieldCase_ == OneofFieldOneofCase.ApiField ? (global::Google.Protobuf.WellKnownTypes.Api) oneofField_ : null; } set { @@ -1440,7 +1401,6 @@ namespace Google.Protobuf.TestProtos { } public const int DurationFieldFieldNumber = 3; - [pbr::ProtobufField(3, "duration_field")] public global::Google.Protobuf.WellKnownTypes.Duration DurationField { get { return oneofFieldCase_ == OneofFieldOneofCase.DurationField ? (global::Google.Protobuf.WellKnownTypes.Duration) oneofField_ : null; } set { @@ -1451,7 +1411,6 @@ namespace Google.Protobuf.TestProtos { } public const int EmptyFieldFieldNumber = 4; - [pbr::ProtobufField(4, "empty_field")] public global::Google.Protobuf.WellKnownTypes.Empty EmptyField { get { return oneofFieldCase_ == OneofFieldOneofCase.EmptyField ? (global::Google.Protobuf.WellKnownTypes.Empty) oneofField_ : null; } set { @@ -1462,7 +1421,6 @@ namespace Google.Protobuf.TestProtos { } public const int FieldMaskFieldFieldNumber = 5; - [pbr::ProtobufField(5, "field_mask_field")] public global::Google.Protobuf.WellKnownTypes.FieldMask FieldMaskField { get { return oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField ? (global::Google.Protobuf.WellKnownTypes.FieldMask) oneofField_ : null; } set { @@ -1473,7 +1431,6 @@ namespace Google.Protobuf.TestProtos { } public const int SourceContextFieldFieldNumber = 6; - [pbr::ProtobufField(6, "source_context_field")] public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContextField { get { return oneofFieldCase_ == OneofFieldOneofCase.SourceContextField ? (global::Google.Protobuf.WellKnownTypes.SourceContext) oneofField_ : null; } set { @@ -1484,7 +1441,6 @@ namespace Google.Protobuf.TestProtos { } public const int StructFieldFieldNumber = 7; - [pbr::ProtobufField(7, "struct_field")] public global::Google.Protobuf.WellKnownTypes.Struct StructField { get { return oneofFieldCase_ == OneofFieldOneofCase.StructField ? (global::Google.Protobuf.WellKnownTypes.Struct) oneofField_ : null; } set { @@ -1495,7 +1451,6 @@ namespace Google.Protobuf.TestProtos { } public const int TimestampFieldFieldNumber = 8; - [pbr::ProtobufField(8, "timestamp_field")] public global::Google.Protobuf.WellKnownTypes.Timestamp TimestampField { get { return oneofFieldCase_ == OneofFieldOneofCase.TimestampField ? (global::Google.Protobuf.WellKnownTypes.Timestamp) oneofField_ : null; } set { @@ -1506,7 +1461,6 @@ namespace Google.Protobuf.TestProtos { } public const int TypeFieldFieldNumber = 9; - [pbr::ProtobufField(9, "type_field")] public global::Google.Protobuf.WellKnownTypes.Type TypeField { get { return oneofFieldCase_ == OneofFieldOneofCase.TypeField ? (global::Google.Protobuf.WellKnownTypes.Type) oneofField_ : null; } set { @@ -1518,7 +1472,6 @@ namespace Google.Protobuf.TestProtos { public const int DoubleFieldFieldNumber = 10; private static readonly pb::FieldCodec<double?> _oneof_doubleField_codec = pb::FieldCodec.ForStructWrapper<double>(82); - [pbr::ProtobufField(10, "double_field")] public double? DoubleField { get { return oneofFieldCase_ == OneofFieldOneofCase.DoubleField ? (double?) oneofField_ : (double?) null; } set { @@ -1530,7 +1483,6 @@ namespace Google.Protobuf.TestProtos { public const int FloatFieldFieldNumber = 11; private static readonly pb::FieldCodec<float?> _oneof_floatField_codec = pb::FieldCodec.ForStructWrapper<float>(90); - [pbr::ProtobufField(11, "float_field")] public float? FloatField { get { return oneofFieldCase_ == OneofFieldOneofCase.FloatField ? (float?) oneofField_ : (float?) null; } set { @@ -1542,7 +1494,6 @@ namespace Google.Protobuf.TestProtos { public const int Int64FieldFieldNumber = 12; private static readonly pb::FieldCodec<long?> _oneof_int64Field_codec = pb::FieldCodec.ForStructWrapper<long>(98); - [pbr::ProtobufField(12, "int64_field")] public long? Int64Field { get { return oneofFieldCase_ == OneofFieldOneofCase.Int64Field ? (long?) oneofField_ : (long?) null; } set { @@ -1554,7 +1505,6 @@ namespace Google.Protobuf.TestProtos { public const int Uint64FieldFieldNumber = 13; private static readonly pb::FieldCodec<ulong?> _oneof_uint64Field_codec = pb::FieldCodec.ForStructWrapper<ulong>(106); - [pbr::ProtobufField(13, "uint64_field")] public ulong? Uint64Field { get { return oneofFieldCase_ == OneofFieldOneofCase.Uint64Field ? (ulong?) oneofField_ : (ulong?) null; } set { @@ -1566,7 +1516,6 @@ namespace Google.Protobuf.TestProtos { public const int Int32FieldFieldNumber = 14; private static readonly pb::FieldCodec<int?> _oneof_int32Field_codec = pb::FieldCodec.ForStructWrapper<int>(114); - [pbr::ProtobufField(14, "int32_field")] public int? Int32Field { get { return oneofFieldCase_ == OneofFieldOneofCase.Int32Field ? (int?) oneofField_ : (int?) null; } set { @@ -1578,7 +1527,6 @@ namespace Google.Protobuf.TestProtos { public const int Uint32FieldFieldNumber = 15; private static readonly pb::FieldCodec<uint?> _oneof_uint32Field_codec = pb::FieldCodec.ForStructWrapper<uint>(122); - [pbr::ProtobufField(15, "uint32_field")] public uint? Uint32Field { get { return oneofFieldCase_ == OneofFieldOneofCase.Uint32Field ? (uint?) oneofField_ : (uint?) null; } set { @@ -1590,7 +1538,6 @@ namespace Google.Protobuf.TestProtos { public const int BoolFieldFieldNumber = 16; private static readonly pb::FieldCodec<bool?> _oneof_boolField_codec = pb::FieldCodec.ForStructWrapper<bool>(130); - [pbr::ProtobufField(16, "bool_field")] public bool? BoolField { get { return oneofFieldCase_ == OneofFieldOneofCase.BoolField ? (bool?) oneofField_ : (bool?) null; } set { @@ -1602,7 +1549,6 @@ namespace Google.Protobuf.TestProtos { public const int StringFieldFieldNumber = 17; private static readonly pb::FieldCodec<string> _oneof_stringField_codec = pb::FieldCodec.ForClassWrapper<string>(138); - [pbr::ProtobufField(17, "string_field")] public string StringField { get { return oneofFieldCase_ == OneofFieldOneofCase.StringField ? (string) oneofField_ : (string) null; } set { @@ -1614,7 +1560,6 @@ namespace Google.Protobuf.TestProtos { public const int BytesFieldFieldNumber = 18; private static readonly pb::FieldCodec<pb::ByteString> _oneof_bytesField_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146); - [pbr::ProtobufField(18, "bytes_field")] public pb::ByteString BytesField { get { return oneofFieldCase_ == OneofFieldOneofCase.BytesField ? (pb::ByteString) oneofField_ : (pb::ByteString) null; } set { @@ -2045,8 +1990,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pb::MessageParser<MapWellKnownTypes> _parser = new pb::MessageParser<MapWellKnownTypes>(() => new MapWellKnownTypes()); public static pb::MessageParser<MapWellKnownTypes> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[3]; } } @@ -2118,7 +2061,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>.Codec _map_anyField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Any.Parser), 10); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any> anyField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>(); - [pbr::ProtobufField(1, "any_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any> AnyField { get { return anyField_; } } @@ -2127,7 +2069,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>.Codec _map_apiField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Api.Parser), 18); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api> apiField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>(); - [pbr::ProtobufField(2, "api_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api> ApiField { get { return apiField_; } } @@ -2136,7 +2077,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>.Codec _map_durationField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Duration.Parser), 26); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration> durationField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>(); - [pbr::ProtobufField(3, "duration_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration> DurationField { get { return durationField_; } } @@ -2145,7 +2085,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>.Codec _map_emptyField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Empty.Parser), 34); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty> emptyField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>(); - [pbr::ProtobufField(4, "empty_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty> EmptyField { get { return emptyField_; } } @@ -2154,7 +2093,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>.Codec _map_fieldMaskField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.FieldMask.Parser), 42); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask> fieldMaskField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>(); - [pbr::ProtobufField(5, "field_mask_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask> FieldMaskField { get { return fieldMaskField_; } } @@ -2163,7 +2101,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>.Codec _map_sourceContextField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.SourceContext.Parser), 50); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext> sourceContextField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>(); - [pbr::ProtobufField(6, "source_context_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext> SourceContextField { get { return sourceContextField_; } } @@ -2172,7 +2109,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>.Codec _map_structField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Struct.Parser), 58); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct> structField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>(); - [pbr::ProtobufField(7, "struct_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct> StructField { get { return structField_; } } @@ -2181,7 +2117,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>.Codec _map_timestampField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Timestamp.Parser), 66); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp> timestampField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>(); - [pbr::ProtobufField(8, "timestamp_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp> TimestampField { get { return timestampField_; } } @@ -2190,7 +2125,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>.Codec _map_typeField_codec = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Type.Parser), 74); private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type> typeField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>(); - [pbr::ProtobufField(9, "type_field")] public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type> TypeField { get { return typeField_; } } @@ -2199,7 +2133,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, double?>.Codec _map_doubleField_codec = new pbc::MapField<int, double?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<double>(18), 82); private readonly pbc::MapField<int, double?> doubleField_ = new pbc::MapField<int, double?>(true); - [pbr::ProtobufField(10, "double_field")] public pbc::MapField<int, double?> DoubleField { get { return doubleField_; } } @@ -2208,7 +2141,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, float?>.Codec _map_floatField_codec = new pbc::MapField<int, float?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<float>(18), 90); private readonly pbc::MapField<int, float?> floatField_ = new pbc::MapField<int, float?>(true); - [pbr::ProtobufField(11, "float_field")] public pbc::MapField<int, float?> FloatField { get { return floatField_; } } @@ -2217,7 +2149,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, long?>.Codec _map_int64Field_codec = new pbc::MapField<int, long?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<long>(18), 98); private readonly pbc::MapField<int, long?> int64Field_ = new pbc::MapField<int, long?>(true); - [pbr::ProtobufField(12, "int64_field")] public pbc::MapField<int, long?> Int64Field { get { return int64Field_; } } @@ -2226,7 +2157,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, ulong?>.Codec _map_uint64Field_codec = new pbc::MapField<int, ulong?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<ulong>(18), 106); private readonly pbc::MapField<int, ulong?> uint64Field_ = new pbc::MapField<int, ulong?>(true); - [pbr::ProtobufField(13, "uint64_field")] public pbc::MapField<int, ulong?> Uint64Field { get { return uint64Field_; } } @@ -2235,7 +2165,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, int?>.Codec _map_int32Field_codec = new pbc::MapField<int, int?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<int>(18), 114); private readonly pbc::MapField<int, int?> int32Field_ = new pbc::MapField<int, int?>(true); - [pbr::ProtobufField(14, "int32_field")] public pbc::MapField<int, int?> Int32Field { get { return int32Field_; } } @@ -2244,7 +2173,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, uint?>.Codec _map_uint32Field_codec = new pbc::MapField<int, uint?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<uint>(18), 122); private readonly pbc::MapField<int, uint?> uint32Field_ = new pbc::MapField<int, uint?>(true); - [pbr::ProtobufField(15, "uint32_field")] public pbc::MapField<int, uint?> Uint32Field { get { return uint32Field_; } } @@ -2253,7 +2181,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, bool?>.Codec _map_boolField_codec = new pbc::MapField<int, bool?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<bool>(18), 130); private readonly pbc::MapField<int, bool?> boolField_ = new pbc::MapField<int, bool?>(true); - [pbr::ProtobufField(16, "bool_field")] public pbc::MapField<int, bool?> BoolField { get { return boolField_; } } @@ -2262,7 +2189,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, string>.Codec _map_stringField_codec = new pbc::MapField<int, string>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForClassWrapper<string>(18), 138); private readonly pbc::MapField<int, string> stringField_ = new pbc::MapField<int, string>(true); - [pbr::ProtobufField(17, "string_field")] public pbc::MapField<int, string> StringField { get { return stringField_; } } @@ -2271,7 +2197,6 @@ namespace Google.Protobuf.TestProtos { private static readonly pbc::MapField<int, pb::ByteString>.Codec _map_bytesField_codec = new pbc::MapField<int, pb::ByteString>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForClassWrapper<pb::ByteString>(18), 146); private readonly pbc::MapField<int, pb::ByteString> bytesField_ = new pbc::MapField<int, pb::ByteString>(true); - [pbr::ProtobufField(18, "bytes_field")] public pbc::MapField<int, pb::ByteString> BytesField { get { return bytesField_; } } diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs index 41fd892b..d92f148d 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs @@ -26,10 +26,12 @@ namespace Google.Protobuf.WellKnownTypes { "Chlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvEg9nb29nbGUucHJvdG9idWYi", "JgoDQW55EhAKCHR5cGVfdXJsGAEgASgJEg0KBXZhbHVlGAIgASgMQksKE2Nv", "bS5nb29nbGUucHJvdG9idWZCCEFueVByb3RvUAGgAQGiAgNHUEKqAh5Hb29n", - "bGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); + "bGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Any), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Any), new[]{ "TypeUrl", "Value" }, null, null, null) + })); } #endregion @@ -41,8 +43,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Any> _parser = new pb::MessageParser<Any>(() => new Any()); public static pb::MessageParser<Any> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "type_url", "value" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor.MessageTypes[0]; } } @@ -78,7 +78,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int TypeUrlFieldNumber = 1; private string typeUrl_ = ""; - [pbr::ProtobufField(1, "type_url")] public string TypeUrl { get { return typeUrl_; } set { @@ -89,7 +88,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 2; private pb::ByteString value_ = pb::ByteString.Empty; - [pbr::ProtobufField(2, "value")] public pb::ByteString Value { get { return value_; } set { diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs index 65f6d9b5..e0a9e276 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs @@ -35,10 +35,13 @@ namespace Google.Protobuf.WellKnownTypes { "ZV9zdHJlYW1pbmcYBSABKAgSKAoHb3B0aW9ucxgGIAMoCzIXLmdvb2dsZS5w", "cm90b2J1Zi5PcHRpb25CSAoTY29tLmdvb2dsZS5wcm90b2J1ZkIIQXBpUHJv", "dG9QAaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IG", - "cHJvdG8z")); + "cHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor, }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Api), typeof(global::Google.Protobuf.WellKnownTypes.Method), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Api), new[]{ "Name", "Methods", "Options", "Version", "SourceContext" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Method), new[]{ "Name", "RequestTypeUrl", "RequestStreaming", "ResponseTypeUrl", "ResponseStreaming", "Options" }, null, null, null) + })); } #endregion @@ -50,8 +53,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Api> _parser = new pb::MessageParser<Api>(() => new Api()); public static pb::MessageParser<Api> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "methods", "name", "options", "source_context", "version" }; - private static readonly uint[] _fieldTags = new uint[] { 18, 10, 26, 42, 34 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Api.Descriptor.MessageTypes[0]; } } @@ -93,7 +94,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; - [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -106,7 +106,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Method> _repeated_methods_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Method.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Method> methods_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Method>(); - [pbr::ProtobufField(2, "methods")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Method> Methods { get { return methods_; } } @@ -115,14 +114,12 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Option.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>(); - [pbr::ProtobufField(3, "options")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options { get { return options_; } } public const int VersionFieldNumber = 4; private string version_ = ""; - [pbr::ProtobufField(4, "version")] public string Version { get { return version_; } set { @@ -133,7 +130,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int SourceContextFieldNumber = 5; private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContext_; - [pbr::ProtobufField(5, "source_context")] public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContext { get { return sourceContext_; } set { @@ -273,8 +269,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Method> _parser = new pb::MessageParser<Method>(() => new Method()); public static pb::MessageParser<Method> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "name", "options", "request_streaming", "request_type_url", "response_streaming", "response_type_url" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 50, 24, 18, 40, 34 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Api.Descriptor.MessageTypes[1]; } } @@ -315,7 +309,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; - [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -326,7 +319,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int RequestTypeUrlFieldNumber = 2; private string requestTypeUrl_ = ""; - [pbr::ProtobufField(2, "request_type_url")] public string RequestTypeUrl { get { return requestTypeUrl_; } set { @@ -337,7 +329,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int RequestStreamingFieldNumber = 3; private bool requestStreaming_; - [pbr::ProtobufField(3, "request_streaming")] public bool RequestStreaming { get { return requestStreaming_; } set { @@ -348,7 +339,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ResponseTypeUrlFieldNumber = 4; private string responseTypeUrl_ = ""; - [pbr::ProtobufField(4, "response_type_url")] public string ResponseTypeUrl { get { return responseTypeUrl_; } set { @@ -359,7 +349,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ResponseStreamingFieldNumber = 5; private bool responseStreaming_; - [pbr::ProtobufField(5, "response_streaming")] public bool ResponseStreaming { get { return responseStreaming_; } set { @@ -372,7 +361,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.WellKnownTypes.Option.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>(); - [pbr::ProtobufField(6, "options")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options { get { return options_; } } diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs index d00e8b74..487911a7 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs @@ -27,10 +27,12 @@ namespace Google.Protobuf.WellKnownTypes { "b2J1ZiIqCghEdXJhdGlvbhIPCgdzZWNvbmRzGAEgASgDEg0KBW5hbm9zGAIg", "ASgFQlAKE2NvbS5nb29nbGUucHJvdG9idWZCDUR1cmF0aW9uUHJvdG9QAaAB", "AaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IGcHJv", - "dG8z")); + "dG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Duration), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Duration), new[]{ "Seconds", "Nanos" }, null, null, null) + })); } #endregion @@ -42,8 +44,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Duration> _parser = new pb::MessageParser<Duration>(() => new Duration()); public static pb::MessageParser<Duration> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "nanos", "seconds" }; - private static readonly uint[] _fieldTags = new uint[] { 16, 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Duration.Descriptor.MessageTypes[0]; } } @@ -79,7 +79,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int SecondsFieldNumber = 1; private long seconds_; - [pbr::ProtobufField(1, "seconds")] public long Seconds { get { return seconds_; } set { @@ -90,7 +89,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NanosFieldNumber = 2; private int nanos_; - [pbr::ProtobufField(2, "nanos")] public int Nanos { get { return nanos_; } set { diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs index eb7dd937..c9048b58 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs @@ -26,10 +26,12 @@ namespace Google.Protobuf.WellKnownTypes { "Chtnb29nbGUvcHJvdG9idWYvZW1wdHkucHJvdG8SD2dvb2dsZS5wcm90b2J1", "ZiIHCgVFbXB0eUJKChNjb20uZ29vZ2xlLnByb3RvYnVmQgpFbXB0eVByb3Rv", "UAGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", - "b3RvMw==")); + "b3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Empty), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Empty), null, null, null, null) + })); } #endregion @@ -41,8 +43,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Empty> _parser = new pb::MessageParser<Empty>(() => new Empty()); public static pb::MessageParser<Empty> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { }; - private static readonly uint[] _fieldTags = new uint[] { }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Empty.Descriptor.MessageTypes[0]; } } diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs index 16c961ed..39d1c1f5 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs @@ -26,10 +26,12 @@ namespace Google.Protobuf.WellKnownTypes { "CiBnb29nbGUvcHJvdG9idWYvZmllbGRfbWFzay5wcm90bxIPZ29vZ2xlLnBy", "b3RvYnVmIhoKCUZpZWxkTWFzaxINCgVwYXRocxgBIAMoCUJOChNjb20uZ29v", "Z2xlLnByb3RvYnVmQg5GaWVsZE1hc2tQcm90b1ABogIDR1BCqgIeR29vZ2xl", - "LlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM=")); + "LlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.FieldMask), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.FieldMask), new[]{ "Paths" }, null, null, null) + })); } #endregion @@ -41,8 +43,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<FieldMask> _parser = new pb::MessageParser<FieldMask>(() => new FieldMask()); public static pb::MessageParser<FieldMask> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "paths" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.FieldMask.Descriptor.MessageTypes[0]; } } @@ -80,7 +80,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<string> _repeated_paths_codec = pb::FieldCodec.ForString(10); private readonly pbc::RepeatedField<string> paths_ = new pbc::RepeatedField<string>(); - [pbr::ProtobufField(1, "paths")] public pbc::RepeatedField<string> Paths { get { return paths_; } } diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs index b94fe072..8bce86d4 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs @@ -27,10 +27,12 @@ namespace Google.Protobuf.WellKnownTypes { "ZS5wcm90b2J1ZiIiCg1Tb3VyY2VDb250ZXh0EhEKCWZpbGVfbmFtZRgBIAEo", "CUJSChNjb20uZ29vZ2xlLnByb3RvYnVmQhJTb3VyY2VDb250ZXh0UHJvdG9Q", "AaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IGcHJv", - "dG8z")); + "dG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.SourceContext), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.SourceContext), new[]{ "FileName" }, null, null, null) + })); } #endregion @@ -42,8 +44,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<SourceContext> _parser = new pb::MessageParser<SourceContext>(() => new SourceContext()); public static pb::MessageParser<SourceContext> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "file_name" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor.MessageTypes[0]; } } @@ -78,7 +78,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int FileNameFieldNumber = 1; private string fileName_ = ""; - [pbr::ProtobufField(1, "file_name")] public string FileName { get { return fileName_; } set { diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs index 860a9925..0ac47b26 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs @@ -36,10 +36,14 @@ namespace Google.Protobuf.WellKnownTypes { "Lmdvb2dsZS5wcm90b2J1Zi5WYWx1ZSobCglOdWxsVmFsdWUSDgoKTlVMTF9W", "QUxVRRAAQk4KE2NvbS5nb29nbGUucHJvdG9idWZCC1N0cnVjdFByb3RvUAGg", "AQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", - "b3RvMw==")); + "b3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Struct), null, typeof(global::Google.Protobuf.WellKnownTypes.Value), typeof(global::Google.Protobuf.WellKnownTypes.ListValue), typeof(global::Google.Protobuf.WellKnownTypes.NullValue), }); + new pbr::GeneratedCodeInfo(new[] {typeof(global::Google.Protobuf.WellKnownTypes.NullValue), }, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Struct), new[]{ "Fields" }, null, null, new pbr::GeneratedCodeInfo[] { null, }), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Value), new[]{ "NullValue", "NumberValue", "StringValue", "BoolValue", "StructValue", "ListValue" }, new[]{ "Kind" }, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.ListValue), new[]{ "Values" }, null, null, null) + })); } #endregion @@ -58,8 +62,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Struct> _parser = new pb::MessageParser<Struct>(() => new Struct()); public static pb::MessageParser<Struct> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "fields" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor.MessageTypes[0]; } } @@ -97,7 +99,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>.Codec _map_fields_codec = new pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>.Codec(pb::FieldCodec.ForString(10), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Value.Parser), 10); private readonly pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value> fields_ = new pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>(); - [pbr::ProtobufField(1, "fields")] public pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value> Fields { get { return fields_; } } @@ -170,8 +171,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Value> _parser = new pb::MessageParser<Value>(() => new Value()); public static pb::MessageParser<Value> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "bool_value", "list_value", "null_value", "number_value", "string_value", "struct_value" }; - private static readonly uint[] _fieldTags = new uint[] { 32, 50, 8, 17, 26, 42 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor.MessageTypes[1]; } } @@ -226,7 +225,6 @@ namespace Google.Protobuf.WellKnownTypes { } public const int NullValueFieldNumber = 1; - [pbr::ProtobufField(1, "null_value")] public global::Google.Protobuf.WellKnownTypes.NullValue NullValue { get { return kindCase_ == KindOneofCase.NullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) kind_ : global::Google.Protobuf.WellKnownTypes.NullValue.NULL_VALUE; } set { @@ -237,7 +235,6 @@ namespace Google.Protobuf.WellKnownTypes { } public const int NumberValueFieldNumber = 2; - [pbr::ProtobufField(2, "number_value")] public double NumberValue { get { return kindCase_ == KindOneofCase.NumberValue ? (double) kind_ : 0D; } set { @@ -248,7 +245,6 @@ namespace Google.Protobuf.WellKnownTypes { } public const int StringValueFieldNumber = 3; - [pbr::ProtobufField(3, "string_value")] public string StringValue { get { return kindCase_ == KindOneofCase.StringValue ? (string) kind_ : ""; } set { @@ -259,7 +255,6 @@ namespace Google.Protobuf.WellKnownTypes { } public const int BoolValueFieldNumber = 4; - [pbr::ProtobufField(4, "bool_value")] public bool BoolValue { get { return kindCase_ == KindOneofCase.BoolValue ? (bool) kind_ : false; } set { @@ -270,7 +265,6 @@ namespace Google.Protobuf.WellKnownTypes { } public const int StructValueFieldNumber = 5; - [pbr::ProtobufField(5, "struct_value")] public global::Google.Protobuf.WellKnownTypes.Struct StructValue { get { return kindCase_ == KindOneofCase.StructValue ? (global::Google.Protobuf.WellKnownTypes.Struct) kind_ : null; } set { @@ -281,7 +275,6 @@ namespace Google.Protobuf.WellKnownTypes { } public const int ListValueFieldNumber = 6; - [pbr::ProtobufField(6, "list_value")] public global::Google.Protobuf.WellKnownTypes.ListValue ListValue { get { return kindCase_ == KindOneofCase.ListValue ? (global::Google.Protobuf.WellKnownTypes.ListValue) kind_ : null; } set { @@ -483,8 +476,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<ListValue> _parser = new pb::MessageParser<ListValue>(() => new ListValue()); public static pb::MessageParser<ListValue> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "values" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor.MessageTypes[2]; } } @@ -522,7 +513,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Value> _repeated_values_codec = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.WellKnownTypes.Value.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value> values_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value>(); - [pbr::ProtobufField(1, "values")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value> Values { get { return values_; } } diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs index bfc2f37a..f874065b 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs @@ -27,10 +27,12 @@ namespace Google.Protobuf.WellKnownTypes { "dG9idWYiKwoJVGltZXN0YW1wEg8KB3NlY29uZHMYASABKAMSDQoFbmFub3MY", "AiABKAVCUQoTY29tLmdvb2dsZS5wcm90b2J1ZkIOVGltZXN0YW1wUHJvdG9Q", "AaABAaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IG", - "cHJvdG8z")); + "cHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Timestamp), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Timestamp), new[]{ "Seconds", "Nanos" }, null, null, null) + })); } #endregion @@ -42,8 +44,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Timestamp> _parser = new pb::MessageParser<Timestamp>(() => new Timestamp()); public static pb::MessageParser<Timestamp> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "nanos", "seconds" }; - private static readonly uint[] _fieldTags = new uint[] { 16, 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Timestamp.Descriptor.MessageTypes[0]; } } @@ -79,7 +79,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int SecondsFieldNumber = 1; private long seconds_; - [pbr::ProtobufField(1, "seconds")] public long Seconds { get { return seconds_; } set { @@ -90,7 +89,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NanosFieldNumber = 2; private int nanos_; - [pbr::ProtobufField(2, "nanos")] public int Nanos { get { return nanos_; } set { diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs index 53b8f6be..c6573aa4 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs @@ -53,10 +53,16 @@ namespace Google.Protobuf.WellKnownTypes { "cHRpb24SDAoEbmFtZRgBIAEoCRIjCgV2YWx1ZRgCIAEoCzIULmdvb2dsZS5w", "cm90b2J1Zi5BbnlCSQoTY29tLmdvb2dsZS5wcm90b2J1ZkIJVHlwZVByb3Rv", "UAGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", - "b3RvMw==")); + "b3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Type), typeof(global::Google.Protobuf.WellKnownTypes.Field), typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Kind), typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality), typeof(global::Google.Protobuf.WellKnownTypes.Enum), typeof(global::Google.Protobuf.WellKnownTypes.EnumValue), typeof(global::Google.Protobuf.WellKnownTypes.Option), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Type), new[]{ "Name", "Fields", "Oneofs", "Options", "SourceContext" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Field), new[]{ "Kind", "Cardinality", "Number", "Name", "TypeUrl", "OneofIndex", "Packed", "Options" }, null, new[]{ typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Kind), typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality) }, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Enum), new[]{ "Name", "Enumvalue", "Options", "SourceContext" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.EnumValue), new[]{ "Name", "Number", "Options" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Option), new[]{ "Name", "Value" }, null, null, null) + })); } #endregion @@ -68,8 +74,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Type> _parser = new pb::MessageParser<Type>(() => new Type()); public static pb::MessageParser<Type> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "fields", "name", "oneofs", "options", "source_context" }; - private static readonly uint[] _fieldTags = new uint[] { 18, 10, 26, 34, 42 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[0]; } } @@ -112,7 +116,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; - [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -125,7 +128,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Field> _repeated_fields_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Field.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Field> fields_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Field>(); - [pbr::ProtobufField(2, "fields")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Field> Fields { get { return fields_; } } @@ -134,7 +136,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<string> _repeated_oneofs_codec = pb::FieldCodec.ForString(26); private readonly pbc::RepeatedField<string> oneofs_ = new pbc::RepeatedField<string>(); - [pbr::ProtobufField(3, "oneofs")] public pbc::RepeatedField<string> Oneofs { get { return oneofs_; } } @@ -143,14 +144,12 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.WellKnownTypes.Option.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>(); - [pbr::ProtobufField(4, "options")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options { get { return options_; } } public const int SourceContextFieldNumber = 5; private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContext_; - [pbr::ProtobufField(5, "source_context")] public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContext { get { return sourceContext_; } set { @@ -283,8 +282,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Field> _parser = new pb::MessageParser<Field>(() => new Field()); public static pb::MessageParser<Field> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "cardinality", "kind", "name", "number", "oneof_index", "options", "packed", "type_url" }; - private static readonly uint[] _fieldTags = new uint[] { 16, 8, 34, 24, 56, 74, 64, 50 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[1]; } } @@ -327,7 +324,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int KindFieldNumber = 1; private global::Google.Protobuf.WellKnownTypes.Field.Types.Kind kind_ = global::Google.Protobuf.WellKnownTypes.Field.Types.Kind.TYPE_UNKNOWN; - [pbr::ProtobufField(1, "kind")] public global::Google.Protobuf.WellKnownTypes.Field.Types.Kind Kind { get { return kind_; } set { @@ -338,7 +334,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int CardinalityFieldNumber = 2; private global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality cardinality_ = global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality.CARDINALITY_UNKNOWN; - [pbr::ProtobufField(2, "cardinality")] public global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality Cardinality { get { return cardinality_; } set { @@ -349,7 +344,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NumberFieldNumber = 3; private int number_; - [pbr::ProtobufField(3, "number")] public int Number { get { return number_; } set { @@ -360,7 +354,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 4; private string name_ = ""; - [pbr::ProtobufField(4, "name")] public string Name { get { return name_; } set { @@ -371,7 +364,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int TypeUrlFieldNumber = 6; private string typeUrl_ = ""; - [pbr::ProtobufField(6, "type_url")] public string TypeUrl { get { return typeUrl_; } set { @@ -382,7 +374,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int OneofIndexFieldNumber = 7; private int oneofIndex_; - [pbr::ProtobufField(7, "oneof_index")] public int OneofIndex { get { return oneofIndex_; } set { @@ -393,7 +384,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int PackedFieldNumber = 8; private bool packed_; - [pbr::ProtobufField(8, "packed")] public bool Packed { get { return packed_; } set { @@ -406,7 +396,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.WellKnownTypes.Option.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>(); - [pbr::ProtobufField(9, "options")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options { get { return options_; } } @@ -625,8 +614,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Enum> _parser = new pb::MessageParser<Enum>(() => new Enum()); public static pb::MessageParser<Enum> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "enumvalue", "name", "options", "source_context" }; - private static readonly uint[] _fieldTags = new uint[] { 18, 10, 26, 34 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[2]; } } @@ -667,7 +654,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; - [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -680,7 +666,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.EnumValue> _repeated_enumvalue_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.EnumValue.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.EnumValue> enumvalue_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.EnumValue>(); - [pbr::ProtobufField(2, "enumvalue")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.EnumValue> Enumvalue { get { return enumvalue_; } } @@ -689,14 +674,12 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Option.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>(); - [pbr::ProtobufField(3, "options")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options { get { return options_; } } public const int SourceContextFieldNumber = 4; private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContext_; - [pbr::ProtobufField(4, "source_context")] public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContext { get { return sourceContext_; } set { @@ -820,8 +803,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<EnumValue> _parser = new pb::MessageParser<EnumValue>(() => new EnumValue()); public static pb::MessageParser<EnumValue> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "name", "number", "options" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 16, 26 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[3]; } } @@ -859,7 +840,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; - [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -870,7 +850,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NumberFieldNumber = 2; private int number_; - [pbr::ProtobufField(2, "number")] public int Number { get { return number_; } set { @@ -883,7 +862,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Option.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>(); - [pbr::ProtobufField(3, "options")] public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options { get { return options_; } } @@ -988,8 +966,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Option> _parser = new pb::MessageParser<Option>(() => new Option()); public static pb::MessageParser<Option> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "name", "value" }; - private static readonly uint[] _fieldTags = new uint[] { 10, 18 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[4]; } } @@ -1026,7 +1002,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; - [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -1037,7 +1012,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 2; private global::Google.Protobuf.WellKnownTypes.Any value_; - [pbr::ProtobufField(2, "value")] public global::Google.Protobuf.WellKnownTypes.Any Value { get { return value_; } set { diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs index d1b5497e..2ea660c6 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs @@ -29,10 +29,20 @@ namespace Google.Protobuf.WellKnownTypes { "DSIaCglCb29sVmFsdWUSDQoFdmFsdWUYASABKAgiHAoLU3RyaW5nVmFsdWUS", "DQoFdmFsdWUYASABKAkiGwoKQnl0ZXNWYWx1ZRINCgV2YWx1ZRgBIAEoDEJN", "ChNjb20uZ29vZ2xlLnByb3RvYnVmQg1XcmFwcGVyc1Byb3RvUAGiAgNHUEKq", - "Ah5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); + "Ah5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, new pbr::FileDescriptor[] { }, - new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.DoubleValue), typeof(global::Google.Protobuf.WellKnownTypes.FloatValue), typeof(global::Google.Protobuf.WellKnownTypes.Int64Value), typeof(global::Google.Protobuf.WellKnownTypes.UInt64Value), typeof(global::Google.Protobuf.WellKnownTypes.Int32Value), typeof(global::Google.Protobuf.WellKnownTypes.UInt32Value), typeof(global::Google.Protobuf.WellKnownTypes.BoolValue), typeof(global::Google.Protobuf.WellKnownTypes.StringValue), typeof(global::Google.Protobuf.WellKnownTypes.BytesValue), }); + new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.DoubleValue), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.FloatValue), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Int64Value), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.UInt64Value), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Int32Value), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.UInt32Value), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.BoolValue), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.StringValue), new[]{ "Value" }, null, null, null), + new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.BytesValue), new[]{ "Value" }, null, null, null) + })); } #endregion @@ -43,8 +53,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<DoubleValue> _parser = new pb::MessageParser<DoubleValue>(() => new DoubleValue()); public static pb::MessageParser<DoubleValue> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 9 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[0]; } } @@ -79,7 +87,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private double value_; - [pbr::ProtobufField(1, "value")] public double Value { get { return value_; } set { @@ -163,8 +170,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<FloatValue> _parser = new pb::MessageParser<FloatValue>(() => new FloatValue()); public static pb::MessageParser<FloatValue> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 13 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[1]; } } @@ -199,7 +204,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private float value_; - [pbr::ProtobufField(1, "value")] public float Value { get { return value_; } set { @@ -283,8 +287,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Int64Value> _parser = new pb::MessageParser<Int64Value>(() => new Int64Value()); public static pb::MessageParser<Int64Value> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[2]; } } @@ -319,7 +321,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private long value_; - [pbr::ProtobufField(1, "value")] public long Value { get { return value_; } set { @@ -403,8 +404,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<UInt64Value> _parser = new pb::MessageParser<UInt64Value>(() => new UInt64Value()); public static pb::MessageParser<UInt64Value> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[3]; } } @@ -439,7 +438,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private ulong value_; - [pbr::ProtobufField(1, "value")] public ulong Value { get { return value_; } set { @@ -523,8 +521,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<Int32Value> _parser = new pb::MessageParser<Int32Value>(() => new Int32Value()); public static pb::MessageParser<Int32Value> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[4]; } } @@ -559,7 +555,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private int value_; - [pbr::ProtobufField(1, "value")] public int Value { get { return value_; } set { @@ -643,8 +638,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<UInt32Value> _parser = new pb::MessageParser<UInt32Value>(() => new UInt32Value()); public static pb::MessageParser<UInt32Value> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[5]; } } @@ -679,7 +672,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private uint value_; - [pbr::ProtobufField(1, "value")] public uint Value { get { return value_; } set { @@ -763,8 +755,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<BoolValue> _parser = new pb::MessageParser<BoolValue>(() => new BoolValue()); public static pb::MessageParser<BoolValue> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 8 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[6]; } } @@ -799,7 +789,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private bool value_; - [pbr::ProtobufField(1, "value")] public bool Value { get { return value_; } set { @@ -883,8 +872,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<StringValue> _parser = new pb::MessageParser<StringValue>(() => new StringValue()); public static pb::MessageParser<StringValue> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[7]; } } @@ -919,7 +906,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private string value_ = ""; - [pbr::ProtobufField(1, "value")] public string Value { get { return value_; } set { @@ -1003,8 +989,6 @@ namespace Google.Protobuf.WellKnownTypes { private static readonly pb::MessageParser<BytesValue> _parser = new pb::MessageParser<BytesValue>(() => new BytesValue()); public static pb::MessageParser<BytesValue> Parser { get { return _parser; } } - private static readonly string[] _fieldNames = new string[] { "value" }; - private static readonly uint[] _fieldTags = new uint[] { 10 }; public static pbr::MessageDescriptor Descriptor { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[8]; } } @@ -1039,7 +1023,6 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private pb::ByteString value_ = pb::ByteString.Empty; - [pbr::ProtobufField(1, "value")] public pb::ByteString Value { get { return value_; } set { |