aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
|/
* Update version number and changelog for 3.3.0Feng Xiao2017-04-051-1/+1
* Fix C++ build for down-integration.Feng Xiao2017-03-293-47/+86
* Merge pull request #2884 from anandolee/masterJie Luo2017-03-271-7/+49
|\
| * Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings...Jie Luo2017-03-241-7/+49
* | Add file option php_class_prefix (#2849)Paul Yang2017-03-171-56/+88
|/
* There might be duplicated enum values when allow_alias is true. Add Preferred...Jie Luo2017-02-282-1/+13
* Fixes for .NET 3.5 compatibilityJohn Brock2017-02-238-9/+78
* Fix CopyTo argument validationJon Skeet2017-02-061-2/+2
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-313-3/+12
* C#: Implement IReadOnlyList<T> in RepeatedField<T>Jon Skeet2017-01-301-0/+3
* Support custom options in C#Jon Skeet2017-01-1910-8/+454
* Add ByteString.FromStream and ByteString.FromStreamAsync in C#Jon Skeet2017-01-101-0/+53
* Give C# ByteString a sensible GetHashCode implementation.Jon Skeet2016-12-161-1/+1
* Merge pull request #2487 from jtattermusch/csharp_leading_whitespaceJan Tattermusch2016-12-1311-949/+949
|\
| * remove leading whitespace in C# xml commentsJan Tattermusch2016-12-1211-949/+949
* | update descriptor.proto's go_packageMichael Darakananda2016-12-071-3/+4
|/
* Add a swift_prefix file option.Thomas Van Lenten2016-11-301-55/+90
* Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-225-18/+76
* Fix message for InvalidProtocolBufferExceptionMsp2016-11-041-1/+1