aboutsummaryrefslogtreecommitdiff
path: root/csharp/src
Commit message (Expand)AuthorAgeFilesLines
* change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-301-10/+10
* Merge branch 'master' into 3.4.xBo Yang2017-08-052-4/+6
|\
| * 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
| | * fix csharpYilun Chong2017-06-281-15/+15
| | * add csharp supportYilun Chong2017-06-282-12/+57
* | | 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
|\| |
| * | 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-122-0/+27
| * | Ensure leaveOpen is true when writing to a bufferJon Skeet2017-07-043-10/+25
| * | Make Any easier to work with in C#Jon Skeet2017-07-032-7/+64
| |/
| * Add new file option php_namespace. (#3162)Paul Yang2017-06-051-55/+88
| * update csharp README and fix .NET 3.5 build errorJohn Brock2017-05-251-1/+5
| * Add IncludeSource in csproj as per review commentsJon Skeet2017-05-241-0/+1
| * Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-2419-284/+155
* | Update csharp and php descriptorJisi Liu2017-07-183-146/+316
|/
* 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-273-19/+78
|\
| * Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings...Jie Luo2017-03-243-19/+78
* | 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-284-90/+234
* Upgrading test-related librariesJohn Brock2017-02-231-2/+2
* Fixes for .NET 3.5 compatibilityJohn Brock2017-02-2312-13/+152
* Fix CopyTo argument validationJon Skeet2017-02-062-2/+18
* 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
* Add Oneof custom options testJie Luo2017-01-272-110/+112
* Support custom options in C#Jon Skeet2017-01-1912-8/+3348
* Add ByteString.FromStream and ByteString.FromStreamAsync in C#Jon Skeet2017-01-103-1/+108
* Add global.json file to pick dotnet core SDK version.Jon Skeet2017-01-101-0/+5
* Give C# ByteString a sensible GetHashCode implementation.Jon Skeet2016-12-162-1/+14
* Merge pull request #2487 from jtattermusch/csharp_leading_whitespaceJan Tattermusch2016-12-1318-1058/+1058
|\
| * remove leading whitespace in C# xml commentsJan Tattermusch2016-12-1218-1058/+1058
* | update descriptor.proto's go_packageMichael Darakananda2016-12-071-3/+4
|/
* Factored Conformance and Benchmark test messages into shared test schema. (#1...Joshua Haberman2016-12-035-3644/+3712
* 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 csharp/src/Google.Protobuf.Test/project.jsonJulien Brianceau2016-11-141-1/+1
* Fix message for InvalidProtocolBufferExceptionMsp2016-11-041-1/+1
* Change JSON field name formattingJon Skeet2016-11-034-85/+23