aboutsummaryrefslogtreecommitdiff
path: root/csharp
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| * | Merge pull request #3375 from TeBoring/3.3.xPaul Yang2017-07-191-1/+1
| |\ \
| | * \ Merge 3.3.x into masterBo Yang2017-07-181-1/+1
| | |\ \
| | | * | Update version number to 3.3.2Bo Yang2017-06-212-2/+2
| | | * | Update version number to 3.3.1Feng Xiao2017-05-082-2/+2
* | | | | Bump csharp versionJisi Liu2017-08-021-1/+1
* | | | | Merge from masterJisi Liu2017-07-253-226/+274
* | | | | Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
* | | | | Merge master into 3.4.xJisi Liu2017-07-1838-475/+510
|\| | | |
| * | | | 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-045-12/+27
| * | | 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-252-44/+23
| * | Add IncludeSource in csproj as per review commentsJon Skeet2017-05-241-0/+1
| * | Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-2427-354/+247
| |/
* / Update csharp and php descriptorJisi Liu2017-07-183-146/+316
|/
* Update version number and changelog for 3.3.0Feng Xiao2017-04-052-2/+2
* 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
* Updating READMEJohn Brock2017-02-231-2/+52
* Upgrading test-related librariesJohn Brock2017-02-231-2/+2
* Fixes for .NET 3.5 compatibilityJohn Brock2017-02-2312-13/+152
* Merge pull request #2701 from anandolee/masterJie Luo2017-02-1336-0/+7889
|\
| * Add csharp compatibility tests against v3.0.0 and run on Travis.Jie Luo2017-02-101-0/+102
| * Add proto and test files for csharp compatibility tests against v3.0.0.Jie Luo2017-02-0935-0/+7787
* | Fix CopyTo argument validationJon Skeet2017-02-062-2/+18
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-314-4/+13
* | C#: Implement IReadOnlyList<T> in RepeatedField<T>Jon Skeet2017-01-301-0/+3
|/
* Add Oneof custom options testJie Luo2017-01-273-116/+116
* Support custom options in C#Jon Skeet2017-01-1914-10/+3689
* 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