diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-07-20 19:25:07 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-07-21 12:59:41 +0100 |
| commit | 96cffaa8e397d466ee3b07c413824182f4a95a9e (patch) | |
| tree | 7004630590008c09139575a33c5fd1c5260f5fb9 | |
| parent | 53c399a1d65df65e9f83a70b55041a01cf8d7489 (diff) | |
| download | protobuf-96cffaa8e397d466ee3b07c413824182f4a95a9e.tar.gz protobuf-96cffaa8e397d466ee3b07c413824182f4a95a9e.tar.bz2 protobuf-96cffaa8e397d466ee3b07c413824182f4a95a9e.zip | |
Generated code changes following previous commit.
18 files changed, 686 insertions, 728 deletions
diff --git a/csharp/src/AddressBook/Addressbook.cs b/csharp/src/AddressBook/Addressbook.cs index e3abd98b..92257064 100644 --- a/csharp/src/AddressBook/Addressbook.cs +++ b/csharp/src/AddressBook/Addressbook.cs @@ -12,11 +12,6 @@ namespace Google.Protobuf.Examples.AddressBook { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Addressbook { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_tutorial_Person__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_tutorial_AddressBook__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -36,17 +31,8 @@ namespace Google.Protobuf.Examples.AddressBook { "aWFsQhFBZGRyZXNzQm9va1Byb3Rvc6oCJEdvb2dsZS5Qcm90b2J1Zi5FeGFt", "cGxlcy5BZGRyZXNzQm9va2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_tutorial_Person__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.Person), descriptor.MessageTypes[0], - new string[] { "Name", "Id", "Email", "Phones", }, new string[] { }); - internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), descriptor.MessageTypes[0].NestedTypes[0], - new string[] { "Number", "Type", }, new string[] { }); - internal__static_tutorial_AddressBook__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), descriptor.MessageTypes[1], - new string[] { "People", }, new string[] { }); + 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), }); } #endregion @@ -63,8 +49,8 @@ namespace Google.Protobuf.Examples.AddressBook { get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_Person__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -97,6 +83,7 @@ namespace Google.Protobuf.Examples.AddressBook { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -107,6 +94,7 @@ namespace Google.Protobuf.Examples.AddressBook { public const int IdFieldNumber = 2; private int id_; + [pbr::ProtobufField(2, "id")] public int Id { get { return id_; } set { @@ -117,6 +105,7 @@ namespace Google.Protobuf.Examples.AddressBook { public const int EmailFieldNumber = 3; private string email_ = ""; + [pbr::ProtobufField(3, "email")] public string Email { get { return email_; } set { @@ -129,6 +118,7 @@ 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_; } } @@ -262,8 +252,8 @@ namespace Google.Protobuf.Examples.AddressBook { get { return global::Google.Protobuf.Examples.AddressBook.Person.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -293,6 +283,7 @@ namespace Google.Protobuf.Examples.AddressBook { public const int NumberFieldNumber = 1; private string number_ = ""; + [pbr::ProtobufField(1, "number")] public string Number { get { return number_; } set { @@ -303,6 +294,7 @@ 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 { @@ -413,8 +405,8 @@ namespace Google.Protobuf.Examples.AddressBook { get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_AddressBook__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -446,6 +438,7 @@ 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 5f6eae0c..4eeb7423 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs @@ -12,15 +12,6 @@ namespace Google.Protobuf.TestProtos { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class MapUnittestProto3 { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -155,30 +146,8 @@ namespace Google.Protobuf.TestProtos { "EAoMTUFQX0VOVU1fQkFSEAESEAoMTUFQX0VOVU1fQkFaEAJCIPgBAaoCGkdv", "b2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor, - }); - internal__static_protobuf_unittest_TestMap__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap), descriptor.MessageTypes[0], - new string[] { "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapInt32Bytes", "MapInt32Enum", "MapInt32ForeignMessage", }, new string[] { }); - internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMapSubmessage), descriptor.MessageTypes[1], - new string[] { "TestMap", }, new string[] { }); - internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMessageMap), descriptor.MessageTypes[2], - new string[] { "MapInt32Message", }, new string[] { }); - internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap), descriptor.MessageTypes[3], - new string[] { "Map1", "Map2", }, new string[] { }); - internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap), descriptor.MessageTypes[4], - new string[] { "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapInt32Enum", "MapInt32ForeignMessage", }, new string[] { }); - internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType), descriptor.MessageTypes[5], - new string[] { "Type", }, new string[] { }); - internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry), descriptor.MessageTypes[6], - new string[] { "Entry", }, new string[] { }); + 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), }); } #endregion @@ -204,8 +173,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -269,6 +238,7 @@ 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_; } } @@ -277,6 +247,7 @@ 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_; } } @@ -285,6 +256,7 @@ 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_; } } @@ -293,6 +265,7 @@ 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_; } } @@ -301,6 +274,7 @@ 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_; } } @@ -309,6 +283,7 @@ 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_; } } @@ -317,6 +292,7 @@ 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_; } } @@ -325,6 +301,7 @@ 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_; } } @@ -333,6 +310,7 @@ 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_; } } @@ -341,6 +319,7 @@ 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_; } } @@ -349,6 +328,7 @@ 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_; } } @@ -357,6 +337,7 @@ 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_; } } @@ -365,6 +346,7 @@ 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_; } } @@ -373,6 +355,7 @@ 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_; } } @@ -381,6 +364,7 @@ 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_; } } @@ -389,6 +373,7 @@ 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_; } } @@ -397,6 +382,7 @@ 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_; } } @@ -619,8 +605,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -650,6 +636,7 @@ 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 { @@ -745,8 +732,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -778,6 +765,7 @@ 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_; } } @@ -856,8 +844,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[3]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -891,6 +879,7 @@ 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_; } } @@ -899,6 +888,7 @@ 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_; } } @@ -986,8 +976,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[4]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1047,6 +1037,7 @@ 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_; } } @@ -1055,6 +1046,7 @@ 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_; } } @@ -1063,6 +1055,7 @@ 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_; } } @@ -1071,6 +1064,7 @@ 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_; } } @@ -1079,6 +1073,7 @@ 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_; } } @@ -1087,6 +1082,7 @@ 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_; } } @@ -1095,6 +1091,7 @@ 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_; } } @@ -1103,6 +1100,7 @@ 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_; } } @@ -1111,6 +1109,7 @@ 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_; } } @@ -1119,6 +1118,7 @@ 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,6 +1127,7 @@ 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_; } } @@ -1135,6 +1136,7 @@ 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_; } } @@ -1143,6 +1145,7 @@ 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_; } } @@ -1151,6 +1154,7 @@ 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_; } } @@ -1159,6 +1163,7 @@ 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_; } } @@ -1363,8 +1368,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[5]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1396,6 +1401,7 @@ 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 +1490,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[6]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1517,6 +1523,7 @@ 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 3875a4c3..87bec2af 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs @@ -12,9 +12,6 @@ namespace Google.Protobuf.TestProtos { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class UnittestImportProto3 { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -33,12 +30,8 @@ namespace Google.Protobuf.TestProtos { "c3RIAfgBAaoCGkdvb2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zUABiBnByb3Rv", "Mw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.Descriptor, - }); - internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.ImportMessage), descriptor.MessageTypes[0], - new string[] { "D", }, new string[] { }); + 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), }); } #endregion @@ -65,8 +58,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestImportProto3.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestImportProto3.internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -95,6 +88,7 @@ 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 048ae5e9..a983dfa8 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs @@ -12,9 +12,6 @@ namespace Google.Protobuf.TestProtos { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class UnittestImportPublicProto3 { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_import_PublicImportMessage__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -29,11 +26,8 @@ namespace Google.Protobuf.TestProtos { "bXBvcnRNZXNzYWdlEgkKAWUYASABKAVCNwoYY29tLmdvb2dsZS5wcm90b2J1", "Zi50ZXN0qgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_protobuf_unittest_import_PublicImportMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.PublicImportMessage), descriptor.MessageTypes[0], - new string[] { "E", }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.TestProtos.PublicImportMessage), }); } #endregion @@ -50,8 +44,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.internal__static_protobuf_unittest_import_PublicImportMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -80,6 +74,7 @@ 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 c68c67fb..9a656f25 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs @@ -12,15 +12,6 @@ namespace UnitTest.Issues.TestProtos { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class UnittestIssues { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_unittest_issues_Issue307__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_unittest_issues_Issue307_NestedOnce__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_unittest_issues_Issue307_NestedOnce_NestedTwice__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_unittest_issues_ItemField__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -49,29 +40,8 @@ namespace UnitTest.Issues.TestProtos { "dGVkRW51bRITCg9ERVBSRUNBVEVEX1pFUk8QABIHCgNvbmUQAUIfSAGqAhpV", "bml0VGVzdC5Jc3N1ZXMuVGVzdFByb3Rvc2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_unittest_issues_Issue307__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.Issue307), descriptor.MessageTypes[0], - new string[] { }, new string[] { }); - internal__static_unittest_issues_Issue307_NestedOnce__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce), descriptor.MessageTypes[0].NestedTypes[0], - new string[] { }, new string[] { }); - internal__static_unittest_issues_Issue307_NestedOnce_NestedTwice__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Types.NestedTwice), descriptor.MessageTypes[0].NestedTypes[0].NestedTypes[0], - new string[] { }, new string[] { }); - internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.NegativeEnumMessage), descriptor.MessageTypes[1], - new string[] { "Value", "Values", "PackedValues", }, new string[] { }); - internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.DeprecatedChild), descriptor.MessageTypes[2], - new string[] { }, new string[] { }); - internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage), descriptor.MessageTypes[3], - new string[] { "PrimitiveValue", "PrimitiveArray", "MessageValue", "MessageArray", "EnumValue", "EnumArray", }, new string[] { }); - internal__static_unittest_issues_ItemField__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.ItemField), descriptor.MessageTypes[4], - new string[] { "Item", }, new string[] { }); + 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), }); } #endregion @@ -102,8 +72,8 @@ namespace UnitTest.Issues.TestProtos { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_Issue307__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -195,8 +165,8 @@ namespace UnitTest.Issues.TestProtos { get { return global::UnitTest.Issues.TestProtos.Issue307.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_Issue307_NestedOnce__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -288,8 +258,8 @@ namespace UnitTest.Issues.TestProtos { get { return global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_Issue307_NestedOnce_NestedTwice__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -390,8 +360,8 @@ namespace UnitTest.Issues.TestProtos { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -424,6 +394,7 @@ 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 { @@ -434,14 +405,18 @@ namespace UnitTest.Issues.TestProtos { public const int ValuesFieldNumber = 2; 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>(); + = 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_; } } public const int PackedValuesFieldNumber = 3; 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>(); + = 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_; } } @@ -547,8 +522,8 @@ namespace UnitTest.Issues.TestProtos { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -639,8 +614,8 @@ namespace UnitTest.Issues.TestProtos { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[3]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -679,6 +654,7 @@ 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 { @@ -692,6 +668,7 @@ 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_; } } @@ -699,6 +676,7 @@ 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 { @@ -712,6 +690,7 @@ 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_; } } @@ -719,6 +698,7 @@ 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 { @@ -729,8 +709,10 @@ namespace UnitTest.Issues.TestProtos { public const int EnumArrayFieldNumber = 6; private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.DeprecatedEnum> _repeated_enumArray_codec - = 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>(); + = 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_; } } @@ -883,8 +865,8 @@ namespace UnitTest.Issues.TestProtos { get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[4]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_ItemField__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -913,6 +895,7 @@ 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 67c42708..55ed08af 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs @@ -12,43 +12,6 @@ namespace Google.Protobuf.TestProtos { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class UnittestProto3 { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_NestedTestAllTypes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestDeprecatedFields__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestReservedFields__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestFieldOrderings_NestedMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_SparseEnumMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_OneString__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MoreString__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_OneBytes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MoreBytes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Int32Message__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Uint32Message__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Int64Message__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Uint64Message__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_BoolMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestOneof__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestPackedTypes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestUnpackedTypes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestRepeatedScalarDifferentTagSizes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestCommentInjectionMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooRequest__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooResponse__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooClientMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooServerMessage__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_BarRequest__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_BarResponse__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -186,114 +149,8 @@ namespace Google.Protobuf.TestProtos { "dHRlc3QuQmFyUmVzcG9uc2VCOkINVW5pdHRlc3RQcm90b0gBgAEBiAEBkAEB", "+AEBqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - global::Google.Protobuf.TestProtos.UnittestImportProto3.Descriptor, - }); - internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestAllTypes), descriptor.MessageTypes[0], - new string[] { "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 string[] { "OneofField", }); - internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage), descriptor.MessageTypes[0].NestedTypes[0], - new string[] { "Bb", }, new string[] { }); - internal__static_protobuf_unittest_NestedTestAllTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.NestedTestAllTypes), descriptor.MessageTypes[1], - new string[] { "Child", "Payload", "RepeatedChild", }, new string[] { }); - internal__static_protobuf_unittest_TestDeprecatedFields__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestDeprecatedFields), descriptor.MessageTypes[2], - new string[] { "DeprecatedInt32", }, new string[] { }); - internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.ForeignMessage), descriptor.MessageTypes[3], - new string[] { "C", }, new string[] { }); - internal__static_protobuf_unittest_TestReservedFields__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestReservedFields), descriptor.MessageTypes[4], - new string[] { }, new string[] { }); - internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestForeignNested), descriptor.MessageTypes[5], - new string[] { "ForeignNested", }, new string[] { }); - internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestReallyLargeTagNumber), descriptor.MessageTypes[6], - new string[] { "A", "Bb", }, new string[] { }); - internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestRecursiveMessage), descriptor.MessageTypes[7], - new string[] { "A", "I", }, new string[] { }); - internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionA), descriptor.MessageTypes[8], - new string[] { "Bb", }, new string[] { }); - internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionB), descriptor.MessageTypes[9], - new string[] { "A", "OptionalInt32", }, new string[] { }); - internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestCamelCaseFieldNames), descriptor.MessageTypes[10], - new string[] { "PrimitiveField", "StringField", "EnumField", "MessageField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedEnumField", "RepeatedMessageField", }, new string[] { }); - internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings), descriptor.MessageTypes[11], - new string[] { "MyString", "MyInt", "MyFloat", "SingleNestedMessage", }, new string[] { }); - internal__static_protobuf_unittest_TestFieldOrderings_NestedMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage), descriptor.MessageTypes[11].NestedTypes[0], - new string[] { "Oo", "Bb", }, new string[] { }); - internal__static_protobuf_unittest_SparseEnumMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.SparseEnumMessage), descriptor.MessageTypes[12], - new string[] { "SparseEnum", }, new string[] { }); - internal__static_protobuf_unittest_OneString__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.OneString), descriptor.MessageTypes[13], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_MoreString__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MoreString), descriptor.MessageTypes[14], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_OneBytes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.OneBytes), descriptor.MessageTypes[15], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_MoreBytes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MoreBytes), descriptor.MessageTypes[16], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_Int32Message__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Int32Message), descriptor.MessageTypes[17], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_Uint32Message__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Uint32Message), descriptor.MessageTypes[18], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_Int64Message__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Int64Message), descriptor.MessageTypes[19], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_Uint64Message__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Uint64Message), descriptor.MessageTypes[20], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_BoolMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.BoolMessage), descriptor.MessageTypes[21], - new string[] { "Data", }, new string[] { }); - internal__static_protobuf_unittest_TestOneof__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestOneof), descriptor.MessageTypes[22], - new string[] { "FooInt", "FooString", "FooMessage", }, new string[] { "Foo", }); - internal__static_protobuf_unittest_TestPackedTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestPackedTypes), descriptor.MessageTypes[23], - new string[] { "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedEnum", }, new string[] { }); - internal__static_protobuf_unittest_TestUnpackedTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestUnpackedTypes), descriptor.MessageTypes[24], - new string[] { "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedEnum", }, new string[] { }); - internal__static_protobuf_unittest_TestRepeatedScalarDifferentTagSizes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestRepeatedScalarDifferentTagSizes), descriptor.MessageTypes[25], - new string[] { "RepeatedFixed32", "RepeatedInt32", "RepeatedFixed64", "RepeatedInt64", "RepeatedFloat", "RepeatedUint64", }, new string[] { }); - internal__static_protobuf_unittest_TestCommentInjectionMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestCommentInjectionMessage), descriptor.MessageTypes[26], - new string[] { "A", }, new string[] { }); - internal__static_protobuf_unittest_FooRequest__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooRequest), descriptor.MessageTypes[27], - new string[] { }, new string[] { }); - internal__static_protobuf_unittest_FooResponse__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooResponse), descriptor.MessageTypes[28], - new string[] { }, new string[] { }); - internal__static_protobuf_unittest_FooClientMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooClientMessage), descriptor.MessageTypes[29], - new string[] { }, new string[] { }); - internal__static_protobuf_unittest_FooServerMessage__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooServerMessage), descriptor.MessageTypes[30], - new string[] { }, new string[] { }); - internal__static_protobuf_unittest_BarRequest__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.BarRequest), descriptor.MessageTypes[31], - new string[] { }, new string[] { }); - internal__static_protobuf_unittest_BarResponse__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.BarResponse), descriptor.MessageTypes[32], - new string[] { }, new string[] { }); + 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), }); } #endregion @@ -339,8 +196,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -454,6 +311,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleInt32FieldNumber = 1; private int singleInt32_; + [pbr::ProtobufField(1, "single_int32")] public int SingleInt32 { get { return singleInt32_; } set { @@ -464,6 +322,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleInt64FieldNumber = 2; private long singleInt64_; + [pbr::ProtobufField(2, "single_int64")] public long SingleInt64 { get { return singleInt64_; } set { @@ -474,6 +333,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleUint32FieldNumber = 3; private uint singleUint32_; + [pbr::ProtobufField(3, "single_uint32")] public uint SingleUint32 { get { return singleUint32_; } set { @@ -484,6 +344,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleUint64FieldNumber = 4; private ulong singleUint64_; + [pbr::ProtobufField(4, "single_uint64")] public ulong SingleUint64 { get { return singleUint64_; } set { @@ -494,6 +355,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleSint32FieldNumber = 5; private int singleSint32_; + [pbr::ProtobufField(5, "single_sint32")] public int SingleSint32 { get { return singleSint32_; } set { @@ -504,6 +366,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleSint64FieldNumber = 6; private long singleSint64_; + [pbr::ProtobufField(6, "single_sint64")] public long SingleSint64 { get { return singleSint64_; } set { @@ -514,6 +377,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleFixed32FieldNumber = 7; private uint singleFixed32_; + [pbr::ProtobufField(7, "single_fixed32")] public uint SingleFixed32 { get { return singleFixed32_; } set { @@ -524,6 +388,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleFixed64FieldNumber = 8; private ulong singleFixed64_; + [pbr::ProtobufField(8, "single_fixed64")] public ulong SingleFixed64 { get { return singleFixed64_; } set { @@ -534,6 +399,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleSfixed32FieldNumber = 9; private int singleSfixed32_; + [pbr::ProtobufField(9, "single_sfixed32")] public int SingleSfixed32 { get { return singleSfixed32_; } set { @@ -544,6 +410,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleSfixed64FieldNumber = 10; private long singleSfixed64_; + [pbr::ProtobufField(10, "single_sfixed64")] public long SingleSfixed64 { get { return singleSfixed64_; } set { @@ -554,6 +421,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleFloatFieldNumber = 11; private float singleFloat_; + [pbr::ProtobufField(11, "single_float")] public float SingleFloat { get { return singleFloat_; } set { @@ -564,6 +432,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleDoubleFieldNumber = 12; private double singleDouble_; + [pbr::ProtobufField(12, "single_double")] public double SingleDouble { get { return singleDouble_; } set { @@ -574,6 +443,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleBoolFieldNumber = 13; private bool singleBool_; + [pbr::ProtobufField(13, "single_bool")] public bool SingleBool { get { return singleBool_; } set { @@ -584,6 +454,7 @@ namespace Google.Protobuf.TestProtos { public const int SingleStringFieldNumber = 14; private string singleString_ = ""; + [pbr::ProtobufField(14, "single_string")] public string SingleString { get { return singleString_; } set { @@ -594,6 +465,7 @@ 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 { @@ -604,6 +476,7 @@ 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 { @@ -614,6 +487,7 @@ 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 { @@ -624,6 +498,7 @@ 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 { @@ -634,6 +509,7 @@ 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 { @@ -644,6 +520,7 @@ 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 { @@ -654,6 +531,7 @@ 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 { @@ -664,6 +542,7 @@ 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 { @@ -676,6 +555,7 @@ 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_; } } @@ -684,6 +564,7 @@ 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_; } } @@ -692,6 +573,7 @@ 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_; } } @@ -700,6 +582,7 @@ 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_; } } @@ -708,6 +591,7 @@ 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_; } } @@ -716,6 +600,7 @@ 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_; } } @@ -724,6 +609,7 @@ 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_; } } @@ -732,6 +618,7 @@ 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_; } } @@ -740,6 +627,7 @@ 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_; } } @@ -748,6 +636,7 @@ 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_; } } @@ -756,6 +645,7 @@ 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_; } } @@ -764,6 +654,7 @@ 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_; } } @@ -772,6 +663,7 @@ 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_; } } @@ -780,6 +672,7 @@ 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_; } } @@ -788,6 +681,7 @@ 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_; } } @@ -796,6 +690,7 @@ 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_; } } @@ -804,6 +699,7 @@ 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_; } } @@ -812,27 +708,34 @@ 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_; } } public const int RepeatedNestedEnumFieldNumber = 51; 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>(); + = 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_; } } public const int RepeatedForeignEnumFieldNumber = 52; 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>(); + = 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_; } } public const int RepeatedImportEnumFieldNumber = 53; 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>(); + = 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_; } } @@ -841,11 +744,13 @@ 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 { @@ -856,6 +761,7 @@ 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 { @@ -866,6 +772,7 @@ 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 { @@ -876,6 +783,7 @@ 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 { @@ -894,10 +802,12 @@ namespace Google.Protobuf.TestProtos { OneofBytes = 114, } private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None; + [pbr::ProtobufOneof("oneof_field")] public OneofFieldOneofCase OneofFieldCase { get { return oneofFieldCase_; } } + [pbr::ProtobufOneof("oneof_field")] public void ClearOneofField() { pb::Freezable.CheckMutable(this); oneofFieldCase_ = OneofFieldOneofCase.None; @@ -1640,8 +1550,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.TestAllTypes.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1670,6 +1580,7 @@ namespace Google.Protobuf.TestProtos { public const int BbFieldNumber = 1; private int bb_; + [pbr::ProtobufField(1, "bb")] public int Bb { get { return bb_; } set { @@ -1764,8 +1675,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_NestedTestAllTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1799,6 +1710,7 @@ 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 { @@ -1809,6 +1721,7 @@ 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 { @@ -1821,6 +1734,7 @@ 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_; } } @@ -1943,8 +1857,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestDeprecatedFields__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1974,6 +1888,7 @@ 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 { @@ -2063,8 +1978,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[3]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2093,6 +2008,7 @@ namespace Google.Protobuf.TestProtos { public const int CFieldNumber = 1; private int c_; + [pbr::ProtobufField(1, "c")] public int C { get { return c_; } set { @@ -2182,8 +2098,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[4]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestReservedFields__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2274,8 +2190,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[5]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2305,6 +2221,7 @@ 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 { @@ -2400,8 +2317,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[6]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2431,6 +2348,7 @@ namespace Google.Protobuf.TestProtos { public const int AFieldNumber = 1; private int a_; + [pbr::ProtobufField(1, "a")] public int A { get { return a_; } set { @@ -2441,6 +2359,7 @@ namespace Google.Protobuf.TestProtos { public const int BbFieldNumber = 268435455; private int bb_; + [pbr::ProtobufField(268435455, "bb")] public int Bb { get { return bb_; } set { @@ -2546,8 +2465,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[7]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2578,6 +2497,7 @@ 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 { @@ -2588,6 +2508,7 @@ namespace Google.Protobuf.TestProtos { public const int IFieldNumber = 2; private int i_; + [pbr::ProtobufField(2, "i")] public int I { get { return i_; } set { @@ -2699,8 +2620,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[8]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2730,6 +2651,7 @@ 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 { @@ -2825,8 +2747,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[9]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2857,6 +2779,7 @@ 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 { @@ -2867,6 +2790,7 @@ namespace Google.Protobuf.TestProtos { public const int OptionalInt32FieldNumber = 2; private int optionalInt32_; + [pbr::ProtobufField(2, "optional_int32")] public int OptionalInt32 { get { return optionalInt32_; } set { @@ -2978,8 +2902,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[10]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3020,6 +2944,7 @@ namespace Google.Protobuf.TestProtos { public const int PrimitiveFieldFieldNumber = 1; private int primitiveField_; + [pbr::ProtobufField(1, "PrimitiveField")] public int PrimitiveField { get { return primitiveField_; } set { @@ -3030,6 +2955,7 @@ namespace Google.Protobuf.TestProtos { public const int StringFieldFieldNumber = 2; private string stringField_ = ""; + [pbr::ProtobufField(2, "StringField")] public string StringField { get { return stringField_; } set { @@ -3040,6 +2966,7 @@ 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 { @@ -3050,6 +2977,7 @@ 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 { @@ -3062,6 +2990,7 @@ 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_; } } @@ -3070,13 +2999,16 @@ 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_; } } public const int RepeatedEnumFieldFieldNumber = 9; 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>(); + = 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_; } } @@ -3085,6 +3017,7 @@ 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_; } } @@ -3262,8 +3195,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[11]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3296,6 +3229,7 @@ namespace Google.Protobuf.TestProtos { public const int MyStringFieldNumber = 11; private string myString_ = ""; + [pbr::ProtobufField(11, "my_string")] public string MyString { get { return myString_; } set { @@ -3306,6 +3240,7 @@ namespace Google.Protobuf.TestProtos { public const int MyIntFieldNumber = 1; private long myInt_; + [pbr::ProtobufField(1, "my_int")] public long MyInt { get { return myInt_; } set { @@ -3316,6 +3251,7 @@ namespace Google.Protobuf.TestProtos { public const int MyFloatFieldNumber = 101; private float myFloat_; + [pbr::ProtobufField(101, "my_float")] public float MyFloat { get { return myFloat_; } set { @@ -3326,6 +3262,7 @@ 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 { @@ -3470,8 +3407,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.TestFieldOrderings.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestFieldOrderings_NestedMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3501,6 +3438,7 @@ namespace Google.Protobuf.TestProtos { public const int OoFieldNumber = 2; private long oo_; + [pbr::ProtobufField(2, "oo")] public long Oo { get { return oo_; } set { @@ -3511,6 +3449,7 @@ namespace Google.Protobuf.TestProtos { public const int BbFieldNumber = 1; private int bb_; + [pbr::ProtobufField(1, "bb")] public int Bb { get { return bb_; } set { @@ -3621,8 +3560,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[12]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_SparseEnumMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3651,6 +3590,7 @@ 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 { @@ -3740,8 +3680,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[13]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_OneString__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3770,6 +3710,7 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private string data_ = ""; + [pbr::ProtobufField(1, "data")] public string Data { get { return data_; } set { @@ -3859,8 +3800,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[14]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_MoreString__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3892,6 +3833,7 @@ 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_; } } @@ -3970,8 +3912,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[15]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_OneBytes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4000,6 +3942,7 @@ 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 { @@ -4089,8 +4032,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[16]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_MoreBytes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4119,6 +4062,7 @@ 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 { @@ -4208,8 +4152,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[17]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Int32Message__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4238,6 +4182,7 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private int data_; + [pbr::ProtobufField(1, "data")] public int Data { get { return data_; } set { @@ -4327,8 +4272,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[18]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Uint32Message__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4357,6 +4302,7 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private uint data_; + [pbr::ProtobufField(1, "data")] public uint Data { get { return data_; } set { @@ -4446,8 +4392,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[19]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Int64Message__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4476,6 +4422,7 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private long data_; + [pbr::ProtobufField(1, "data")] public long Data { get { return data_; } set { @@ -4565,8 +4512,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[20]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Uint64Message__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4595,6 +4542,7 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private ulong data_; + [pbr::ProtobufField(1, "data")] public ulong Data { get { return data_; } set { @@ -4684,8 +4632,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[21]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_BoolMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4714,6 +4662,7 @@ namespace Google.Protobuf.TestProtos { public const int DataFieldNumber = 1; private bool data_; + [pbr::ProtobufField(1, "data")] public bool Data { get { return data_; } set { @@ -4803,8 +4752,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[22]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestOneof__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4844,6 +4793,7 @@ 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 { @@ -4854,6 +4804,7 @@ 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 { @@ -4864,6 +4815,7 @@ 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 { @@ -4881,10 +4833,12 @@ namespace Google.Protobuf.TestProtos { FooMessage = 3, } private FooOneofCase fooCase_ = FooOneofCase.None; + [pbr::ProtobufOneof("foo")] public FooOneofCase FooCase { get { return fooCase_; } } + [pbr::ProtobufOneof("foo")] public void ClearFoo() { pb::Freezable.CheckMutable(this); fooCase_ = FooOneofCase.None; @@ -5012,8 +4966,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[23]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestPackedTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -5071,6 +5025,7 @@ 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_; } } @@ -5079,6 +5034,7 @@ 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_; } } @@ -5087,6 +5043,7 @@ 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_; } } @@ -5095,6 +5052,7 @@ 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_; } } @@ -5103,6 +5061,7 @@ 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_; } } @@ -5111,6 +5070,7 @@ 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_; } } @@ -5119,6 +5079,7 @@ 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_; } } @@ -5127,6 +5088,7 @@ 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_; } } @@ -5135,6 +5097,7 @@ 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_; } } @@ -5143,6 +5106,7 @@ 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_; } } @@ -5151,6 +5115,7 @@ 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_; } } @@ -5159,6 +5124,7 @@ 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_; } } @@ -5167,13 +5133,16 @@ 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_; } } public const int PackedEnumFieldNumber = 103; 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>(); + = 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_; } } @@ -5383,8 +5352,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[24]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestUnpackedTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -5442,6 +5411,7 @@ 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_; } } @@ -5450,6 +5420,7 @@ 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_; } } @@ -5458,6 +5429,7 @@ 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_; } } @@ -5466,6 +5438,7 @@ 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_; } } @@ -5474,6 +5447,7 @@ 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_; } } @@ -5482,6 +5456,7 @@ 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_; } } @@ -5490,6 +5465,7 @@ 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_; } } @@ -5498,6 +5474,7 @@ 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_; } } @@ -5506,6 +5483,7 @@ 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_; } } @@ -5514,6 +5492,7 @@ 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_; } } @@ -5522,6 +5501,7 @@ 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_; } } @@ -5530,6 +5510,7 @@ 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_; } } @@ -5538,13 +5519,16 @@ 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_; } } public const int UnpackedEnumFieldNumber = 103; 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>(); + = 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_; } } @@ -5754,8 +5738,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[25]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestRepeatedScalarDifferentTagSizes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -5797,6 +5781,7 @@ 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_; } } @@ -5805,6 +5790,7 @@ 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_; } } @@ -5813,6 +5799,7 @@ 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_; } } @@ -5821,6 +5808,7 @@ 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_; } } @@ -5829,6 +5817,7 @@ 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_; } } @@ -5837,6 +5826,7 @@ 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_; } } @@ -5966,8 +5956,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[26]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestCommentInjectionMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -5996,6 +5986,7 @@ namespace Google.Protobuf.TestProtos { public const int AFieldNumber = 1; private string a_ = ""; + [pbr::ProtobufField(1, "a")] public string A { get { return a_; } set { @@ -6085,8 +6076,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[27]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooRequest__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -6177,8 +6168,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[28]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooResponse__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -6269,8 +6260,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[29]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooClientMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -6361,8 +6352,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[30]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooServerMessage__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -6453,8 +6444,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[31]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_BarRequest__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -6545,8 +6536,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[32]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_BarResponse__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs index af7d83ba..cbfa2d5e 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs @@ -12,12 +12,6 @@ namespace Google.Protobuf.TestProtos { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class UnittestWellKnownTypes { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestWellKnownTypes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_RepeatedWellKnownTypes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_OneofWellKnownTypes__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MapWellKnownTypes__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -164,30 +158,8 @@ namespace Google.Protobuf.TestProtos { "Lmdvb2dsZS5wcm90b2J1Zi50ZXN0UAGqAhpHb29nbGUuUHJvdG9idWYuVGVz", "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, - }); - internal__static_protobuf_unittest_TestWellKnownTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestWellKnownTypes), descriptor.MessageTypes[0], - new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { }); - internal__static_protobuf_unittest_RepeatedWellKnownTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.RepeatedWellKnownTypes), descriptor.MessageTypes[1], - new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { }); - internal__static_protobuf_unittest_OneofWellKnownTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.OneofWellKnownTypes), descriptor.MessageTypes[2], - new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { "OneofField", }); - internal__static_protobuf_unittest_MapWellKnownTypes__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MapWellKnownTypes), descriptor.MessageTypes[3], - new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { }); + 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, }); } #endregion @@ -204,8 +176,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_TestWellKnownTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -260,6 +232,7 @@ 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 { @@ -270,6 +243,7 @@ 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 { @@ -280,6 +254,7 @@ 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 { @@ -290,6 +265,7 @@ 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 { @@ -300,6 +276,7 @@ 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 { @@ -310,6 +287,7 @@ 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 { @@ -320,6 +298,7 @@ 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 { @@ -330,6 +309,7 @@ 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 { @@ -340,6 +320,7 @@ 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 { @@ -351,6 +332,7 @@ 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 { @@ -362,6 +344,7 @@ 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 { @@ -373,6 +356,7 @@ 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 { @@ -384,6 +368,7 @@ 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 { @@ -395,6 +380,7 @@ 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 { @@ -406,6 +392,7 @@ 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 { @@ -417,6 +404,7 @@ 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 { @@ -428,6 +416,7 @@ 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 { @@ -439,6 +428,7 @@ 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 { @@ -890,8 +880,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_RepeatedWellKnownTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -957,6 +947,7 @@ 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_; } } @@ -965,6 +956,7 @@ 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_; } } @@ -973,6 +965,7 @@ 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_; } } @@ -981,6 +974,7 @@ 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_; } } @@ -989,6 +983,7 @@ 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_; } } @@ -997,6 +992,7 @@ 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_; } } @@ -1005,6 +1001,7 @@ 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_; } } @@ -1013,6 +1010,7 @@ 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_; } } @@ -1021,6 +1019,7 @@ 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_; } } @@ -1029,6 +1028,7 @@ 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,6 +1037,7 @@ 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_; } } @@ -1045,6 +1046,7 @@ 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_; } } @@ -1053,6 +1055,7 @@ 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_; } } @@ -1061,6 +1064,7 @@ 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_; } } @@ -1069,6 +1073,7 @@ 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_; } } @@ -1077,6 +1082,7 @@ 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_; } } @@ -1085,6 +1091,7 @@ 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_; } } @@ -1093,6 +1100,7 @@ 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_; } } @@ -1324,8 +1332,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_OneofWellKnownTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1410,6 +1418,7 @@ 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 { @@ -1420,6 +1429,7 @@ 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 { @@ -1430,6 +1440,7 @@ 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 { @@ -1440,6 +1451,7 @@ 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 { @@ -1450,6 +1462,7 @@ 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 { @@ -1460,6 +1473,7 @@ 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 { @@ -1470,6 +1484,7 @@ 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 { @@ -1480,6 +1495,7 @@ 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 { @@ -1490,6 +1506,7 @@ 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 { @@ -1501,6 +1518,7 @@ 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 { @@ -1512,6 +1530,7 @@ 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 { @@ -1523,6 +1542,7 @@ 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 { @@ -1534,6 +1554,7 @@ 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 { @@ -1545,6 +1566,7 @@ 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 { @@ -1556,6 +1578,7 @@ 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 { @@ -1567,6 +1590,7 @@ 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 { @@ -1578,6 +1602,7 @@ 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 { @@ -1589,6 +1614,7 @@ 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 { @@ -1621,10 +1647,12 @@ namespace Google.Protobuf.TestProtos { BytesField = 18, } private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None; + [pbr::ProtobufOneof("oneof_field")] public OneofFieldOneofCase OneofFieldCase { get { return oneofFieldCase_; } } + [pbr::ProtobufOneof("oneof_field")] public void ClearOneofField() { pb::Freezable.CheckMutable(this); oneofFieldCase_ = OneofFieldOneofCase.None; @@ -2023,8 +2051,8 @@ namespace Google.Protobuf.TestProtos { get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[3]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_MapWellKnownTypes__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2090,6 +2118,7 @@ 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_; } } @@ -2098,6 +2127,7 @@ 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_; } } @@ -2106,6 +2136,7 @@ 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_; } } @@ -2114,6 +2145,7 @@ 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_; } } @@ -2122,6 +2154,7 @@ 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_; } } @@ -2130,6 +2163,7 @@ 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_; } } @@ -2138,6 +2172,7 @@ 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_; } } @@ -2146,6 +2181,7 @@ 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_; } } @@ -2154,6 +2190,7 @@ 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_; } } @@ -2162,6 +2199,7 @@ 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_; } } @@ -2170,6 +2208,7 @@ 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_; } } @@ -2178,6 +2217,7 @@ 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_; } } @@ -2186,6 +2226,7 @@ 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_; } } @@ -2194,6 +2235,7 @@ 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_; } } @@ -2202,6 +2244,7 @@ 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_; } } @@ -2210,6 +2253,7 @@ 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_; } } @@ -2218,6 +2262,7 @@ 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_; } } @@ -2226,6 +2271,7 @@ 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/Reflection/DescriptorProtoFile.cs b/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs index c87969b9..6565982c 100644 --- a/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs +++ b/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs @@ -12,30 +12,6 @@ namespace Google.Protobuf.Reflection { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] internal static partial class DescriptorProtoFile { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_FileDescriptorSet__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_FileDescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_DescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_DescriptorProto_ExtensionRange__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_DescriptorProto_ReservedRange__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_FieldDescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_OneofDescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_EnumDescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_EnumValueDescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_ServiceDescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_MethodDescriptorProto__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_FileOptions__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_MessageOptions__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_FieldOptions__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_EnumOptions__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_EnumValueOptions__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_ServiceOptions__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_MethodOptions__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_UninterpretedOption__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_UninterpretedOption_NamePart__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_SourceCodeInfo__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_SourceCodeInfo_Location__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -157,74 +133,8 @@ namespace Google.Protobuf.Reflection { "clByb3Rvc0gBWgpkZXNjcmlwdG9yogIDR1BCqgIaR29vZ2xlLlByb3RvYnVm", "LlJlZmxlY3Rpb24=")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_FileDescriptorSet__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.FileDescriptorSet), descriptor.MessageTypes[0], - new string[] { "File", }, new string[] { }); - internal__static_google_protobuf_FileDescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.FileDescriptorProto), descriptor.MessageTypes[1], - new string[] { "Name", "Package", "Dependency", "PublicDependency", "WeakDependency", "MessageType", "EnumType", "Service", "Extension", "Options", "SourceCodeInfo", "Syntax", }, new string[] { }); - internal__static_google_protobuf_DescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.DescriptorProto), descriptor.MessageTypes[2], - new string[] { "Name", "Field", "Extension", "NestedType", "EnumType", "ExtensionRange", "OneofDecl", "Options", "ReservedRange", "ReservedName", }, new string[] { }); - internal__static_google_protobuf_DescriptorProto_ExtensionRange__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange), descriptor.MessageTypes[2].NestedTypes[0], - new string[] { "Start", "End", }, new string[] { }); - internal__static_google_protobuf_DescriptorProto_ReservedRange__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange), descriptor.MessageTypes[2].NestedTypes[1], - new string[] { "Start", "End", }, new string[] { }); - internal__static_google_protobuf_FieldDescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto), descriptor.MessageTypes[3], - new string[] { "Name", "Number", "Label", "Type", "TypeName", "Extendee", "DefaultValue", "OneofIndex", "Options", }, new string[] { }); - internal__static_google_protobuf_OneofDescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.OneofDescriptorProto), descriptor.MessageTypes[4], - new string[] { "Name", }, new string[] { }); - internal__static_google_protobuf_EnumDescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.EnumDescriptorProto), descriptor.MessageTypes[5], - new string[] { "Name", "Value", "Options", }, new string[] { }); - internal__static_google_protobuf_EnumValueDescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.EnumValueDescriptorProto), descriptor.MessageTypes[6], - new string[] { "Name", "Number", "Options", }, new string[] { }); - internal__static_google_protobuf_ServiceDescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.ServiceDescriptorProto), descriptor.MessageTypes[7], - new string[] { "Name", "Method", "Options", }, new string[] { }); - internal__static_google_protobuf_MethodDescriptorProto__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.MethodDescriptorProto), descriptor.MessageTypes[8], - new string[] { "Name", "InputType", "OutputType", "Options", "ClientStreaming", "ServerStreaming", }, new string[] { }); - internal__static_google_protobuf_FileOptions__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.FileOptions), descriptor.MessageTypes[9], - new string[] { "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "UninterpretedOption", }, new string[] { }); - internal__static_google_protobuf_MessageOptions__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.MessageOptions), descriptor.MessageTypes[10], - new string[] { "MessageSetWireFormat", "NoStandardDescriptorAccessor", "Deprecated", "MapEntry", "UninterpretedOption", }, new string[] { }); - internal__static_google_protobuf_FieldOptions__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.FieldOptions), descriptor.MessageTypes[11], - new string[] { "Ctype", "Packed", "Jstype", "Lazy", "Deprecated", "Weak", "UninterpretedOption", }, new string[] { }); - internal__static_google_protobuf_EnumOptions__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.EnumOptions), descriptor.MessageTypes[12], - new string[] { "AllowAlias", "Deprecated", "UninterpretedOption", }, new string[] { }); - internal__static_google_protobuf_EnumValueOptions__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.EnumValueOptions), descriptor.MessageTypes[13], - new string[] { "Deprecated", "UninterpretedOption", }, new string[] { }); - internal__static_google_protobuf_ServiceOptions__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.ServiceOptions), descriptor.MessageTypes[14], - new string[] { "Deprecated", "UninterpretedOption", }, new string[] { }); - internal__static_google_protobuf_MethodOptions__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.MethodOptions), descriptor.MessageTypes[15], - new string[] { "Deprecated", "UninterpretedOption", }, new string[] { }); - internal__static_google_protobuf_UninterpretedOption__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.UninterpretedOption), descriptor.MessageTypes[16], - new string[] { "Name", "IdentifierValue", "PositiveIntValue", "NegativeIntValue", "DoubleValue", "StringValue", "AggregateValue", }, new string[] { }); - internal__static_google_protobuf_UninterpretedOption_NamePart__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart), descriptor.MessageTypes[16].NestedTypes[0], - new string[] { "NamePart_", "IsExtension", }, new string[] { }); - internal__static_google_protobuf_SourceCodeInfo__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo), descriptor.MessageTypes[17], - new string[] { "Location", }, new string[] { }); - internal__static_google_protobuf_SourceCodeInfo_Location__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location), descriptor.MessageTypes[17].NestedTypes[0], - new string[] { "Path", "Span", "LeadingComments", "TrailingComments", "LeadingDetachedComments", }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.Reflection.FileDescriptorSet), typeof(global::Google.Protobuf.Reflection.FileDescriptorProto), typeof(global::Google.Protobuf.Reflection.DescriptorProto), typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange), typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange), typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto), typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type), typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label), typeof(global::Google.Protobuf.Reflection.OneofDescriptorProto), typeof(global::Google.Protobuf.Reflection.EnumDescriptorProto), typeof(global::Google.Protobuf.Reflection.EnumValueDescriptorProto), typeof(global::Google.Protobuf.Reflection.ServiceDescriptorProto), typeof(global::Google.Protobuf.Reflection.MethodDescriptorProto), typeof(global::Google.Protobuf.Reflection.FileOptions), typeof(global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode), typeof(global::Google.Protobuf.Reflection.MessageOptions), typeof(global::Google.Protobuf.Reflection.FieldOptions), typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.CType), typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.JSType), typeof(global::Google.Protobuf.Reflection.EnumOptions), typeof(global::Google.Protobuf.Reflection.EnumValueOptions), typeof(global::Google.Protobuf.Reflection.ServiceOptions), typeof(global::Google.Protobuf.Reflection.MethodOptions), typeof(global::Google.Protobuf.Reflection.UninterpretedOption), typeof(global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart), typeof(global::Google.Protobuf.Reflection.SourceCodeInfo), typeof(global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location), }); } #endregion @@ -241,8 +151,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_FileDescriptorSet__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -274,6 +184,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FileDescriptorProto> _repeated_file_codec = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Reflection.FileDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FileDescriptorProto> file_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FileDescriptorProto>(); + [pbr::ProtobufField(1, "file")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.FileDescriptorProto> File { get { return file_; } } @@ -352,8 +263,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_FileDescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -402,6 +313,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -412,6 +324,7 @@ namespace Google.Protobuf.Reflection { public const int PackageFieldNumber = 2; private string package_ = ""; + [pbr::ProtobufField(2, "package")] internal string Package { get { return package_; } set { @@ -424,6 +337,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<string> _repeated_dependency_codec = pb::FieldCodec.ForString(26); private readonly pbc::RepeatedField<string> dependency_ = new pbc::RepeatedField<string>(); + [pbr::ProtobufField(3, "dependency")] internal pbc::RepeatedField<string> Dependency { get { return dependency_; } } @@ -432,6 +346,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<int> _repeated_publicDependency_codec = pb::FieldCodec.ForInt32(80); private readonly pbc::RepeatedField<int> publicDependency_ = new pbc::RepeatedField<int>(); + [pbr::ProtobufField(10, "public_dependency")] internal pbc::RepeatedField<int> PublicDependency { get { return publicDependency_; } } @@ -440,6 +355,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<int> _repeated_weakDependency_codec = pb::FieldCodec.ForInt32(88); private readonly pbc::RepeatedField<int> weakDependency_ = new pbc::RepeatedField<int>(); + [pbr::ProtobufField(11, "weak_dependency")] internal pbc::RepeatedField<int> WeakDependency { get { return weakDependency_; } } @@ -448,6 +364,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto> _repeated_messageType_codec = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Reflection.DescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> messageType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto>(); + [pbr::ProtobufField(4, "message_type")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> MessageType { get { return messageType_; } } @@ -456,6 +373,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.EnumDescriptorProto> _repeated_enumType_codec = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.Reflection.EnumDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> enumType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto>(); + [pbr::ProtobufField(5, "enum_type")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> EnumType { get { return enumType_; } } @@ -464,6 +382,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.ServiceDescriptorProto> _repeated_service_codec = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.Reflection.ServiceDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.ServiceDescriptorProto> service_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.ServiceDescriptorProto>(); + [pbr::ProtobufField(6, "service")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.ServiceDescriptorProto> Service { get { return service_; } } @@ -472,12 +391,14 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FieldDescriptorProto> _repeated_extension_codec = pb::FieldCodec.ForMessage(58, global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> extension_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto>(); + [pbr::ProtobufField(7, "extension")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> Extension { get { return extension_; } } public const int OptionsFieldNumber = 8; private global::Google.Protobuf.Reflection.FileOptions options_; + [pbr::ProtobufField(8, "options")] internal global::Google.Protobuf.Reflection.FileOptions Options { get { return options_; } set { @@ -488,6 +409,7 @@ namespace Google.Protobuf.Reflection { public const int SourceCodeInfoFieldNumber = 9; private global::Google.Protobuf.Reflection.SourceCodeInfo sourceCodeInfo_; + [pbr::ProtobufField(9, "source_code_info")] internal global::Google.Protobuf.Reflection.SourceCodeInfo SourceCodeInfo { get { return sourceCodeInfo_; } set { @@ -498,6 +420,7 @@ namespace Google.Protobuf.Reflection { public const int SyntaxFieldNumber = 12; private string syntax_ = ""; + [pbr::ProtobufField(12, "syntax")] internal string Syntax { get { return syntax_; } set { @@ -728,8 +651,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -776,6 +699,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -788,6 +712,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FieldDescriptorProto> _repeated_field_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> field_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto>(); + [pbr::ProtobufField(2, "field")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> Field { get { return field_; } } @@ -796,6 +721,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FieldDescriptorProto> _repeated_extension_codec = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> extension_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto>(); + [pbr::ProtobufField(6, "extension")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> Extension { get { return extension_; } } @@ -804,6 +730,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto> _repeated_nestedType_codec = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.Reflection.DescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> nestedType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto>(); + [pbr::ProtobufField(3, "nested_type")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> NestedType { get { return nestedType_; } } @@ -812,6 +739,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.EnumDescriptorProto> _repeated_enumType_codec = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Reflection.EnumDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> enumType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto>(); + [pbr::ProtobufField(4, "enum_type")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> EnumType { get { return enumType_; } } @@ -820,6 +748,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange> _repeated_extensionRange_codec = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange> extensionRange_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange>(); + [pbr::ProtobufField(5, "extension_range")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange> ExtensionRange { get { return extensionRange_; } } @@ -828,12 +757,14 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.OneofDescriptorProto> _repeated_oneofDecl_codec = pb::FieldCodec.ForMessage(66, global::Google.Protobuf.Reflection.OneofDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.OneofDescriptorProto> oneofDecl_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.OneofDescriptorProto>(); + [pbr::ProtobufField(8, "oneof_decl")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.OneofDescriptorProto> OneofDecl { get { return oneofDecl_; } } public const int OptionsFieldNumber = 7; private global::Google.Protobuf.Reflection.MessageOptions options_; + [pbr::ProtobufField(7, "options")] internal global::Google.Protobuf.Reflection.MessageOptions Options { get { return options_; } set { @@ -846,6 +777,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange> _repeated_reservedRange_codec = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange> reservedRange_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange>(); + [pbr::ProtobufField(9, "reserved_range")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange> ReservedRange { get { return reservedRange_; } } @@ -854,6 +786,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<string> _repeated_reservedName_codec = pb::FieldCodec.ForString(82); private readonly pbc::RepeatedField<string> reservedName_ = new pbc::RepeatedField<string>(); + [pbr::ProtobufField(10, "reserved_name")] internal pbc::RepeatedField<string> ReservedName { get { return reservedName_; } } @@ -1034,8 +967,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProto.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto_ExtensionRange__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1065,6 +998,7 @@ namespace Google.Protobuf.Reflection { public const int StartFieldNumber = 1; private int start_; + [pbr::ProtobufField(1, "start")] internal int Start { get { return start_; } set { @@ -1075,6 +1009,7 @@ namespace Google.Protobuf.Reflection { public const int EndFieldNumber = 2; private int end_; + [pbr::ProtobufField(2, "end")] internal int End { get { return end_; } set { @@ -1180,8 +1115,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProto.Descriptor.NestedTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto_ReservedRange__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1211,6 +1146,7 @@ namespace Google.Protobuf.Reflection { public const int StartFieldNumber = 1; private int start_; + [pbr::ProtobufField(1, "start")] internal int Start { get { return start_; } set { @@ -1221,6 +1157,7 @@ namespace Google.Protobuf.Reflection { public const int EndFieldNumber = 2; private int end_; + [pbr::ProtobufField(2, "end")] internal int End { get { return end_; } set { @@ -1331,8 +1268,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[3]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_FieldDescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1370,6 +1307,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -1380,6 +1318,7 @@ namespace Google.Protobuf.Reflection { public const int NumberFieldNumber = 3; private int number_; + [pbr::ProtobufField(3, "number")] internal int Number { get { return number_; } set { @@ -1390,6 +1329,7 @@ namespace Google.Protobuf.Reflection { public const int LabelFieldNumber = 4; private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label label_ = global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL; + [pbr::ProtobufField(4, "label")] internal global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label Label { get { return label_; } set { @@ -1400,6 +1340,7 @@ namespace Google.Protobuf.Reflection { public const int TypeFieldNumber = 5; private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type type_ = global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type.TYPE_DOUBLE; + [pbr::ProtobufField(5, "type")] internal global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type Type { get { return type_; } set { @@ -1410,6 +1351,7 @@ namespace Google.Protobuf.Reflection { public const int TypeNameFieldNumber = 6; private string typeName_ = ""; + [pbr::ProtobufField(6, "type_name")] internal string TypeName { get { return typeName_; } set { @@ -1420,6 +1362,7 @@ namespace Google.Protobuf.Reflection { public const int ExtendeeFieldNumber = 2; private string extendee_ = ""; + [pbr::ProtobufField(2, "extendee")] internal string Extendee { get { return extendee_; } set { @@ -1430,6 +1373,7 @@ namespace Google.Protobuf.Reflection { public const int DefaultValueFieldNumber = 7; private string defaultValue_ = ""; + [pbr::ProtobufField(7, "default_value")] internal string DefaultValue { get { return defaultValue_; } set { @@ -1440,6 +1384,7 @@ namespace Google.Protobuf.Reflection { public const int OneofIndexFieldNumber = 9; private int oneofIndex_; + [pbr::ProtobufField(9, "oneof_index")] internal int OneofIndex { get { return oneofIndex_; } set { @@ -1450,6 +1395,7 @@ namespace Google.Protobuf.Reflection { public const int OptionsFieldNumber = 8; private global::Google.Protobuf.Reflection.FieldOptions options_; + [pbr::ProtobufField(8, "options")] internal global::Google.Protobuf.Reflection.FieldOptions Options { get { return options_; } set { @@ -1706,8 +1652,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[4]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_OneofDescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1736,6 +1682,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -1825,8 +1772,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[5]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_EnumDescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1859,6 +1806,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -1871,12 +1819,14 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.EnumValueDescriptorProto> _repeated_value_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.EnumValueDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumValueDescriptorProto> value_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumValueDescriptorProto>(); + [pbr::ProtobufField(2, "value")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumValueDescriptorProto> Value { get { return value_; } } public const int OptionsFieldNumber = 3; private global::Google.Protobuf.Reflection.EnumOptions options_; + [pbr::ProtobufField(3, "options")] internal global::Google.Protobuf.Reflection.EnumOptions Options { get { return options_; } set { @@ -1997,8 +1947,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[6]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_EnumValueDescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2030,6 +1980,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -2040,6 +1991,7 @@ namespace Google.Protobuf.Reflection { public const int NumberFieldNumber = 2; private int number_; + [pbr::ProtobufField(2, "number")] internal int Number { get { return number_; } set { @@ -2050,6 +2002,7 @@ namespace Google.Protobuf.Reflection { public const int OptionsFieldNumber = 3; private global::Google.Protobuf.Reflection.EnumValueOptions options_; + [pbr::ProtobufField(3, "options")] internal global::Google.Protobuf.Reflection.EnumValueOptions Options { get { return options_; } set { @@ -2177,8 +2130,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[7]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_ServiceDescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2211,6 +2164,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -2223,12 +2177,14 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.MethodDescriptorProto> _repeated_method_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.MethodDescriptorProto.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.MethodDescriptorProto> method_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.MethodDescriptorProto>(); + [pbr::ProtobufField(2, "method")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.MethodDescriptorProto> Method { get { return method_; } } public const int OptionsFieldNumber = 3; private global::Google.Protobuf.Reflection.ServiceOptions options_; + [pbr::ProtobufField(3, "options")] internal global::Google.Protobuf.Reflection.ServiceOptions Options { get { return options_; } set { @@ -2349,8 +2305,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[8]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_MethodDescriptorProto__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2385,6 +2341,7 @@ namespace Google.Protobuf.Reflection { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] internal string Name { get { return name_; } set { @@ -2395,6 +2352,7 @@ namespace Google.Protobuf.Reflection { public const int InputTypeFieldNumber = 2; private string inputType_ = ""; + [pbr::ProtobufField(2, "input_type")] internal string InputType { get { return inputType_; } set { @@ -2405,6 +2363,7 @@ namespace Google.Protobuf.Reflection { public const int OutputTypeFieldNumber = 3; private string outputType_ = ""; + [pbr::ProtobufField(3, "output_type")] internal string OutputType { get { return outputType_; } set { @@ -2415,6 +2374,7 @@ namespace Google.Protobuf.Reflection { public const int OptionsFieldNumber = 4; private global::Google.Protobuf.Reflection.MethodOptions options_; + [pbr::ProtobufField(4, "options")] internal global::Google.Protobuf.Reflection.MethodOptions Options { get { return options_; } set { @@ -2425,6 +2385,7 @@ namespace Google.Protobuf.Reflection { public const int ClientStreamingFieldNumber = 5; private bool clientStreaming_; + [pbr::ProtobufField(5, "client_streaming")] internal bool ClientStreaming { get { return clientStreaming_; } set { @@ -2435,6 +2396,7 @@ namespace Google.Protobuf.Reflection { public const int ServerStreamingFieldNumber = 6; private bool serverStreaming_; + [pbr::ProtobufField(6, "server_streaming")] internal bool ServerStreaming { get { return serverStreaming_; } set { @@ -2610,8 +2572,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[9]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_FileOptions__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -2655,6 +2617,7 @@ namespace Google.Protobuf.Reflection { public const int JavaPackageFieldNumber = 1; private string javaPackage_ = ""; + [pbr::ProtobufField(1, "java_package")] internal string JavaPackage { get { return javaPackage_; } set { @@ -2665,6 +2628,7 @@ namespace Google.Protobuf.Reflection { public const int JavaOuterClassnameFieldNumber = 8; private string javaOuterClassname_ = ""; + [pbr::ProtobufField(8, "java_outer_classname")] internal string JavaOuterClassname { get { return javaOuterClassname_; } set { @@ -2675,6 +2639,7 @@ namespace Google.Protobuf.Reflection { public const int JavaMultipleFilesFieldNumber = 10; private bool javaMultipleFiles_; + [pbr::ProtobufField(10, "java_multiple_files")] internal bool JavaMultipleFiles { get { return javaMultipleFiles_; } set { @@ -2685,6 +2650,7 @@ namespace Google.Protobuf.Reflection { public const int JavaGenerateEqualsAndHashFieldNumber = 20; private bool javaGenerateEqualsAndHash_; + [pbr::ProtobufField(20, "java_generate_equals_and_hash")] internal bool JavaGenerateEqualsAndHash { get { return javaGenerateEqualsAndHash_; } set { @@ -2695,6 +2661,7 @@ namespace Google.Protobuf.Reflection { public const int JavaStringCheckUtf8FieldNumber = 27; private bool javaStringCheckUtf8_; + [pbr::ProtobufField(27, "java_string_check_utf8")] internal bool JavaStringCheckUtf8 { get { return javaStringCheckUtf8_; } set { @@ -2705,6 +2672,7 @@ namespace Google.Protobuf.Reflection { public const int OptimizeForFieldNumber = 9; private global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode optimizeFor_ = global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode.SPEED; + [pbr::ProtobufField(9, "optimize_for")] internal global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode OptimizeFor { get { return optimizeFor_; } set { @@ -2715,6 +2683,7 @@ namespace Google.Protobuf.Reflection { public const int GoPackageFieldNumber = 11; private string goPackage_ = ""; + [pbr::ProtobufField(11, "go_package")] internal string GoPackage { get { return goPackage_; } set { @@ -2725,6 +2694,7 @@ namespace Google.Protobuf.Reflection { public const int CcGenericServicesFieldNumber = 16; private bool ccGenericServices_; + [pbr::ProtobufField(16, "cc_generic_services")] internal bool CcGenericServices { get { return ccGenericServices_; } set { @@ -2735,6 +2705,7 @@ namespace Google.Protobuf.Reflection { public const int JavaGenericServicesFieldNumber = 17; private bool javaGenericServices_; + [pbr::ProtobufField(17, "java_generic_services")] internal bool JavaGenericServices { get { return javaGenericServices_; } set { @@ -2745,6 +2716,7 @@ namespace Google.Protobuf.Reflection { public const int PyGenericServicesFieldNumber = 18; private bool pyGenericServices_; + [pbr::ProtobufField(18, "py_generic_services")] internal bool PyGenericServices { get { return pyGenericServices_; } set { @@ -2755,6 +2727,7 @@ namespace Google.Protobuf.Reflection { public const int DeprecatedFieldNumber = 23; private bool deprecated_; + [pbr::ProtobufField(23, "deprecated")] internal bool Deprecated { get { return deprecated_; } set { @@ -2765,6 +2738,7 @@ namespace Google.Protobuf.Reflection { public const int CcEnableArenasFieldNumber = 31; private bool ccEnableArenas_; + [pbr::ProtobufField(31, "cc_enable_arenas")] internal bool CcEnableArenas { get { return ccEnableArenas_; } set { @@ -2775,6 +2749,7 @@ namespace Google.Protobuf.Reflection { public const int ObjcClassPrefixFieldNumber = 36; private string objcClassPrefix_ = ""; + [pbr::ProtobufField(36, "objc_class_prefix")] internal string ObjcClassPrefix { get { return objcClassPrefix_; } set { @@ -2785,6 +2760,7 @@ namespace Google.Protobuf.Reflection { public const int CsharpNamespaceFieldNumber = 37; private string csharpNamespace_ = ""; + [pbr::ProtobufField(37, "csharp_namespace")] internal string CsharpNamespace { get { return csharpNamespace_; } set { @@ -2797,6 +2773,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); + [pbr::ProtobufField(999, "uninterpreted_option")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { get { return uninterpretedOption_; } } @@ -3111,8 +3088,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[10]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_MessageOptions__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3146,6 +3123,7 @@ namespace Google.Protobuf.Reflection { public const int MessageSetWireFormatFieldNumber = 1; private bool messageSetWireFormat_; + [pbr::ProtobufField(1, "message_set_wire_format")] internal bool MessageSetWireFormat { get { return messageSetWireFormat_; } set { @@ -3156,6 +3134,7 @@ namespace Google.Protobuf.Reflection { public const int NoStandardDescriptorAccessorFieldNumber = 2; private bool noStandardDescriptorAccessor_; + [pbr::ProtobufField(2, "no_standard_descriptor_accessor")] internal bool NoStandardDescriptorAccessor { get { return noStandardDescriptorAccessor_; } set { @@ -3166,6 +3145,7 @@ namespace Google.Protobuf.Reflection { public const int DeprecatedFieldNumber = 3; private bool deprecated_; + [pbr::ProtobufField(3, "deprecated")] internal bool Deprecated { get { return deprecated_; } set { @@ -3176,6 +3156,7 @@ namespace Google.Protobuf.Reflection { public const int MapEntryFieldNumber = 7; private bool mapEntry_; + [pbr::ProtobufField(7, "map_entry")] internal bool MapEntry { get { return mapEntry_; } set { @@ -3188,6 +3169,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); + [pbr::ProtobufField(999, "uninterpreted_option")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { get { return uninterpretedOption_; } } @@ -3330,8 +3312,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[11]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_FieldOptions__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3367,6 +3349,7 @@ namespace Google.Protobuf.Reflection { public const int CtypeFieldNumber = 1; private global::Google.Protobuf.Reflection.FieldOptions.Types.CType ctype_ = global::Google.Protobuf.Reflection.FieldOptions.Types.CType.STRING; + [pbr::ProtobufField(1, "ctype")] internal global::Google.Protobuf.Reflection.FieldOptions.Types.CType Ctype { get { return ctype_; } set { @@ -3377,6 +3360,7 @@ namespace Google.Protobuf.Reflection { public const int PackedFieldNumber = 2; private bool packed_; + [pbr::ProtobufField(2, "packed")] internal bool Packed { get { return packed_; } set { @@ -3387,6 +3371,7 @@ namespace Google.Protobuf.Reflection { public const int JstypeFieldNumber = 6; private global::Google.Protobuf.Reflection.FieldOptions.Types.JSType jstype_ = global::Google.Protobuf.Reflection.FieldOptions.Types.JSType.JS_NORMAL; + [pbr::ProtobufField(6, "jstype")] internal global::Google.Protobuf.Reflection.FieldOptions.Types.JSType Jstype { get { return jstype_; } set { @@ -3397,6 +3382,7 @@ namespace Google.Protobuf.Reflection { public const int LazyFieldNumber = 5; private bool lazy_; + [pbr::ProtobufField(5, "lazy")] internal bool Lazy { get { return lazy_; } set { @@ -3407,6 +3393,7 @@ namespace Google.Protobuf.Reflection { public const int DeprecatedFieldNumber = 3; private bool deprecated_; + [pbr::ProtobufField(3, "deprecated")] internal bool Deprecated { get { return deprecated_; } set { @@ -3417,6 +3404,7 @@ namespace Google.Protobuf.Reflection { public const int WeakFieldNumber = 10; private bool weak_; + [pbr::ProtobufField(10, "weak")] internal bool Weak { get { return weak_; } set { @@ -3429,6 +3417,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); + [pbr::ProtobufField(999, "uninterpreted_option")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { get { return uninterpretedOption_; } } @@ -3621,8 +3610,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[12]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_EnumOptions__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3654,6 +3643,7 @@ namespace Google.Protobuf.Reflection { public const int AllowAliasFieldNumber = 2; private bool allowAlias_; + [pbr::ProtobufField(2, "allow_alias")] internal bool AllowAlias { get { return allowAlias_; } set { @@ -3664,6 +3654,7 @@ namespace Google.Protobuf.Reflection { public const int DeprecatedFieldNumber = 3; private bool deprecated_; + [pbr::ProtobufField(3, "deprecated")] internal bool Deprecated { get { return deprecated_; } set { @@ -3676,6 +3667,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); + [pbr::ProtobufField(999, "uninterpreted_option")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { get { return uninterpretedOption_; } } @@ -3786,8 +3778,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[13]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_EnumValueOptions__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3818,6 +3810,7 @@ namespace Google.Protobuf.Reflection { public const int DeprecatedFieldNumber = 1; private bool deprecated_; + [pbr::ProtobufField(1, "deprecated")] internal bool Deprecated { get { return deprecated_; } set { @@ -3830,6 +3823,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); + [pbr::ProtobufField(999, "uninterpreted_option")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { get { return uninterpretedOption_; } } @@ -3924,8 +3918,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[14]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_ServiceOptions__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -3956,6 +3950,7 @@ namespace Google.Protobuf.Reflection { public const int DeprecatedFieldNumber = 33; private bool deprecated_; + [pbr::ProtobufField(33, "deprecated")] internal bool Deprecated { get { return deprecated_; } set { @@ -3968,6 +3963,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); + [pbr::ProtobufField(999, "uninterpreted_option")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { get { return uninterpretedOption_; } } @@ -4062,8 +4058,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[15]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_MethodOptions__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4094,6 +4090,7 @@ namespace Google.Protobuf.Reflection { public const int DeprecatedFieldNumber = 33; private bool deprecated_; + [pbr::ProtobufField(33, "deprecated")] internal bool Deprecated { get { return deprecated_; } set { @@ -4106,6 +4103,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); + [pbr::ProtobufField(999, "uninterpreted_option")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { get { return uninterpretedOption_; } } @@ -4200,8 +4198,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[16]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_UninterpretedOption__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4239,12 +4237,14 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart> _repeated_name_codec = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart> name_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart>(); + [pbr::ProtobufField(2, "name")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart> Name { get { return name_; } } public const int IdentifierValueFieldNumber = 3; private string identifierValue_ = ""; + [pbr::ProtobufField(3, "identifier_value")] internal string IdentifierValue { get { return identifierValue_; } set { @@ -4255,6 +4255,7 @@ namespace Google.Protobuf.Reflection { public const int PositiveIntValueFieldNumber = 4; private ulong positiveIntValue_; + [pbr::ProtobufField(4, "positive_int_value")] internal ulong PositiveIntValue { get { return positiveIntValue_; } set { @@ -4265,6 +4266,7 @@ namespace Google.Protobuf.Reflection { public const int NegativeIntValueFieldNumber = 5; private long negativeIntValue_; + [pbr::ProtobufField(5, "negative_int_value")] internal long NegativeIntValue { get { return negativeIntValue_; } set { @@ -4275,6 +4277,7 @@ namespace Google.Protobuf.Reflection { public const int DoubleValueFieldNumber = 6; private double doubleValue_; + [pbr::ProtobufField(6, "double_value")] internal double DoubleValue { get { return doubleValue_; } set { @@ -4285,6 +4288,7 @@ namespace Google.Protobuf.Reflection { public const int StringValueFieldNumber = 7; private pb::ByteString stringValue_ = pb::ByteString.Empty; + [pbr::ProtobufField(7, "string_value")] internal pb::ByteString StringValue { get { return stringValue_; } set { @@ -4295,6 +4299,7 @@ namespace Google.Protobuf.Reflection { public const int AggregateValueFieldNumber = 8; private string aggregateValue_ = ""; + [pbr::ProtobufField(8, "aggregate_value")] internal string AggregateValue { get { return aggregateValue_; } set { @@ -4474,8 +4479,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.UninterpretedOption.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_UninterpretedOption_NamePart__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4505,6 +4510,7 @@ namespace Google.Protobuf.Reflection { public const int NamePart_FieldNumber = 1; private string namePart_ = ""; + [pbr::ProtobufField(1, "name_part")] internal string NamePart_ { get { return namePart_; } set { @@ -4515,6 +4521,7 @@ namespace Google.Protobuf.Reflection { public const int IsExtensionFieldNumber = 2; private bool isExtension_; + [pbr::ProtobufField(2, "is_extension")] internal bool IsExtension { get { return isExtension_; } set { @@ -4625,8 +4632,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.Descriptor.MessageTypes[17]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_SourceCodeInfo__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4658,6 +4665,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location> _repeated_location_codec = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location> location_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location>(); + [pbr::ProtobufField(1, "location")] internal pbc::RepeatedField<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location> Location { get { return location_; } } @@ -4737,8 +4745,8 @@ namespace Google.Protobuf.Reflection { get { return global::Google.Protobuf.Reflection.SourceCodeInfo.Descriptor.NestedTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.Reflection.DescriptorProtoFile.internal__static_google_protobuf_SourceCodeInfo_Location__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -4776,6 +4784,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<int> _repeated_path_codec = pb::FieldCodec.ForInt32(10); private readonly pbc::RepeatedField<int> path_ = new pbc::RepeatedField<int>(); + [pbr::ProtobufField(1, "path")] internal pbc::RepeatedField<int> Path { get { return path_; } } @@ -4784,12 +4793,14 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<int> _repeated_span_codec = pb::FieldCodec.ForInt32(18); private readonly pbc::RepeatedField<int> span_ = new pbc::RepeatedField<int>(); + [pbr::ProtobufField(2, "span")] internal pbc::RepeatedField<int> Span { get { return span_; } } public const int LeadingCommentsFieldNumber = 3; private string leadingComments_ = ""; + [pbr::ProtobufField(3, "leading_comments")] internal string LeadingComments { get { return leadingComments_; } set { @@ -4800,6 +4811,7 @@ namespace Google.Protobuf.Reflection { public const int TrailingCommentsFieldNumber = 4; private string trailingComments_ = ""; + [pbr::ProtobufField(4, "trailing_comments")] internal string TrailingComments { get { return trailingComments_; } set { @@ -4812,6 +4824,7 @@ namespace Google.Protobuf.Reflection { private static readonly pb::FieldCodec<string> _repeated_leadingDetachedComments_codec = pb::FieldCodec.ForString(50); private readonly pbc::RepeatedField<string> leadingDetachedComments_ = new pbc::RepeatedField<string>(); + [pbr::ProtobufField(6, "leading_detached_comments")] internal pbc::RepeatedField<string> LeadingDetachedComments { get { return leadingDetachedComments_; } } diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs index 64d52ac5..41fd892b 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs @@ -14,9 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Any { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Any__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -31,11 +28,8 @@ namespace Google.Protobuf.WellKnownTypes { "bS5nb29nbGUucHJvdG9idWZCCEFueVByb3RvUAGgAQGiAgNHUEKqAh5Hb29n", "bGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_Any__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Any), descriptor.MessageTypes[0], - new string[] { "TypeUrl", "Value", }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Any), }); } #endregion @@ -53,8 +47,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Any.internal__static_google_protobuf_Any__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -84,6 +78,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int TypeUrlFieldNumber = 1; private string typeUrl_ = ""; + [pbr::ProtobufField(1, "type_url")] public string TypeUrl { get { return typeUrl_; } set { @@ -94,6 +89,7 @@ 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 1e2506a4..65f6d9b5 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs @@ -14,10 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Api { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Api__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Method__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -41,16 +37,8 @@ namespace Google.Protobuf.WellKnownTypes { "dG9QAaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IG", "cHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, - global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor, - }); - internal__static_google_protobuf_Api__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Api), descriptor.MessageTypes[0], - new string[] { "Name", "Methods", "Options", "Version", "SourceContext", }, new string[] { }); - internal__static_google_protobuf_Method__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Method), descriptor.MessageTypes[1], - new string[] { "Name", "RequestTypeUrl", "RequestStreaming", "ResponseTypeUrl", "ResponseStreaming", "Options", }, new string[] { }); + 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), }); } #endregion @@ -68,8 +56,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Api.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Api.internal__static_google_protobuf_Api__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -105,6 +93,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -117,6 +106,7 @@ 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_; } } @@ -125,12 +115,14 @@ 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 { @@ -141,6 +133,7 @@ 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 { @@ -286,8 +279,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Api.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Api.internal__static_google_protobuf_Method__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -322,6 +315,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -332,6 +326,7 @@ 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 { @@ -342,6 +337,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int RequestStreamingFieldNumber = 3; private bool requestStreaming_; + [pbr::ProtobufField(3, "request_streaming")] public bool RequestStreaming { get { return requestStreaming_; } set { @@ -352,6 +348,7 @@ 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 { @@ -362,6 +359,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ResponseStreamingFieldNumber = 5; private bool responseStreaming_; + [pbr::ProtobufField(5, "response_streaming")] public bool ResponseStreaming { get { return responseStreaming_; } set { @@ -374,6 +372,7 @@ 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 fbc9c007..d00e8b74 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs @@ -14,9 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Duration { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Duration__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -32,11 +29,8 @@ namespace Google.Protobuf.WellKnownTypes { "AaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IGcHJv", "dG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_Duration__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Duration), descriptor.MessageTypes[0], - new string[] { "Seconds", "Nanos", }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Duration), }); } #endregion @@ -54,8 +48,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Duration.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Duration.internal__static_google_protobuf_Duration__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -85,6 +79,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int SecondsFieldNumber = 1; private long seconds_; + [pbr::ProtobufField(1, "seconds")] public long Seconds { get { return seconds_; } set { @@ -95,6 +90,7 @@ 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 c2681e29..eb7dd937 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs @@ -14,9 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Empty { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Empty__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -31,11 +28,8 @@ namespace Google.Protobuf.WellKnownTypes { "UAGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", "b3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_Empty__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Empty), descriptor.MessageTypes[0], - new string[] { }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Empty), }); } #endregion @@ -53,8 +47,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Empty.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Empty.internal__static_google_protobuf_Empty__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs index 310c0d21..16c961ed 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs @@ -14,9 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class FieldMask { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_FieldMask__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -31,11 +28,8 @@ namespace Google.Protobuf.WellKnownTypes { "Z2xlLnByb3RvYnVmQg5GaWVsZE1hc2tQcm90b1ABogIDR1BCqgIeR29vZ2xl", "LlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_FieldMask__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.FieldMask), descriptor.MessageTypes[0], - new string[] { "Paths", }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.FieldMask), }); } #endregion @@ -53,8 +47,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.FieldMask.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.FieldMask.internal__static_google_protobuf_FieldMask__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -86,6 +80,7 @@ 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 ee60fbe9..b94fe072 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs @@ -14,9 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class SourceContext { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_SourceContext__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -32,11 +29,8 @@ namespace Google.Protobuf.WellKnownTypes { "AaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IGcHJv", "dG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_SourceContext__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.SourceContext), descriptor.MessageTypes[0], - new string[] { "FileName", }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.SourceContext), }); } #endregion @@ -54,8 +48,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.internal__static_google_protobuf_SourceContext__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -84,6 +78,7 @@ 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 99f88a96..860a9925 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs @@ -14,11 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Struct { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Struct__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Value__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_ListValue__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -43,17 +38,8 @@ namespace Google.Protobuf.WellKnownTypes { "AQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", "b3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_Struct__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Struct), descriptor.MessageTypes[0], - new string[] { "Fields", }, new string[] { }); - internal__static_google_protobuf_Value__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Value), descriptor.MessageTypes[1], - new string[] { "NullValue", "NumberValue", "StringValue", "BoolValue", "StructValue", "ListValue", }, new string[] { "Kind", }); - internal__static_google_protobuf_ListValue__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.ListValue), descriptor.MessageTypes[2], - new string[] { "Values", }, new string[] { }); + 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), }); } #endregion @@ -78,8 +64,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.internal__static_google_protobuf_Struct__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -111,6 +97,7 @@ 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_; } } @@ -189,8 +176,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.internal__static_google_protobuf_Value__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -239,6 +226,7 @@ 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 { @@ -249,6 +237,7 @@ 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 { @@ -259,6 +248,7 @@ 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 { @@ -269,6 +259,7 @@ 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 { @@ -279,6 +270,7 @@ 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 { @@ -289,6 +281,7 @@ 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 { @@ -309,10 +302,12 @@ namespace Google.Protobuf.WellKnownTypes { ListValue = 6, } private KindOneofCase kindCase_ = KindOneofCase.None; + [pbr::ProtobufOneof("kind")] public KindOneofCase KindCase { get { return kindCase_; } } + [pbr::ProtobufOneof("kind")] public void ClearKind() { pb::Freezable.CheckMutable(this); kindCase_ = KindOneofCase.None; @@ -494,8 +489,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.internal__static_google_protobuf_ListValue__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -527,6 +522,7 @@ 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 e3bb3c37..bfc2f37a 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs @@ -14,9 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Timestamp { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Timestamp__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -32,11 +29,8 @@ namespace Google.Protobuf.WellKnownTypes { "AaABAaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IG", "cHJvdG8z")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_Timestamp__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Timestamp), descriptor.MessageTypes[0], - new string[] { "Seconds", "Nanos", }, new string[] { }); + new pbr::FileDescriptor[] { }, + new global::System.Type[] { typeof(global::Google.Protobuf.WellKnownTypes.Timestamp), }); } #endregion @@ -54,8 +48,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Timestamp.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Timestamp.internal__static_google_protobuf_Timestamp__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -85,6 +79,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int SecondsFieldNumber = 1; private long seconds_; + [pbr::ProtobufField(1, "seconds")] public long Seconds { get { return seconds_; } set { @@ -95,6 +90,7 @@ 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 dbc1ee0d..53b8f6be 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs @@ -14,13 +14,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Type { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Type__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Field__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Enum__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_EnumValue__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Option__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -62,25 +55,8 @@ namespace Google.Protobuf.WellKnownTypes { "UAGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", "b3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor, - global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, - }); - internal__static_google_protobuf_Type__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Type), descriptor.MessageTypes[0], - new string[] { "Name", "Fields", "Oneofs", "Options", "SourceContext", }, new string[] { }); - internal__static_google_protobuf_Field__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Field), descriptor.MessageTypes[1], - new string[] { "Kind", "Cardinality", "Number", "Name", "TypeUrl", "OneofIndex", "Packed", "Options", }, new string[] { }); - internal__static_google_protobuf_Enum__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Enum), descriptor.MessageTypes[2], - new string[] { "Name", "Enumvalue", "Options", "SourceContext", }, new string[] { }); - internal__static_google_protobuf_EnumValue__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.EnumValue), descriptor.MessageTypes[3], - new string[] { "Name", "Number", "Options", }, new string[] { }); - internal__static_google_protobuf_Option__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Option), descriptor.MessageTypes[4], - new string[] { "Name", "Value", }, new string[] { }); + 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), }); } #endregion @@ -98,8 +74,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.internal__static_google_protobuf_Type__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -136,6 +112,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -148,6 +125,7 @@ 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_; } } @@ -156,6 +134,7 @@ 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_; } } @@ -164,12 +143,14 @@ 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 { @@ -308,8 +289,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.internal__static_google_protobuf_Field__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -346,6 +327,7 @@ 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 { @@ -356,6 +338,7 @@ 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 { @@ -366,6 +349,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NumberFieldNumber = 3; private int number_; + [pbr::ProtobufField(3, "number")] public int Number { get { return number_; } set { @@ -376,6 +360,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 4; private string name_ = ""; + [pbr::ProtobufField(4, "name")] public string Name { get { return name_; } set { @@ -386,6 +371,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int TypeUrlFieldNumber = 6; private string typeUrl_ = ""; + [pbr::ProtobufField(6, "type_url")] public string TypeUrl { get { return typeUrl_; } set { @@ -396,6 +382,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int OneofIndexFieldNumber = 7; private int oneofIndex_; + [pbr::ProtobufField(7, "oneof_index")] public int OneofIndex { get { return oneofIndex_; } set { @@ -406,6 +393,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int PackedFieldNumber = 8; private bool packed_; + [pbr::ProtobufField(8, "packed")] public bool Packed { get { return packed_; } set { @@ -418,6 +406,7 @@ 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_; } } @@ -642,8 +631,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.internal__static_google_protobuf_Enum__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -678,6 +667,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -690,6 +680,7 @@ 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_; } } @@ -698,12 +689,14 @@ 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 { @@ -833,8 +826,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[3]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.internal__static_google_protobuf_EnumValue__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -866,6 +859,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -876,6 +870,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NumberFieldNumber = 2; private int number_; + [pbr::ProtobufField(2, "number")] public int Number { get { return number_; } set { @@ -888,6 +883,7 @@ 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_; } } @@ -998,8 +994,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor.MessageTypes[4]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Proto.Type.internal__static_google_protobuf_Option__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1030,6 +1026,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int NameFieldNumber = 1; private string name_ = ""; + [pbr::ProtobufField(1, "name")] public string Name { get { return name_; } set { @@ -1040,6 +1037,7 @@ 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 c26f874d..d1b5497e 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs @@ -12,17 +12,6 @@ namespace Google.Protobuf.WellKnownTypes { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public static partial class Wrappers { - #region Static variables - internal static pbr::FieldAccessorTable internal__static_google_protobuf_DoubleValue__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_FloatValue__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Int64Value__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_UInt64Value__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_Int32Value__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_UInt32Value__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_BoolValue__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_StringValue__FieldAccessorTable; - internal static pbr::FieldAccessorTable internal__static_google_protobuf_BytesValue__FieldAccessorTable; - #endregion #region Descriptor public static pbr::FileDescriptor Descriptor { get { return descriptor; } @@ -42,35 +31,8 @@ namespace Google.Protobuf.WellKnownTypes { "ChNjb20uZ29vZ2xlLnByb3RvYnVmQg1XcmFwcGVyc1Byb3RvUAGiAgNHUEKq", "Ah5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbr::FileDescriptor[] { - }); - internal__static_google_protobuf_DoubleValue__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.DoubleValue), descriptor.MessageTypes[0], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_FloatValue__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.FloatValue), descriptor.MessageTypes[1], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_Int64Value__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Int64Value), descriptor.MessageTypes[2], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_UInt64Value__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.UInt64Value), descriptor.MessageTypes[3], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_Int32Value__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Int32Value), descriptor.MessageTypes[4], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_UInt32Value__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.UInt32Value), descriptor.MessageTypes[5], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_BoolValue__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.BoolValue), descriptor.MessageTypes[6], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_StringValue__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.StringValue), descriptor.MessageTypes[7], - new string[] { "Value", }, new string[] { }); - internal__static_google_protobuf_BytesValue__FieldAccessorTable = - new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.BytesValue), descriptor.MessageTypes[8], - new string[] { "Value", }, new string[] { }); + 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), }); } #endregion @@ -87,8 +49,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[0]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_DoubleValue__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -117,6 +79,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private double value_; + [pbr::ProtobufField(1, "value")] public double Value { get { return value_; } set { @@ -206,8 +169,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[1]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_FloatValue__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -236,6 +199,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private float value_; + [pbr::ProtobufField(1, "value")] public float Value { get { return value_; } set { @@ -325,8 +289,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[2]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_Int64Value__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -355,6 +319,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private long value_; + [pbr::ProtobufField(1, "value")] public long Value { get { return value_; } set { @@ -444,8 +409,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[3]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_UInt64Value__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -474,6 +439,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private ulong value_; + [pbr::ProtobufField(1, "value")] public ulong Value { get { return value_; } set { @@ -563,8 +529,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[4]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_Int32Value__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -593,6 +559,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private int value_; + [pbr::ProtobufField(1, "value")] public int Value { get { return value_; } set { @@ -682,8 +649,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[5]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_UInt32Value__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -712,6 +679,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private uint value_; + [pbr::ProtobufField(1, "value")] public uint Value { get { return value_; } set { @@ -801,8 +769,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[6]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_BoolValue__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -831,6 +799,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private bool value_; + [pbr::ProtobufField(1, "value")] public bool Value { get { return value_; } set { @@ -920,8 +889,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[7]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_StringValue__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -950,6 +919,7 @@ namespace Google.Protobuf.WellKnownTypes { public const int ValueFieldNumber = 1; private string value_ = ""; + [pbr::ProtobufField(1, "value")] public string Value { get { return value_; } set { @@ -1039,8 +1009,8 @@ namespace Google.Protobuf.WellKnownTypes { get { return global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor.MessageTypes[8]; } } - pbr::FieldAccessorTable pb::IReflectedMessage.Fields { - get { return global::Google.Protobuf.WellKnownTypes.Wrappers.internal__static_google_protobuf_BytesValue__FieldAccessorTable; } + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } } private bool _frozen = false; @@ -1069,6 +1039,7 @@ 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 { |