diff options
author | Jisi Liu <liujisi@google.com> | 2017-10-19 10:48:54 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-19 10:48:54 -0700 |
commit | 07b9238a1c03ef0351bcb4ca57d773eb7b7c5824 (patch) | |
tree | 21e26d76c08b02cdcffb944afb29916a59c182be /csharp/src | |
parent | 9c407a16e4b64e8329da8508a56dd4ba260ebcd5 (diff) | |
parent | 2ee294d80b8d6841bcd1149f62180bb18d671033 (diff) | |
download | protobuf-07b9238a1c03ef0351bcb4ca57d773eb7b7c5824.tar.gz protobuf-07b9238a1c03ef0351bcb4ca57d773eb7b7c5824.tar.bz2 protobuf-07b9238a1c03ef0351bcb4ca57d773eb7b7c5824.zip |
Merge pull request #3770 from pherl/3.5-integrate
Integrate google internal changes for the up coming 3.5 release.
Diffstat (limited to 'csharp/src')
-rw-r--r-- | csharp/src/Google.Protobuf/Reflection/Descriptor.cs | 3 | ||||
-rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs index 8c37ba86..6aad0e99 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs @@ -3478,7 +3478,8 @@ namespace Google.Protobuf.Reflection { = 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>(); /// <summary> - /// The parser stores options it doesn't recognize here. See above. + /// The parser stores options it doesn't recognize here. + /// See the documentation for the "Options" section above. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs index ef3bc10a..ee4561ff 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs @@ -239,6 +239,12 @@ namespace Google.Protobuf.WellKnownTypes { /// /// Note that oneof type names ("test_oneof" in this case) cannot be used in /// paths. + /// + /// ## Field Mask Verification + /// + /// The implementation of the all the API methods, which have any FieldMask type + /// field in the request, should verify the included field paths, and return + /// `INVALID_ARGUMENT` error if any path is duplicated or unmappable. /// </summary> public sealed partial class FieldMask : pb::IMessage<FieldMask> { private static readonly pb::MessageParser<FieldMask> _parser = new pb::MessageParser<FieldMask>(() => new FieldMask()); |