aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-201-2/+2
|\
| * Updated checked-in generated codeAdam Cozzette2018-03-141-2/+2
* | Merge pull request #4345 from jskeet/list-json-nullFeng Xiao2018-03-201-2/+3
|\ \
| * | Allow list values to be null when parsingJon Skeet2018-03-011-2/+3
| |/
* / Remove 64MB memory limit when deserializing messages in C#John Brock2018-01-311-3/+3
|/
* Add DiscardUnknownFields support for C#Jon Skeet2018-01-154-56/+125
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Merge pull request #4072 from google/jieluoJisi Liu2017-12-1920-145/+1614
| |\
| | * Cherrypick for csharp, including:Jie Luo2017-12-1920-145/+1614
| * | Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
| |/
| * ParseFrom<T> for array slice is missingJan Tattermusch2017-11-101-0/+14
| * check already performed by MergeFromJan Tattermusch2017-11-101-5/+0
| * allow message parsing from an array sliceJan Tattermusch2017-11-102-0/+31
| * Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
* | Add auto-generated header to C# generated files (#4038)Jan Tattermusch2017-12-1311-22/+44
* | Add unknown field support for csharp (#3936)Jie Luo2017-12-1315-100/+1414
* | Update generated code.Feng Xiao2017-12-121-1/+3
* | Regenerated code from previous C# codegen commitJon Skeet2017-12-093-8/+8
* | Compare floating point values bitwise in C#Jon Skeet2017-12-094-14/+147
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-012-2/+2
|\ \
| * | Update csharp version number (#3958)Jie Luo2017-11-291-1/+1
| * | Fix JsonTokenizer exception messageJon Skeet2017-11-291-1/+1
* | | Integrated internal changes from GoogleAdam Cozzette2017-12-012-10/+15
|/ /
* | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-091-0/+14
* | check already performed by MergeFromJan Tattermusch2017-11-091-5/+0
* | allow message parsing from an array sliceJan Tattermusch2017-11-092-0/+31
|/
* Fix merging with message-valued oneofJon Skeet2017-10-311-2/+8
* update joda-time javadoc urlxuwei-k2017-10-301-1/+1
* Add parser settings WithXyz methodsJon Skeet2017-10-281-0/+17
* Add JsonParser setting to ignore unknown field valuesJon Skeet2017-10-282-7/+58
* Update descriptor protosJisi Liu2017-10-182-1/+8
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-1/+1
|\
| * Bump version for minor releaseJisi Liu2017-09-141-1/+1
| * Google.Protobuf should target net45Jan Tattermusch2017-09-051-1/+1
| * change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-301-10/+10
* | Integrated internal changes from GoogleAdam Cozzette2017-09-141-90/+308
* | Google.Protobuf should target net45Jan Tattermusch2017-09-121-1/+1
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-184-148/+319
|\|
| * Bump csharp versionJisi Liu2017-08-021-1/+1
| * Merge master into 3.4.xJisi Liu2017-07-187-158/+211
| |\
| * | Update csharp and php descriptorJisi Liu2017-07-183-146/+316
* | | Detect invalid tags with a field number of 0 in C#Jon Skeet2017-08-111-2/+2
| |/ |/|
* | Support PHP generic services (#3269)Matt A2017-07-181-60/+89
* | Fix repository URL in C# project fileJon Skeet2017-07-131-1/+1
* | C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V>Jean-Rémy Bancel2017-07-121-0/+11
* | Ensure leaveOpen is true when writing to a bufferJon Skeet2017-07-041-8/+9
* | Make Any easier to work with in C#Jon Skeet2017-07-031-7/+36
* | Add new file option php_namespace. (#3162)Paul Yang2017-06-051-55/+88
* | Add IncludeSource in csproj as per review commentsJon Skeet2017-05-241-0/+1
* | Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-243-84/+32
|/