aboutsummaryrefslogtreecommitdiff
path: root/csharp/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Merge pull request #4072 from google/jieluoJisi Liu2017-12-1941-691/+3803
| |\
| | * Cherrypick for csharp, including:Jie Luo2017-12-1941-691/+3803
| * | 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-1321-42/+84
* | Add unknown field support for csharp (#3936)Jie Luo2017-12-1327-301/+2939
* | Update generated code.Feng Xiao2017-12-121-1/+3
* | Regenerated code from previous C# codegen commitJon Skeet2017-12-096-34/+34
* | Compare floating point values bitwise in C#Jon Skeet2017-12-0910-14/+402
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-0113-319/+363
|\ \
| * | Update csharp version number (#3958)Jie Luo2017-11-291-1/+1
| * | Fix JsonTokenizer exception messageJon Skeet2017-11-291-1/+1
| * | Remove non-C# options from C#-only test protosJon Skeet2017-11-145-10/+9
| * | MMinor fix-ups to C# tests from changes in earlier commitsJon Skeet2017-11-124-20/+30
| * | Regenerated test code for C#Jon Skeet2017-11-126-295/+330
* | | 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-313-9/+372
* 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-284-7/+95
* 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
* | Update C# generated file for addressbook.protoFeng Xiao2017-09-111-11/+47
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-184-148/+319
|\|
| * Merge branch 'master' into 3.4.xBo Yang2017-08-052-4/+6
| |\
| * | Bump csharp versionJisi Liu2017-08-021-1/+1
| * | Merge from masterJisi Liu2017-07-253-226/+274
| * | Merge master into 3.4.xJisi Liu2017-07-1827-360/+398
| |\ \
| * | | Update csharp and php descriptorJisi Liu2017-07-183-146/+316
* | | | Detect invalid tags with a field number of 0 in C#Jon Skeet2017-08-112-2/+16
| |_|/ |/| |
* | | Update the comment on the message_type to cover what it should be.Thomas Van Lenten2017-07-262-4/+6
* | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongYilun Chong2017-07-243-226/+274
|\ \ \ | |_|/ |/| |
| * | delete backup filesYilun Chong2017-07-051-155/+0
| * | fix php failing list and csharp generated protoYilun Chong2017-07-052-211/+370
| * | add some test proto2 supported, add js proto2 supported, fixed some errorYilun Chong2017-06-301-5/+5
| * | change php objc nodejs csharp rubyYilun Chong2017-06-291-16/+15
| * | fix csharp conformance testYilun Chong2017-06-281-1/+1
| * | fix csharp conformance testYilun Chong2017-06-281-16/+16
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 23:42:16 +0000