aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf
Commit message (Collapse)AuthorAgeFilesLines
* 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-201-2/+3
|\ \ | | | | | | Allow null value in JSON representation of ListValue
| * | Allow list values to be null when parsingJon Skeet2018-03-011-2/+3
| |/
* / Remove 64MB memory limit when deserializing messages in C#John Brock2018-01-311-3/+3
|/ | | | Increased `CodedInputStream.DefaultSizeLimit` to `Int32.MaxValue` to make it consistent with the Java implementation.
* Add DiscardUnknownFields support for C#Jon Skeet2018-01-154-56/+125
| | | | | | | 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-031-1/+1
|\
| * Merge pull request #4072 from google/jieluoJisi Liu2017-12-1920-145/+1614
| |\ | | | | | | Cherrypick for csharp, including:
| | * Cherrypick for csharp, including:Jie Luo2017-12-1920-145/+1614
| | | | | | | | | | | | | | | | | | 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-191-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-021-1/+1
| |
* | Add auto-generated header to C# generated files (#4038)Jan Tattermusch2017-12-1311-22/+44
| | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos
* | Add unknown field support for csharp (#3936)Jie Luo2017-12-1315-100/+1414
| | | | | | Add unknown field support for csharp
* | Update generated code.Feng Xiao2017-12-121-1/+3
| |
* | Regenerated code from previous C# codegen commitJon Skeet2017-12-093-8/+8
| | | | | | | | | | | | With this in place, all tests should pass. Fixes #3725.
* | Compare floating point values bitwise in C#Jon Skeet2017-12-094-14/+147
| | | | | | | | | | 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-012-2/+2
|\ \
| * | Update csharp version number (#3958)Jie Luo2017-11-291-1/+1
| | |
| * | Fix JsonTokenizer exception messageJon Skeet2017-11-291-1/+1
| | |
* | | 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-311-2/+8
| | | | | | | | | | 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-282-7/+58
| | | | | | | 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-111-1/+1
|\
| * Bump version for minor releaseJisi Liu2017-09-141-1/+1
| |
| * 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
| |
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-184-148/+319
|\|
| * Bump csharp versionJisi Liu2017-08-021-1/+1
| |
| * Merge master into 3.4.xJisi Liu2017-07-187-158/+211
| |\
| * | Update csharp and php descriptorJisi Liu2017-07-183-146/+316
| | |
* | | Detect invalid tags with a field number of 0 in C#Jon Skeet2017-08-111-2/+2
| |/ |/| | | | | | | | | | | | | 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.
* | 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-121-0/+11
| |
* | Ensure leaveOpen is true when writing to a bufferJon Skeet2017-07-041-8/+9
| | | | | | | | | | | | | | | | 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-031-7/+36
| | | | | | | | | | | | | | - 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.
* | Add IncludeSource in csproj as per review commentsJon Skeet2017-05-241-0/+1
| |
* | Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-243-84/+32
|/ | | | | | | | | | | | | | | | | This has one important packaging change: the netstandard version now depends (implicitly) on netstandard1.6.1 rather than on individual packages. This is the preferred style of dependency, and shouldn't affect any users - see http://stackoverflow.com/questions/42946951 for details. The tests are still NUnit, but NUnit doesn't support "dotnet test" yet; the test project is now an executable using NUnitLite. (When NUnit supports dotnet test, we can adapt to it.) Note that the project will now only work in Visual Studio 2017 (and Visual Studio Code, and from the command line with the .NET Core 1.0.0 SDK); Visual Studio 2015 does *not* support this project file format.