diff options
| author | Hao Nguyen <haon@google.com> | 2019-04-09 06:48:01 -0700 |
|---|---|---|
| committer | Hao Nguyen <haon@google.com> | 2019-04-09 06:48:01 -0700 |
| commit | ef1e8e7172bedd177b91bdbeacdca1478021d0df (patch) | |
| tree | beb2da56d04b51243838241698a9e72aea912cc4 /csharp | |
| parent | 6dc9832aab87dfdbb1c7b008f4596184e1fd8105 (diff) | |
| download | platform_external_protobuf-ef1e8e7172bedd177b91bdbeacdca1478021d0df.tar.gz platform_external_protobuf-ef1e8e7172bedd177b91bdbeacdca1478021d0df.tar.bz2 platform_external_protobuf-ef1e8e7172bedd177b91bdbeacdca1478021d0df.zip | |
Add module for JavaLite and fix builds
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/testprotos.pb | bin | 205149 -> 205179 bytes | |||
| -rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs | 10 |
2 files changed, 6 insertions, 4 deletions
diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb Binary files differindex b66c4eef7..9c68af084 100644 --- a/csharp/src/Google.Protobuf.Test/testprotos.pb +++ b/csharp/src/Google.Protobuf.Test/testprotos.pb diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs index 2e5809f2f..9df237cfc 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs @@ -113,11 +113,13 @@ namespace Google.Protobuf.WellKnownTypes { /// 01:30 UTC on January 15, 2017. /// /// In JavaScript, one can convert a Date object to this format using the - /// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) + /// standard + /// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) /// method. In Python, a standard `datetime.datetime` object can be converted - /// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) - /// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one - /// can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( + /// to this format using + /// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with + /// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use + /// the Joda Time's [`ISODateTimeFormat.dateTime()`]( /// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D /// ) to obtain a formatter capable of generating timestamps in this format. /// </summary> |