Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4387 from acozzette/down-integrate | Adam Cozzette | 2018-03-20 | 1 | -2/+2 |
|\ | | | | | Integrated internal changes from Google | ||||
| * | Updated checked-in generated code | Adam Cozzette | 2018-03-14 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #4345 from jskeet/list-json-null | Feng Xiao | 2018-03-20 | 2 | -2/+19 |
|\ \ | | | | | | | Allow null value in JSON representation of ListValue | ||||
| * | | Allow list values to be null when parsing | Jon Skeet | 2018-03-01 | 2 | -2/+19 |
| |/ | |||||
* / | Remove 64MB memory limit when deserializing messages in C# | John Brock | 2018-01-31 | 2 | -3/+86 |
|/ | | | | Increased `CodedInputStream.DefaultSizeLimit` to `Int32.MaxValue` to make it consistent with the Java implementation. | ||||
* | Update .NET SDK to 2.0.3 | Jon Skeet | 2018-01-25 | 1 | -1/+1 |
| | | | | | | | | | | This will allow SourceLink as per #4179, and mean that we can use C# 7.0 language features in the library (but not in generated code). This does not affect which platforms we're *targeting*, so end users won't see any difference. It would be nice to update to 2.1.4, but AppVeyor's "Visual Studio 2017" environment is only 2.0.3. | ||||
* | Add DiscardUnknownFields support for C# | Jon Skeet | 2018-01-15 | 5 | -56/+173 |
| | | | | | | | By default, unknown fields are preserved when parsing. To discard them, use a parser configured to do so: var parser = MyMessage.Parser.WithDiscardUnknownFields(true); | ||||
* | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 2 | -2/+2 |
|\ | |||||
| * | Merge pull request #4072 from google/jieluo | Jisi Liu | 2017-12-19 | 49 | -716/+4417 |
| |\ | | | | | | | Cherrypick for csharp, including: | ||||
| | * | Cherrypick for csharp, including: | Jie Luo | 2017-12-19 | 49 | -716/+4417 |
| | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files | ||||
| * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 2 | -2/+2 |
| |/ | |||||
* | | Add auto-generated header to C# generated files (#4038) | Jan Tattermusch | 2017-12-13 | 21 | -42/+84 |
| | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos | ||||
* | | Add unknown field support for csharp (#3936) | Jie Luo | 2017-12-13 | 29 | -306/+2947 |
| | | | | | | Add unknown field support for csharp | ||||
* | | Update generated code. | Feng Xiao | 2017-12-12 | 1 | -1/+3 |
| | | |||||
* | | Regenerated code from previous C# codegen commit | Jon Skeet | 2017-12-09 | 6 | -34/+34 |
| | | | | | | | | | | | | With this in place, all tests should pass. Fixes #3725. | ||||
* | | Compare floating point values bitwise in C# | Jon Skeet | 2017-12-09 | 10 | -14/+402 |
| | | | | | | | | | | This is the manual code part of the Google.Protobuf library, and tests. Some tests will fail until codegen is changed and rerun. | ||||
* | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 21 | -340/+970 |
|\ \ | |||||
| * | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 1 | -1/+1 |
| |\| | |||||
| | * | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-10 | 1 | -0/+14 |
| | | | |||||
| | * | check already performed by MergeFrom | Jan Tattermusch | 2017-11-10 | 1 | -5/+0 |
| | | | |||||
| | * | allow message parsing from an array slice | Jan Tattermusch | 2017-11-10 | 2 | -0/+31 |
| | | | |||||
| | * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 2 | -2/+2 |
| | | | |||||
| * | | Update csharp version number (#3958) | Jie Luo | 2017-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Fix JsonTokenizer exception message | Jon Skeet | 2017-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Remove non-C# options from C#-only test protos | Jon Skeet | 2017-11-14 | 10 | -41/+13 |
| | | | |||||
| * | | MMinor fix-ups to C# tests from changes in earlier commits | Jon Skeet | 2017-11-12 | 4 | -20/+30 |
| | | | |||||
| * | | Regenerated test code for C# | Jon Skeet | 2017-11-12 | 6 | -295/+330 |
| | | | |||||
| * | | Move C#-only test protos to csharp/protos | Jon Skeet | 2017-11-12 | 6 | -19/+632 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#. | ||||
* | | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 2 | -10/+15 |
|/ / | |||||
* | | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-09 | 1 | -0/+14 |
| | | |||||
* | | check already performed by MergeFrom | Jan Tattermusch | 2017-11-09 | 1 | -5/+0 |
| | | |||||
* | | allow message parsing from an array slice | Jan Tattermusch | 2017-11-09 | 2 | -0/+31 |
|/ | |||||
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 4 | -9/+387 |
| | | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation. | ||||
* | update joda-time javadoc url | xuwei-k | 2017-10-30 | 1 | -1/+1 |
| | |||||
* | Add parser settings WithXyz methods | Jon Skeet | 2017-10-28 | 1 | -0/+17 |
| | |||||
* | Add JsonParser setting to ignore unknown field values | Jon Skeet | 2017-10-28 | 4 | -7/+95 |
| | | | | | | | Note that the default behavior is still to throw an exception; you need to opt into ignoring unknown fields. Fixes #2838. | ||||
* | Update descriptor protos | Jisi Liu | 2017-10-18 | 2 | -1/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 2 | -2/+2 |
|\ | |||||
| * | Bump version for minor release | Jisi Liu | 2017-09-14 | 2 | -2/+2 |
| | | |||||
| * | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-05 | 1 | -1/+1 |
| | | |||||
| * | change the field number of php_generic_service to fix the conflict with (#3576) | Paul Yang | 2017-08-30 | 1 | -10/+10 |
| | | | | | | internal descriptor.proto | ||||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 1 | -90/+308 |
| | | |||||
* | | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-12 | 1 | -1/+1 |
| | | |||||
* | | Update C# generated file for addressbook.proto | Feng Xiao | 2017-09-11 | 1 | -11/+47 |
| | | |||||
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 5 | -149/+320 |
|\| | |||||
| * | Merge branch 'master' into 3.4.x | Bo Yang | 2017-08-05 | 2 | -4/+6 |
| |\ | |||||
| * | | Bump csharp version | Jisi Liu | 2017-08-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge from master | Jisi Liu | 2017-07-25 | 3 | -226/+274 |
| | | | |||||
| * | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 38 | -475/+510 |
| |\ \ |