aboutsummaryrefslogtreecommitdiff
path: root/csharp
Commit message (Collapse)AuthorAgeFilesLines
* Address review commentsJon Skeet2018-03-271-5/+13
|
* Work around an "old runtime" issue with reflectionJon Skeet2018-03-271-5/+51
| | | | | | | | | | For oneofs, to get the case, we need to call the property that returns the enum value. We really want it as an int, and modern runtimes allow us to create a delegate which returns an int from the method. (I suspect that the MS runtime has always allowed that.) Old versions of Mono (e.g. used by Unity3d) don't allow that, so we have to convert the enum value to an int via boxing. It's ugly, but it should work.
* Introduce a compatiblity shim to support .NET 3.5 delegate creationJon Skeet2018-03-272-0/+51
|
* Change C# reflection to avoid using expression treesJon Skeet2018-03-272-34/+54
| | | | | | This should work on Unity, Mono and .NET 3.5 as far as I'm aware. It won't work on platforms where reflection itself is prohibited, but that's a non-starter basically.
* Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-201-2/+2
|\ | | | | Integrated internal changes from Google
| * Updated checked-in generated codeAdam Cozzette2018-03-141-2/+2
| |
* | Merge pull request #4345 from jskeet/list-json-nullFeng Xiao2018-03-202-2/+19
|\ \ | | | | | | Allow null value in JSON representation of ListValue
| * | Allow list values to be null when parsingJon Skeet2018-03-012-2/+19
| |/
* / Remove 64MB memory limit when deserializing messages in C#John Brock2018-01-312-3/+86
|/ | | | Increased `CodedInputStream.DefaultSizeLimit` to `Int32.MaxValue` to make it consistent with the Java implementation.
* Update .NET SDK to 2.0.3Jon Skeet2018-01-251-1/+1
| | | | | | | | | | This will allow SourceLink as per #4179, and mean that we can use C# 7.0 language features in the library (but not in generated code). This does not affect which platforms we're *targeting*, so end users won't see any difference. It would be nice to update to 2.1.4, but AppVeyor's "Visual Studio 2017" environment is only 2.0.3.
* Add DiscardUnknownFields support for C#Jon Skeet2018-01-155-56/+173
| | | | | | | By default, unknown fields are preserved when parsing. To discard them, use a parser configured to do so: var parser = MyMessage.Parser.WithDiscardUnknownFields(true);
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-032-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
| |/
* | Add auto-generated header to C# generated files (#4038)Jan Tattermusch2017-12-1321-42/+84
| | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos
* | Add unknown field support for csharp (#3936)Jie Luo2017-12-1329-306/+2947
| | | | | | Add unknown field support for csharp
* | Update generated code.Feng Xiao2017-12-121-1/+3
| |
* | Regenerated code from previous C# codegen commitJon Skeet2017-12-096-34/+34
| | | | | | | | | | | | With this in place, all tests should pass. Fixes #3725.
* | Compare floating point values bitwise in C#Jon Skeet2017-12-0910-14/+402
| | | | | | | | | | This is the manual code part of the Google.Protobuf library, and tests. Some tests will fail until codegen is changed and rerun.
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-0121-340/+970
|\ \
| * | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-301-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-022-2/+2
| | |
| * | 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-1410-41/+13
| | |
| * | 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
| | |
| * | Move C#-only test protos to csharp/protosJon Skeet2017-11-126-19/+632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#.
* | | 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-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
| |\
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 00:36:00 +0000