| Index: third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
|
| diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
|
| index b90c9a2afd2113c2f74e1e451acf152af4080550..871a383f0d7df5fc9fd2c85f02a321cad2199c70 100644
|
| --- a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
|
| +++ b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
|
| @@ -10,6 +10,7 @@ using scg = global::System.Collections.Generic;
|
| namespace Google.Protobuf.WellKnownTypes {
|
|
|
| /// <summary>Holder for reflection information generated from google/protobuf/any.proto</summary>
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| public static partial class AnyReflection {
|
|
|
| #region Descriptor
|
| @@ -23,10 +24,10 @@ namespace Google.Protobuf.WellKnownTypes {
|
| byte[] descriptorData = global::System.Convert.FromBase64String(
|
| string.Concat(
|
| "Chlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvEg9nb29nbGUucHJvdG9idWYi",
|
| - "JgoDQW55EhAKCHR5cGVfdXJsGAEgASgJEg0KBXZhbHVlGAIgASgMQm8KE2Nv",
|
| + "JgoDQW55EhAKCHR5cGVfdXJsGAEgASgJEg0KBXZhbHVlGAIgASgMQnIKE2Nv",
|
| "bS5nb29nbGUucHJvdG9idWZCCEFueVByb3RvUAFaJWdpdGh1Yi5jb20vZ29s",
|
| - "YW5nL3Byb3RvYnVmL3B0eXBlcy9hbnmiAgNHUEKqAh5Hb29nbGUuUHJvdG9i",
|
| - "dWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw=="));
|
| + "YW5nL3Byb3RvYnVmL3B0eXBlcy9hbnmgAQGiAgNHUEKqAh5Hb29nbGUuUHJv",
|
| + "dG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw=="));
|
| descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
| new pbr::FileDescriptor[] { },
|
| new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
|
| @@ -38,104 +39,89 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| #region Messages
|
| /// <summary>
|
| - /// `Any` contains an arbitrary serialized protocol buffer message along with a
|
| - /// URL that describes the type of the serialized message.
|
| + /// `Any` contains an arbitrary serialized protocol buffer message along with a
|
| + /// URL that describes the type of the serialized message.
|
| ///
|
| - /// Protobuf library provides support to pack/unpack Any values in the form
|
| - /// of utility functions or additional generated methods of the Any type.
|
| + /// Protobuf library provides support to pack/unpack Any values in the form
|
| + /// of utility functions or additional generated methods of the Any type.
|
| ///
|
| - /// Example 1: Pack and unpack a message in C++.
|
| + /// Example 1: Pack and unpack a message in C++.
|
| ///
|
| - /// Foo foo = ...;
|
| - /// Any any;
|
| - /// any.PackFrom(foo);
|
| - /// ...
|
| - /// if (any.UnpackTo(&foo)) {
|
| - /// ...
|
| - /// }
|
| + /// Foo foo = ...;
|
| + /// Any any;
|
| + /// any.PackFrom(foo);
|
| + /// ...
|
| + /// if (any.UnpackTo(&foo)) {
|
| + /// ...
|
| + /// }
|
| ///
|
| - /// Example 2: Pack and unpack a message in Java.
|
| + /// Example 2: Pack and unpack a message in Java.
|
| ///
|
| - /// Foo foo = ...;
|
| - /// Any any = Any.pack(foo);
|
| - /// ...
|
| - /// if (any.is(Foo.class)) {
|
| - /// foo = any.unpack(Foo.class);
|
| - /// }
|
| + /// Foo foo = ...;
|
| + /// Any any = Any.pack(foo);
|
| + /// ...
|
| + /// if (any.is(Foo.class)) {
|
| + /// foo = any.unpack(Foo.class);
|
| + /// }
|
| ///
|
| - /// Example 3: Pack and unpack a message in Python.
|
| + /// The pack methods provided by protobuf library will by default use
|
| + /// 'type.googleapis.com/full.type.name' as the type URL and the unpack
|
| + /// methods only use the fully qualified type name after the last '/'
|
| + /// in the type URL, for example "foo.bar.com/x/y.z" will yield type
|
| + /// name "y.z".
|
| ///
|
| - /// foo = Foo(...)
|
| - /// any = Any()
|
| - /// any.Pack(foo)
|
| - /// ...
|
| - /// if any.Is(Foo.DESCRIPTOR):
|
| - /// any.Unpack(foo)
|
| - /// ...
|
| + /// JSON
|
| + /// ====
|
| + /// The JSON representation of an `Any` value uses the regular
|
| + /// representation of the deserialized, embedded message, with an
|
| + /// additional field `@type` which contains the type URL. Example:
|
| ///
|
| - /// The pack methods provided by protobuf library will by default use
|
| - /// 'type.googleapis.com/full.type.name' as the type URL and the unpack
|
| - /// methods only use the fully qualified type name after the last '/'
|
| - /// in the type URL, for example "foo.bar.com/x/y.z" will yield type
|
| - /// name "y.z".
|
| + /// package google.profile;
|
| + /// message Person {
|
| + /// string first_name = 1;
|
| + /// string last_name = 2;
|
| + /// }
|
| ///
|
| - /// JSON
|
| - /// ====
|
| - /// The JSON representation of an `Any` value uses the regular
|
| - /// representation of the deserialized, embedded message, with an
|
| - /// additional field `@type` which contains the type URL. Example:
|
| + /// {
|
| + /// "@type": "type.googleapis.com/google.profile.Person",
|
| + /// "firstName": <string>,
|
| + /// "lastName": <string>
|
| + /// }
|
| ///
|
| - /// package google.profile;
|
| - /// message Person {
|
| - /// string first_name = 1;
|
| - /// string last_name = 2;
|
| - /// }
|
| + /// If the embedded message type is well-known and has a custom JSON
|
| + /// representation, that representation will be embedded adding a field
|
| + /// `value` which holds the custom JSON in addition to the `@type`
|
| + /// field. Example (for message [google.protobuf.Duration][]):
|
| ///
|
| - /// {
|
| - /// "@type": "type.googleapis.com/google.profile.Person",
|
| - /// "firstName": <string>,
|
| - /// "lastName": <string>
|
| - /// }
|
| - ///
|
| - /// If the embedded message type is well-known and has a custom JSON
|
| - /// representation, that representation will be embedded adding a field
|
| - /// `value` which holds the custom JSON in addition to the `@type`
|
| - /// field. Example (for message [google.protobuf.Duration][]):
|
| - ///
|
| - /// {
|
| - /// "@type": "type.googleapis.com/google.protobuf.Duration",
|
| - /// "value": "1.212s"
|
| - /// }
|
| + /// {
|
| + /// "@type": "type.googleapis.com/google.protobuf.Duration",
|
| + /// "value": "1.212s"
|
| + /// }
|
| /// </summary>
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| public sealed partial class Any : pb::IMessage<Any> {
|
| private static readonly pb::MessageParser<Any> _parser = new pb::MessageParser<Any>(() => new Any());
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public static pb::MessageParser<Any> Parser { get { return _parser; } }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public static pbr::MessageDescriptor Descriptor {
|
| get { return global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor.MessageTypes[0]; }
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| pbr::MessageDescriptor pb::IMessage.Descriptor {
|
| get { return Descriptor; }
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Any() {
|
| OnConstruction();
|
| }
|
|
|
| partial void OnConstruction();
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Any(Any other) : this() {
|
| typeUrl_ = other.typeUrl_;
|
| value_ = other.value_;
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Any Clone() {
|
| return new Any(this);
|
| }
|
| @@ -144,29 +130,28 @@ namespace Google.Protobuf.WellKnownTypes {
|
| public const int TypeUrlFieldNumber = 1;
|
| private string typeUrl_ = "";
|
| /// <summary>
|
| - /// A URL/resource name whose content describes the type of the
|
| - /// serialized protocol buffer message.
|
| + /// A URL/resource name whose content describes the type of the
|
| + /// serialized protocol buffer message.
|
| ///
|
| - /// For URLs which use the scheme `http`, `https`, or no scheme, the
|
| - /// following restrictions and interpretations apply:
|
| + /// For URLs which use the schema `http`, `https`, or no schema, the
|
| + /// following restrictions and interpretations apply:
|
| ///
|
| - /// * If no scheme is provided, `https` is assumed.
|
| - /// * The last segment of the URL's path must represent the fully
|
| - /// qualified name of the type (as in `path/google.protobuf.Duration`).
|
| - /// The name should be in a canonical form (e.g., leading "." is
|
| - /// not accepted).
|
| - /// * An HTTP GET on the URL must yield a [google.protobuf.Type][]
|
| - /// value in binary format, or produce an error.
|
| - /// * Applications are allowed to cache lookup results based on the
|
| - /// URL, or have them precompiled into a binary to avoid any
|
| - /// lookup. Therefore, binary compatibility needs to be preserved
|
| - /// on changes to types. (Use versioned type names to manage
|
| - /// breaking changes.)
|
| + /// * If no schema is provided, `https` is assumed.
|
| + /// * The last segment of the URL's path must represent the fully
|
| + /// qualified name of the type (as in `path/google.protobuf.Duration`).
|
| + /// The name should be in a canonical form (e.g., leading "." is
|
| + /// not accepted).
|
| + /// * An HTTP GET on the URL must yield a [google.protobuf.Type][]
|
| + /// value in binary format, or produce an error.
|
| + /// * Applications are allowed to cache lookup results based on the
|
| + /// URL, or have them precompiled into a binary to avoid any
|
| + /// lookup. Therefore, binary compatibility needs to be preserved
|
| + /// on changes to types. (Use versioned type names to manage
|
| + /// breaking changes.)
|
| ///
|
| - /// Schemes other than `http`, `https` (or the empty scheme) might be
|
| - /// used with implementation specific semantics.
|
| + /// Schemas other than `http`, `https` (or the empty schema) might be
|
| + /// used with implementation specific semantics.
|
| /// </summary>
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public string TypeUrl {
|
| get { return typeUrl_; }
|
| set {
|
| @@ -178,9 +163,8 @@ namespace Google.Protobuf.WellKnownTypes {
|
| public const int ValueFieldNumber = 2;
|
| private pb::ByteString value_ = pb::ByteString.Empty;
|
| /// <summary>
|
| - /// Must be a valid serialized protocol buffer of the above specified type.
|
| + /// Must be a valid serialized protocol buffer of the above specified type.
|
| /// </summary>
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public pb::ByteString Value {
|
| get { return value_; }
|
| set {
|
| @@ -188,12 +172,10 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override bool Equals(object other) {
|
| return Equals(other as Any);
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public bool Equals(Any other) {
|
| if (ReferenceEquals(other, null)) {
|
| return false;
|
| @@ -206,7 +188,6 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return true;
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override int GetHashCode() {
|
| int hash = 1;
|
| if (TypeUrl.Length != 0) hash ^= TypeUrl.GetHashCode();
|
| @@ -214,12 +195,10 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return hash;
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override string ToString() {
|
| return pb::JsonFormatter.ToDiagnosticString(this);
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void WriteTo(pb::CodedOutputStream output) {
|
| if (TypeUrl.Length != 0) {
|
| output.WriteRawTag(10);
|
| @@ -231,7 +210,6 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public int CalculateSize() {
|
| int size = 0;
|
| if (TypeUrl.Length != 0) {
|
| @@ -243,7 +221,6 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return size;
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void MergeFrom(Any other) {
|
| if (other == null) {
|
| return;
|
| @@ -256,7 +233,6 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void MergeFrom(pb::CodedInputStream input) {
|
| uint tag;
|
| while ((tag = input.ReadTag()) != 0) {
|
|
|