aboutsummaryrefslogtreecommitdiff
path: root/csharp
Commit message (Collapse)AuthorAgeFilesLines
* Bump version number to 3.5.2v3.5.2Bo Yang2018-03-052-2/+2
|
* Merge pull request #4072 from google/jieluoJisi Liu2017-12-1949-716/+4417
|\ | | | | Cherrypick for csharp, including:
| * Cherrypick for csharp, including:Jie Luo2017-12-1949-716/+4417
| | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
* | Update version number to 3.5.1Jisi Liu2017-12-192-2/+2
|/
* 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-022-2/+2
|
* Fix merging with message-valued oneofJon Skeet2017-10-314-9/+387
| | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation.
* 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
| | | | | | | Note that the default behavior is still to throw an exception; you need to opt into ignoring unknown fields. Fixes #2838.
* Update descriptor protosJisi Liu2017-10-182-1/+8
|
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-112-2/+2
|\
| * Bump version for minor releaseJisi Liu2017-09-142-2/+2
| |
| * 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
| | | | | | internal descriptor.proto
* | 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-185-149/+320
|\|
| * 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
| | |
| * | Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
| | |
| * | Merge master into 3.4.xJisi Liu2017-07-1838-475/+510
| |\ \
| * | | 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
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Previously we only rejected the tag if the tag itself was 0, i.e. field=0, type=varint. The type doesn't matter: field 0 is always invalid. This removes the last of the C# conformance failures.
* | | 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
|\ \ \ | | | | | | | | Proto2 test message support to conformance test
| * | | 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 master
| * | | 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
| | | |/ | | |/|
* | / | Support PHP generic services (#3269)Matt A2017-07-181-60/+89
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add php_generic_services option * Generate PHP generic services * Respect namespaces for generated PHP services * Test PHP generated services * Rename PHP generator service method doc comment function * Correct phpdoc service method case * Test namespaced PHP generic services * Always use the FQCN for PHP generic service input/output * Add generated_service_test to php test.sh * Add php service test protos to CI * Add php service files to php_EXTRA_DIST * Use Interface suffix for php generic services
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Note that the compatibility tests have had to cahnge as well, to cope with internal changes. (The test project has access to internals in the main project.) Fixes #3209.
* | | Make Any easier to work with in C#Jon Skeet2017-07-032-7/+64
| |/ |/| | | | | | | | | | | - Add a TryUnpack method which doesn't throw if the type is wrong - Make GetTypeName public for easier determination of the message type Fixes #3294.
* | Add new file option php_namespace. (#3162)Paul Yang2017-06-051-55/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new file option php_namespace. Use this option to change the namespace of php generated classes. Default is empty. When this option is empty, the package name will be used for determining the namespace. * Uncomment commented tests * Revert gdb test change * Update csharp descriptor. * Add test for empty php_namespace.
* | 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
| |