Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix to allow AOT compilers to play nicely with reflection | Jon Skeet | 2018-04-27 | 2 | -18/+47 |
| | | | | | | | | | | | | | | | | | | | With this fix, Unity using IL2CPP should work with one of two approaches: - Call `FileDescriptor.ForceReflectionInitialization<T>` for every enum present in generated code (including oneof case enums) - Ensure that IL2CPP uses the same code for int and any int-based enums The former approach is likely to be simpler, unless IL2CPP changes its default behavior. We *could* potentially generate the code automatically, but that makes me slightly uncomfortable in terms of generating code that's only relevant in one specific scenario. It would be reasonably easy to write a tool (separate from protoc) to generate the code required for any specific set of assemblies, so that Unity users can include it in their application. We can always decide to change to generate it automatically later. | ||||
* | Write messages to backing field in generated C# cloning code (#4440) | Sydney Acksman | 2018-04-19 | 10 | -52/+52 |
| | | | | | | * Edited MessageFieldGenerator to clone to backing field instead of property * Generated C# proto code | ||||
* | Deliberately call simple code to avoid Unity linker pruning | Jon Skeet | 2018-04-06 | 1 | -0/+19 |
| | | | | | | | | | The SampleEnumMethod method was previously only called via reflection, so the Unity linker thought it could be removed. Ditto the parameterless constructor in ReflectionHelper. This PR should avoid that issue, reducing the work needed by customers to use Google.Protobuf from Unity. | ||||
* | Merge pull request #4283 from ObsidianMinor/csharp/better-test-runners | Feng Xiao | 2018-04-04 | 2 | -52/+4 |
|\ | | | | | [C#] Update test project to be used with dotnet test and Visual Studio Test Explorer | ||||
| * | Updated NUnit packages, removed NUnitLite added packages for dotnet and ↵ | ObsidianMinor | 2018-02-06 | 2 | -52/+4 |
| | | | | | | | | Visual Studio, changed dotnet command in buildall to dotnet test, and deleted Program.cs (because it's no longer required). | ||||
* | | Merge branch (#4466) | Paul Yang | 2018-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits | ||||
* | | Address review comments | Jon Skeet | 2018-03-27 | 1 | -5/+13 |
| | | |||||
* | | Work around an "old runtime" issue with reflection | Jon Skeet | 2018-03-27 | 1 | -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 creation | Jon Skeet | 2018-03-27 | 2 | -0/+51 |
| | | |||||
* | | Change C# reflection to avoid using expression trees | Jon Skeet | 2018-03-27 | 2 | -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-integrate | Adam Cozzette | 2018-03-20 | 1 | -2/+2 |
|\ \ | | | | | | | Integrated internal changes from Google | ||||
| * | | Updated checked-in generated code | Adam Cozzette | 2018-03-14 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #4345 from jskeet/list-json-null | Feng Xiao | 2018-03-20 | 2 | -2/+19 |
|\ \ | | | | | | | Allow null value in JSON representation of ListValue | ||||
| * | | Allow list values to be null when parsing | Jon Skeet | 2018-03-01 | 2 | -2/+19 |
| |/ | |||||
* / | Remove 64MB memory limit when deserializing messages in C# | John Brock | 2018-01-31 | 2 | -3/+86 |
|/ | | | | Increased `CodedInputStream.DefaultSizeLimit` to `Int32.MaxValue` to make it consistent with the Java implementation. | ||||
* | Add DiscardUnknownFields support for C# | Jon Skeet | 2018-01-15 | 5 | -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 master | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #4072 from google/jieluo | Jisi Liu | 2017-12-19 | 41 | -691/+3803 |
| |\ | | | | | | | Cherrypick for csharp, including: | ||||
| | * | Cherrypick for csharp, including: | Jie Luo | 2017-12-19 | 41 | -691/+3803 |
| | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files | ||||
| * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| |/ | |||||
| * | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-10 | 1 | -0/+14 |
| | | |||||
| * | check already performed by MergeFrom | Jan Tattermusch | 2017-11-10 | 1 | -5/+0 |
| | | |||||
| * | allow message parsing from an array slice | Jan Tattermusch | 2017-11-10 | 2 | -0/+31 |
| | | |||||
| * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 1 | -1/+1 |
| | | |||||
* | | Add auto-generated header to C# generated files (#4038) | Jan Tattermusch | 2017-12-13 | 21 | -42/+84 |
| | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos | ||||
* | | Add unknown field support for csharp (#3936) | Jie Luo | 2017-12-13 | 27 | -301/+2939 |
| | | | | | | Add unknown field support for csharp | ||||
* | | Update generated code. | Feng Xiao | 2017-12-12 | 1 | -1/+3 |
| | | |||||
* | | Regenerated code from previous C# codegen commit | Jon Skeet | 2017-12-09 | 6 | -34/+34 |
| | | | | | | | | | | | | With this in place, all tests should pass. Fixes #3725. | ||||
* | | Compare floating point values bitwise in C# | Jon Skeet | 2017-12-09 | 10 | -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-integrate | Adam Cozzette | 2017-12-01 | 13 | -319/+363 |
|\ \ | |||||
| * | | Update csharp version number (#3958) | Jie Luo | 2017-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Fix JsonTokenizer exception message | Jon Skeet | 2017-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Remove non-C# options from C#-only test protos | Jon Skeet | 2017-11-14 | 5 | -10/+9 |
| | | | |||||
| * | | MMinor fix-ups to C# tests from changes in earlier commits | Jon Skeet | 2017-11-12 | 4 | -20/+30 |
| | | | |||||
| * | | Regenerated test code for C# | Jon Skeet | 2017-11-12 | 6 | -295/+330 |
| | | | |||||
* | | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 2 | -10/+15 |
|/ / | |||||
* | | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-09 | 1 | -0/+14 |
| | | |||||
* | | check already performed by MergeFrom | Jan Tattermusch | 2017-11-09 | 1 | -5/+0 |
| | | |||||
* | | allow message parsing from an array slice | Jan Tattermusch | 2017-11-09 | 2 | -0/+31 |
|/ | |||||
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 3 | -9/+372 |
| | | | | | | | | | | 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 url | xuwei-k | 2017-10-30 | 1 | -1/+1 |
| | |||||
* | Add parser settings WithXyz methods | Jon Skeet | 2017-10-28 | 1 | -0/+17 |
| | |||||
* | Add JsonParser setting to ignore unknown field values | Jon Skeet | 2017-10-28 | 4 | -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 protos | Jisi Liu | 2017-10-18 | 2 | -1/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 1 | -1/+1 |
|\ | |||||
| * | Bump version for minor release | Jisi Liu | 2017-09-14 | 1 | -1/+1 |
| | | |||||
| * | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-05 | 1 | -1/+1 |
| | | |||||
| * | change the field number of php_generic_service to fix the conflict with (#3576) | Paul Yang | 2017-08-30 | 1 | -10/+10 |
| | | | | | | internal descriptor.proto | ||||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 1 | -90/+308 |
| | | |||||
* | | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-12 | 1 | -1/+1 |
| | |