aboutsummaryrefslogtreecommitdiffhomepage
path: root/csharp
Commit message (Expand)AuthorAge
* Merge pull request #4387 from acozzette/down-integrateGravatar Adam Cozzette2018-03-20
|\
* \ Merge pull request #4345 from jskeet/list-json-nullGravatar Feng Xiao2018-03-20
|\ \
| | * Updated checked-in generated codeGravatar Adam Cozzette2018-03-14
| * | Allow list values to be null when parsingGravatar Jon Skeet2018-03-01
| |/
* / Remove 64MB memory limit when deserializing messages in C#Gravatar John Brock2018-01-31
|/
* Update .NET SDK to 2.0.3Gravatar Jon Skeet2018-01-25
* Add DiscardUnknownFields support for C#Gravatar Jon Skeet2018-01-15
* Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\
| * Merge pull request #4072 from google/jieluoGravatar Jisi Liu2017-12-19
| |\
| | * Cherrypick for csharp, including:Gravatar Jie Luo2017-12-19
| * | Update version number to 3.5.1Gravatar Jisi Liu2017-12-19
| |/
* | Add auto-generated header to C# generated files (#4038)Gravatar Jan Tattermusch2017-12-13
* | Add unknown field support for csharp (#3936)Gravatar Jie Luo2017-12-13
* | Update generated code.Gravatar Feng Xiao2017-12-12
* | Regenerated code from previous C# codegen commitGravatar Jon Skeet2017-12-09
* | Compare floating point values bitwise in C#Gravatar Jon Skeet2017-12-09
* | Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\ \
* | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| * | Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\|
| * | Update csharp version number (#3958)Gravatar Jie Luo2017-11-29
| * | Fix JsonTokenizer exception messageGravatar Jon Skeet2017-11-29
| * | Remove non-C# options from C#-only test protosGravatar Jon Skeet2017-11-14
| * | MMinor fix-ups to C# tests from changes in earlier commitsGravatar Jon Skeet2017-11-12
| * | Regenerated test code for C#Gravatar Jon Skeet2017-11-12
| * | Move C#-only test protos to csharp/protosGravatar Jon Skeet2017-11-12
|/ /
| * ParseFrom<T> for array slice is missingGravatar Jan Tattermusch2017-11-10
| * check already performed by MergeFromGravatar Jan Tattermusch2017-11-10
| * allow message parsing from an array sliceGravatar Jan Tattermusch2017-11-10
* | ParseFrom<T> for array slice is missingGravatar Jan Tattermusch2017-11-09
* | check already performed by MergeFromGravatar Jan Tattermusch2017-11-09
* | allow message parsing from an array sliceGravatar Jan Tattermusch2017-11-09
| * Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
|/
* Fix merging with message-valued oneofGravatar Jon Skeet2017-10-31
* update joda-time javadoc urlGravatar xuwei-k2017-10-30
* Add parser settings WithXyz methodsGravatar Jon Skeet2017-10-28
* Add JsonParser setting to ignore unknown field valuesGravatar Jon Skeet2017-10-28
* Update descriptor protosGravatar Jisi Liu2017-10-18
* Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\
| * Bump version for minor releaseGravatar Jisi Liu2017-09-14
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* | Google.Protobuf should target net45Gravatar Jan Tattermusch2017-09-12
* | Update C# generated file for addressbook.protoGravatar Feng Xiao2017-09-11
| * Google.Protobuf should target net45Gravatar Jan Tattermusch2017-09-05
| * change the field number of php_generic_service to fix the conflict with (#3576)Gravatar Paul Yang2017-08-30
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterGravatar Jisi Liu2017-08-18
|\|
* | Detect invalid tags with a field number of 0 in C#Gravatar Jon Skeet2017-08-11
| * Merge branch 'master' into 3.4.xGravatar Bo Yang2017-08-05
| |\ | |/ |/|
| * Bump csharp versionGravatar Jisi Liu2017-08-02
* | Update the comment on the message_type to cover what it should be.Gravatar Thomas Van Lenten2017-07-26
| * Merge from masterGravatar Jisi Liu2017-07-25