From 4a594cac938258c6fc5150a7b99530bed9df483e Mon Sep 17 00:00:00 2001 From: csharptest Date: Fri, 9 Sep 2011 15:53:10 -0500 Subject: Implemented [Obsolete] attribute for deprecated fields --- src/ProtocolBuffers.Test/DeprecatedMemberTest.cs | 102 +++ .../ProtocolBuffers.Test.csproj | 1 + .../TestProtos/UnitTestCSharpOptionsProtoFile.cs | 2 +- .../TestProtos/UnitTestCustomOptionsProtoFile.cs | 2 +- .../UnitTestEmbedOptimizeForProtoFile.cs | 2 +- .../TestProtos/UnitTestEmptyProtoFile.cs | 2 +- .../TestProtos/UnitTestExtrasIssuesProtoFile.cs | 830 ++++++++++++++++++++- .../TestProtos/UnitTestGenericServices.cs | 2 +- .../TestProtos/UnitTestGoogleSizeProtoFile.cs | 2 +- .../TestProtos/UnitTestGoogleSpeedProtoFile.cs | 2 +- .../TestProtos/UnitTestImportLiteProtoFile.cs | 2 +- .../TestProtos/UnitTestImportProtoFile.cs | 2 +- .../TestProtos/UnitTestMessageSetProtoFile.cs | 2 +- .../UnitTestNoGenericServicesProtoFile.cs | 2 +- .../TestProtos/UnitTestOptimizeForProtoFile.cs | 2 +- .../TestProtos/UnitTestProtoFile.cs | 8 +- .../TestProtos/UnitTestRpcInterop.cs | 2 +- .../UnitTestXmlSerializerTestProtoFile.cs | 2 +- 18 files changed, 950 insertions(+), 19 deletions(-) create mode 100644 src/ProtocolBuffers.Test/DeprecatedMemberTest.cs (limited to 'src/ProtocolBuffers.Test') diff --git a/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs b/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs new file mode 100644 index 00000000..44e7914f --- /dev/null +++ b/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Text; +using NUnit.Framework; +using UnitTest.Issues.TestProtos; + +namespace Google.ProtocolBuffers +{ + [TestFixture] + public class DeprecatedMemberTest + { + private static void AssertIsDeprecated(ICustomAttributeProvider member) + { + Assert.IsNotNull(member); + Assert.IsTrue(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member); + } + + [Test] + public void TestDepreatedPrimitiveValue() + { + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("HasPrimitiveValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("PrimitiveValue")); + + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("HasPrimitiveValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("PrimitiveValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearPrimitiveValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetPrimitiveValue")); + } + [Test] + public void TestDepreatedPrimitiveArray() + { + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("PrimitiveArrayList")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("PrimitiveArrayCount")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetMethod("GetPrimitiveArray")); + + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("PrimitiveArrayList")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("PrimitiveArrayCount")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("GetPrimitiveArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetPrimitiveArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddPrimitiveArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddRangePrimitiveArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearPrimitiveArray")); + } + [Test] + public void TestDepreatedMessageValue() + { + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("HasMessageValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("MessageValue")); + + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("HasMessageValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("MessageValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("MergeMessageValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearMessageValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetMessageValue", new[] { typeof(DeprecatedChild) })); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetMessageValue", new[] { typeof(DeprecatedChild.Builder) })); + } + [Test] + public void TestDepreatedMessageArray() + { + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("MessageArrayList")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("MessageArrayCount")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetMethod("GetMessageArray")); + + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("MessageArrayList")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("MessageArrayCount")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("GetMessageArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetMessageArray", new[] { typeof(int), typeof(DeprecatedChild) })); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetMessageArray", new[] { typeof(int), typeof(DeprecatedChild.Builder) })); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddMessageArray", new[] { typeof(DeprecatedChild) })); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddMessageArray", new[] { typeof(DeprecatedChild.Builder) })); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddRangeMessageArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearMessageArray")); + } + [Test] + public void TestDepreatedEnumValue() + { + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("HasEnumValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("EnumValue")); + + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("HasEnumValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("EnumValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearEnumValue")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetEnumValue")); + } + [Test] + public void TestDepreatedEnumArray() + { + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("EnumArrayList")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("EnumArrayCount")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetMethod("GetEnumArray")); + + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("EnumArrayList")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetProperty("EnumArrayCount")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("GetEnumArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetEnumArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddEnumArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddRangeEnumArray")); + AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearEnumArray")); + } + } +} diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 95ab0b9c..66fcccbf 100644 --- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -93,6 +93,7 @@ + diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs index ff726d65..01a536d7 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs index 0b1be422..9c8abc44 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs index 09ecdd63..c4e71a99 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs index eb6c6c74..6c5cf369 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs index db56e8b9..43ed54b7 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; @@ -26,6 +26,10 @@ namespace UnitTest.Issues.TestProtos { internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_AB__FieldAccessorTable; internal static pbd::MessageDescriptor internal__static_unittest_issues_NumberField__Descriptor; internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_NumberField__FieldAccessorTable; + internal static pbd::MessageDescriptor internal__static_unittest_issues_DeprecatedChild__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable; + internal static pbd::MessageDescriptor internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable; #endregion #region Descriptor public static pbd::FileDescriptor Descriptor { @@ -38,9 +42,17 @@ namespace UnitTest.Issues.TestProtos { "ChxleHRlc3QvdW5pdHRlc3RfaXNzdWVzLnByb3RvEg91bml0dGVzdF9pc3N1" + "ZXMaJGdvb2dsZS9wcm90b2J1Zi9jc2hhcnBfb3B0aW9ucy5wcm90byIPCgFB" + "EgoKAl9BGAEgASgFIg8KAUISCgoCQl8YASABKAUiEQoCQUISCwoDYV9iGAEg" + - "ASgFIhoKC051bWJlckZpZWxkEgsKA18wMRgBIAEoBUJASAHCPjsKGlVuaXRU" + - "ZXN0Lklzc3Vlcy5UZXN0UHJvdG9zEh1Vbml0VGVzdEV4dHJhc0lzc3Vlc1By" + - "b3RvRmlsZQ=="); + "ASgFIhoKC051bWJlckZpZWxkEgsKA18wMRgBIAEoBSIRCg9EZXByZWNhdGVk" + + "Q2hpbGQiuQIKF0RlcHJlY2F0ZWRGaWVsZHNNZXNzYWdlEhoKDlByaW1pdGl2" + + "ZVZhbHVlGAEgASgFQgIYARIaCg5QcmltaXRpdmVBcnJheRgCIAMoBUICGAES" + + "OgoMTWVzc2FnZVZhbHVlGAMgASgLMiAudW5pdHRlc3RfaXNzdWVzLkRlcHJl" + + "Y2F0ZWRDaGlsZEICGAESOgoMTWVzc2FnZUFycmF5GAQgAygLMiAudW5pdHRl" + + "c3RfaXNzdWVzLkRlcHJlY2F0ZWRDaGlsZEICGAESNgoJRW51bVZhbHVlGAUg" + + "ASgOMh8udW5pdHRlc3RfaXNzdWVzLkRlcHJlY2F0ZWRFbnVtQgIYARI2CglF" + + "bnVtQXJyYXkYBiADKA4yHy51bml0dGVzdF9pc3N1ZXMuRGVwcmVjYXRlZEVu" + + "dW1CAhgBKhkKDkRlcHJlY2F0ZWRFbnVtEgcKA29uZRABQkBIAcI+OwoaVW5p" + + "dFRlc3QuSXNzdWVzLlRlc3RQcm90b3MSHVVuaXRUZXN0RXh0cmFzSXNzdWVz" + + "UHJvdG9GaWxl"); pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { descriptor = root; internal__static_unittest_issues_A__Descriptor = Descriptor.MessageTypes[0]; @@ -59,6 +71,14 @@ namespace UnitTest.Issues.TestProtos { internal__static_unittest_issues_NumberField__FieldAccessorTable = new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_NumberField__Descriptor, new string[] { "_01", }); + internal__static_unittest_issues_DeprecatedChild__Descriptor = Descriptor.MessageTypes[4]; + internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_DeprecatedChild__Descriptor, + new string[] { }); + internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor = Descriptor.MessageTypes[5]; + internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor, + new string[] { "PrimitiveValue", "PrimitiveArray", "MessageValue", "MessageArray", "EnumValue", "EnumArray", }); pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); RegisterAllExtensions(registry); global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.RegisterAllExtensions(registry); @@ -72,6 +92,15 @@ namespace UnitTest.Issues.TestProtos { #endregion } + #region Enums + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")] + public enum DeprecatedEnum { + one = 1, + } + + #endregion + #region Messages [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -1033,6 +1062,799 @@ namespace UnitTest.Issues.TestProtos { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")] + public sealed partial class DeprecatedChild : pb::GeneratedMessage { + private static readonly DeprecatedChild defaultInstance = new Builder().BuildPartial(); + private static readonly string[] _deprecatedChildFieldNames = new string[] { }; + private static readonly uint[] _deprecatedChildFieldTags = new uint[] { }; + public static DeprecatedChild DefaultInstance { + get { return defaultInstance; } + } + + public override DeprecatedChild DefaultInstanceForType { + get { return defaultInstance; } + } + + protected override DeprecatedChild ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::UnitTest.Issues.TestProtos.UnitTestExtrasIssuesProtoFile.internal__static_unittest_issues_DeprecatedChild__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::UnitTest.Issues.TestProtos.UnitTestExtrasIssuesProtoFile.internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable; } + } + + public override bool IsInitialized { + get { + return true; + } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + int size = SerializedSize; + string[] field_names = _deprecatedChildFieldNames; + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + } + + public static DeprecatedChild ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static DeprecatedChild ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static DeprecatedChild ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static DeprecatedChild ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static DeprecatedChild ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static DeprecatedChild ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static DeprecatedChild ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static DeprecatedChild ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static DeprecatedChild ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static DeprecatedChild ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(DeprecatedChild prototype) { + return (Builder) new Builder().MergeFrom(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() {} + + DeprecatedChild result = new DeprecatedChild(); + + protected override DeprecatedChild MessageBeingBuilt { + get { return result; } + } + + public override Builder Clear() { + result = new DeprecatedChild(); + return this; + } + + public override Builder Clone() { + return new Builder().MergeFrom(result); + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::UnitTest.Issues.TestProtos.DeprecatedChild.Descriptor; } + } + + public override DeprecatedChild DefaultInstanceForType { + get { return global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance; } + } + + public override DeprecatedChild BuildPartial() { + if (result == null) { + throw new global::System.InvalidOperationException("build() has already been called on this Builder"); + } + DeprecatedChild returnMe = result; + result = null; + return returnMe; + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is DeprecatedChild) { + return MergeFrom((DeprecatedChild) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(DeprecatedChild other) { + if (other == global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance) return this; + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_deprecatedChildFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _deprecatedChildFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + } + static DeprecatedChild() { + object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnitTestExtrasIssuesProtoFile.Descriptor, null); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")] + public sealed partial class DeprecatedFieldsMessage : pb::GeneratedMessage { + private static readonly DeprecatedFieldsMessage defaultInstance = new Builder().BuildPartial(); + private static readonly string[] _deprecatedFieldsMessageFieldNames = new string[] { "EnumArray", "EnumValue", "MessageArray", "MessageValue", "PrimitiveArray", "PrimitiveValue" }; + private static readonly uint[] _deprecatedFieldsMessageFieldTags = new uint[] { 48, 40, 34, 26, 16, 8 }; + public static DeprecatedFieldsMessage DefaultInstance { + get { return defaultInstance; } + } + + public override DeprecatedFieldsMessage DefaultInstanceForType { + get { return defaultInstance; } + } + + protected override DeprecatedFieldsMessage ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::UnitTest.Issues.TestProtos.UnitTestExtrasIssuesProtoFile.internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::UnitTest.Issues.TestProtos.UnitTestExtrasIssuesProtoFile.internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable; } + } + + public const int PrimitiveValueFieldNumber = 1; + private bool hasPrimitiveValue; + private int primitiveValue_; + [global::System.ObsoleteAttribute()] + public bool HasPrimitiveValue { + get { return hasPrimitiveValue; } + } + [global::System.ObsoleteAttribute()] + public int PrimitiveValue { + get { return primitiveValue_; } + } + + public const int PrimitiveArrayFieldNumber = 2; + private pbc::PopsicleList primitiveArray_ = new pbc::PopsicleList(); + [global::System.ObsoleteAttribute()] + public scg::IList PrimitiveArrayList { + get { return pbc::Lists.AsReadOnly(primitiveArray_); } + } + [global::System.ObsoleteAttribute()] + public int PrimitiveArrayCount { + get { return primitiveArray_.Count; } + } + [global::System.ObsoleteAttribute()] + public int GetPrimitiveArray(int index) { + return primitiveArray_[index]; + } + + public const int MessageValueFieldNumber = 3; + private bool hasMessageValue; + private global::UnitTest.Issues.TestProtos.DeprecatedChild messageValue_ = global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance; + [global::System.ObsoleteAttribute()] + public bool HasMessageValue { + get { return hasMessageValue; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedChild MessageValue { + get { return messageValue_; } + } + + public const int MessageArrayFieldNumber = 4; + private pbc::PopsicleList messageArray_ = new pbc::PopsicleList(); + [global::System.ObsoleteAttribute()] + public scg::IList MessageArrayList { + get { return messageArray_; } + } + [global::System.ObsoleteAttribute()] + public int MessageArrayCount { + get { return messageArray_.Count; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedChild GetMessageArray(int index) { + return messageArray_[index]; + } + + public const int EnumValueFieldNumber = 5; + private bool hasEnumValue; + private global::UnitTest.Issues.TestProtos.DeprecatedEnum enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.one; + [global::System.ObsoleteAttribute()] + public bool HasEnumValue { + get { return hasEnumValue; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue { + get { return enumValue_; } + } + + public const int EnumArrayFieldNumber = 6; + private pbc::PopsicleList enumArray_ = new pbc::PopsicleList(); + [global::System.ObsoleteAttribute()] + public scg::IList EnumArrayList { + get { return pbc::Lists.AsReadOnly(enumArray_); } + } + [global::System.ObsoleteAttribute()] + public int EnumArrayCount { + get { return enumArray_.Count; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedEnum GetEnumArray(int index) { + return enumArray_[index]; + } + + public override bool IsInitialized { + get { + return true; + } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + int size = SerializedSize; + string[] field_names = _deprecatedFieldsMessageFieldNames; + if (hasPrimitiveValue) { + output.WriteInt32(1, field_names[5], PrimitiveValue); + } + if (primitiveArray_.Count > 0) { + output.WriteInt32Array(2, field_names[4], primitiveArray_); + } + if (hasMessageValue) { + output.WriteMessage(3, field_names[3], MessageValue); + } + if (messageArray_.Count > 0) { + output.WriteMessageArray(4, field_names[2], messageArray_); + } + if (hasEnumValue) { + output.WriteEnum(5, field_names[1], (int) EnumValue, EnumValue); + } + if (enumArray_.Count > 0) { + output.WriteEnumArray(6, field_names[0], enumArray_); + } + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (hasPrimitiveValue) { + size += pb::CodedOutputStream.ComputeInt32Size(1, PrimitiveValue); + } + { + int dataSize = 0; + foreach (int element in PrimitiveArrayList) { + dataSize += pb::CodedOutputStream.ComputeInt32SizeNoTag(element); + } + size += dataSize; + size += 1 * primitiveArray_.Count; + } + if (hasMessageValue) { + size += pb::CodedOutputStream.ComputeMessageSize(3, MessageValue); + } + foreach (global::UnitTest.Issues.TestProtos.DeprecatedChild element in MessageArrayList) { + size += pb::CodedOutputStream.ComputeMessageSize(4, element); + } + if (hasEnumValue) { + size += pb::CodedOutputStream.ComputeEnumSize(5, (int) EnumValue); + } + { + int dataSize = 0; + if (enumArray_.Count > 0) { + foreach (global::UnitTest.Issues.TestProtos.DeprecatedEnum element in enumArray_) { + dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); + } + size += dataSize; + size += 1 * enumArray_.Count; + } + } + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + } + + public static DeprecatedFieldsMessage ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static DeprecatedFieldsMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(DeprecatedFieldsMessage prototype) { + return (Builder) new Builder().MergeFrom(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() {} + + DeprecatedFieldsMessage result = new DeprecatedFieldsMessage(); + + protected override DeprecatedFieldsMessage MessageBeingBuilt { + get { return result; } + } + + public override Builder Clear() { + result = new DeprecatedFieldsMessage(); + return this; + } + + public override Builder Clone() { + return new Builder().MergeFrom(result); + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage.Descriptor; } + } + + public override DeprecatedFieldsMessage DefaultInstanceForType { + get { return global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage.DefaultInstance; } + } + + public override DeprecatedFieldsMessage BuildPartial() { + if (result == null) { + throw new global::System.InvalidOperationException("build() has already been called on this Builder"); + } + result.primitiveArray_.MakeReadOnly(); + result.messageArray_.MakeReadOnly(); + result.enumArray_.MakeReadOnly(); + DeprecatedFieldsMessage returnMe = result; + result = null; + return returnMe; + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is DeprecatedFieldsMessage) { + return MergeFrom((DeprecatedFieldsMessage) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(DeprecatedFieldsMessage other) { + if (other == global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage.DefaultInstance) return this; + if (other.HasPrimitiveValue) { + PrimitiveValue = other.PrimitiveValue; + } + if (other.primitiveArray_.Count != 0) { + base.AddRange(other.primitiveArray_, result.primitiveArray_); + } + if (other.HasMessageValue) { + MergeMessageValue(other.MessageValue); + } + if (other.messageArray_.Count != 0) { + base.AddRange(other.messageArray_, result.messageArray_); + } + if (other.HasEnumValue) { + EnumValue = other.EnumValue; + } + if (other.enumArray_.Count != 0) { + base.AddRange(other.enumArray_, result.enumArray_); + } + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_deprecatedFieldsMessageFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _deprecatedFieldsMessageFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + case 8: { + result.hasPrimitiveValue = input.ReadInt32(ref result.primitiveValue_); + break; + } + case 18: + case 16: { + input.ReadInt32Array(tag, field_name, result.primitiveArray_); + break; + } + case 26: { + global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder subBuilder = global::UnitTest.Issues.TestProtos.DeprecatedChild.CreateBuilder(); + if (result.hasMessageValue) { + subBuilder.MergeFrom(MessageValue); + } + input.ReadMessage(subBuilder, extensionRegistry); + MessageValue = subBuilder.BuildPartial(); + break; + } + case 34: { + input.ReadMessageArray(tag, field_name, result.messageArray_, global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance, extensionRegistry); + break; + } + case 40: { + object unknown; + if(input.ReadEnum(ref result.enumValue_, out unknown)) { + result.hasEnumValue = true; + } else if(unknown is int) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + unknownFields.MergeVarintField(5, (ulong)(int)unknown); + } + break; + } + case 50: + case 48: { + scg::ICollection unknownItems; + input.ReadEnumArray(tag, field_name, result.enumArray_, out unknownItems); + if (unknownItems != null) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + foreach (object rawValue in unknownItems) + if (rawValue is int) + unknownFields.MergeVarintField(6, (ulong)(int)rawValue); + } + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + + [global::System.ObsoleteAttribute()] + public bool HasPrimitiveValue { + get { return result.hasPrimitiveValue; } + } + [global::System.ObsoleteAttribute()] + public int PrimitiveValue { + get { return result.PrimitiveValue; } + set { SetPrimitiveValue(value); } + } + [global::System.ObsoleteAttribute()] + public Builder SetPrimitiveValue(int value) { + result.hasPrimitiveValue = true; + result.primitiveValue_ = value; + return this; + } + [global::System.ObsoleteAttribute()] + public Builder ClearPrimitiveValue() { + result.hasPrimitiveValue = false; + result.primitiveValue_ = 0; + return this; + } + + [global::System.ObsoleteAttribute()] + public pbc::IPopsicleList PrimitiveArrayList { + get { return result.primitiveArray_; } + } + [global::System.ObsoleteAttribute()] + public int PrimitiveArrayCount { + get { return result.PrimitiveArrayCount; } + } + [global::System.ObsoleteAttribute()] + public int GetPrimitiveArray(int index) { + return result.GetPrimitiveArray(index); + } + [global::System.ObsoleteAttribute()] + public Builder SetPrimitiveArray(int index, int value) { + result.primitiveArray_[index] = value; + return this; + } + [global::System.ObsoleteAttribute()] + public Builder AddPrimitiveArray(int value) { + result.primitiveArray_.Add(value); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder AddRangePrimitiveArray(scg::IEnumerable values) { + base.AddRange(values, result.primitiveArray_); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder ClearPrimitiveArray() { + result.primitiveArray_.Clear(); + return this; + } + + [global::System.ObsoleteAttribute()] + public bool HasMessageValue { + get { return result.hasMessageValue; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedChild MessageValue { + get { return result.MessageValue; } + set { SetMessageValue(value); } + } + [global::System.ObsoleteAttribute()] + public Builder SetMessageValue(global::UnitTest.Issues.TestProtos.DeprecatedChild value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + result.hasMessageValue = true; + result.messageValue_ = value; + return this; + } + [global::System.ObsoleteAttribute()] + public Builder SetMessageValue(global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + result.hasMessageValue = true; + result.messageValue_ = builderForValue.Build(); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder MergeMessageValue(global::UnitTest.Issues.TestProtos.DeprecatedChild value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + if (result.hasMessageValue && + result.messageValue_ != global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance) { + result.messageValue_ = global::UnitTest.Issues.TestProtos.DeprecatedChild.CreateBuilder(result.messageValue_).MergeFrom(value).BuildPartial(); + } else { + result.messageValue_ = value; + } + result.hasMessageValue = true; + return this; + } + [global::System.ObsoleteAttribute()] + public Builder ClearMessageValue() { + result.hasMessageValue = false; + result.messageValue_ = global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance; + return this; + } + + [global::System.ObsoleteAttribute()] + public pbc::IPopsicleList MessageArrayList { + get { return result.messageArray_; } + } + [global::System.ObsoleteAttribute()] + public int MessageArrayCount { + get { return result.MessageArrayCount; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedChild GetMessageArray(int index) { + return result.GetMessageArray(index); + } + [global::System.ObsoleteAttribute()] + public Builder SetMessageArray(int index, global::UnitTest.Issues.TestProtos.DeprecatedChild value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + result.messageArray_[index] = value; + return this; + } + [global::System.ObsoleteAttribute()] + public Builder SetMessageArray(int index, global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + result.messageArray_[index] = builderForValue.Build(); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder AddMessageArray(global::UnitTest.Issues.TestProtos.DeprecatedChild value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + result.messageArray_.Add(value); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder AddMessageArray(global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + result.messageArray_.Add(builderForValue.Build()); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder AddRangeMessageArray(scg::IEnumerable values) { + base.AddRange(values, result.messageArray_); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder ClearMessageArray() { + result.messageArray_.Clear(); + return this; + } + + [global::System.ObsoleteAttribute()] + public bool HasEnumValue { + get { return result.hasEnumValue; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue { + get { return result.EnumValue; } + set { SetEnumValue(value); } + } + [global::System.ObsoleteAttribute()] + public Builder SetEnumValue(global::UnitTest.Issues.TestProtos.DeprecatedEnum value) { + result.hasEnumValue = true; + result.enumValue_ = value; + return this; + } + [global::System.ObsoleteAttribute()] + public Builder ClearEnumValue() { + result.hasEnumValue = false; + result.enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.one; + return this; + } + + [global::System.ObsoleteAttribute()] + public pbc::IPopsicleList EnumArrayList { + get { return result.enumArray_; } + } + [global::System.ObsoleteAttribute()] + public int EnumArrayCount { + get { return result.EnumArrayCount; } + } + [global::System.ObsoleteAttribute()] + public global::UnitTest.Issues.TestProtos.DeprecatedEnum GetEnumArray(int index) { + return result.GetEnumArray(index); + } + [global::System.ObsoleteAttribute()] + public Builder SetEnumArray(int index, global::UnitTest.Issues.TestProtos.DeprecatedEnum value) { + result.enumArray_[index] = value; + return this; + } + [global::System.ObsoleteAttribute()] + public Builder AddEnumArray(global::UnitTest.Issues.TestProtos.DeprecatedEnum value) { + result.enumArray_.Add(value); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder AddRangeEnumArray(scg::IEnumerable values) { + base.AddRange(values, result.enumArray_); + return this; + } + [global::System.ObsoleteAttribute()] + public Builder ClearEnumArray() { + result.enumArray_.Clear(); + return this; + } + } + static DeprecatedFieldsMessage() { + object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnitTestExtrasIssuesProtoFile.Descriptor, null); + } + } + #endregion } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs index 9227c7cc..d1fa8633 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs index 77635f21..0ade582f 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs index 918be643..453a5416 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs index a96833be..239eaa48 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs index 5749c97f..f1fff865 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs index 8a6bb589..c1754e88 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs index 74d6af60..89a5c30e 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs index c7153abc..1f6e6ff4 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs index d8824d49..ad12efb3 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; @@ -5522,9 +5522,11 @@ namespace Google.ProtocolBuffers.TestProtos { public const int DeprecatedInt32FieldNumber = 1; private bool hasDeprecatedInt32; private int deprecatedInt32_; + [global::System.ObsoleteAttribute()] public bool HasDeprecatedInt32 { get { return hasDeprecatedInt32; } } + [global::System.ObsoleteAttribute()] public int DeprecatedInt32 { get { return deprecatedInt32_; } } @@ -5708,18 +5710,22 @@ namespace Google.ProtocolBuffers.TestProtos { } + [global::System.ObsoleteAttribute()] public bool HasDeprecatedInt32 { get { return result.hasDeprecatedInt32; } } + [global::System.ObsoleteAttribute()] public int DeprecatedInt32 { get { return result.DeprecatedInt32; } set { SetDeprecatedInt32(value); } } + [global::System.ObsoleteAttribute()] public Builder SetDeprecatedInt32(int value) { result.hasDeprecatedInt32 = true; result.deprecatedInt32_ = value; return this; } + [global::System.ObsoleteAttribute()] public Builder ClearDeprecatedInt32() { result.hasDeprecatedInt32 = false; result.deprecatedInt32_ = 0; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs index ae309fa7..3697a795 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs index 3d818a60..ff95996a 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs @@ -1,5 +1,5 @@ // Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT! -#pragma warning disable 1591 +#pragma warning disable 1591, 0612 #region Designer generated code using pb = global::Google.ProtocolBuffers; -- cgit v1.2.3