diff options
| author |  Jon Skeet <jonskeet@google.com> | 2016-01-20 18:43:00 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2016-01-20 18:43:00 +0000 |
| commit | dd43dcca8c3a0af761ae981edcadd7e78e875fe8 (patch) | |
| tree | 57451afd4dc559df5b267357f90a11cbc2d3a410 /csharp/src/Google.Protobuf/Google.Protobuf.csproj | |
| parent | 8c5260b21bb0e217e91375893d507a0ef6578d67 (diff) | |
Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw
The usage of ICustomDiagnosticMessage here is non-essential - ToDiagnosticString
doesn't actually get called by ToString() in this case, due to JsonFormatter code. It was
intended to make it clearer that it *did* have a custom format... but then arguably I should
do the same for Value, Struct, Any etc.
Moving some of the code out of JsonFormatter and into Duration/Timestamp/FieldMask likewise
feels somewhat nice, somewhat nasty... basically there are JSON-specific bits of formatting, but
also domain-specific bits of computation. <sigh>
Thoughts welcome.
Diffstat (limited to 'csharp/src/Google.Protobuf/Google.Protobuf.csproj')
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.csproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 617497e6..f95bae07 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -132,6 +132,7 @@ <Compile Include="WellKnownTypes\DurationPartial.cs" />
<Compile Include="WellKnownTypes\Empty.cs" />
<Compile Include="WellKnownTypes\FieldMask.cs" />
+ <Compile Include="WellKnownTypes\FieldMaskPartial.cs" />
<Compile Include="WellKnownTypes\SourceContext.cs" />
<Compile Include="WellKnownTypes\Struct.cs" />
<Compile Include="WellKnownTypes\TimeExtensions.cs" />
|