Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | 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 |
| | |||||
* | 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 |
| | | |||||
* | | Update C# generated file for addressbook.proto | Feng Xiao | 2017-09-11 | 1 | -11/+47 |
| | | |||||
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 4 | -148/+319 |
|\| | |||||
| * | Merge branch 'master' into 3.4.x | Bo Yang | 2017-08-05 | 2 | -4/+6 |
| |\ | |||||
| * | | Bump csharp version | Jisi Liu | 2017-08-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge from master | Jisi Liu | 2017-07-25 | 3 | -226/+274 |
| | | | |||||
| * | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 27 | -360/+398 |
| |\ \ | |||||
| * | | | Update csharp and php descriptor | Jisi Liu | 2017-07-18 | 3 | -146/+316 |
| | | | | |||||
* | | | | Detect invalid tags with a field number of 0 in C# | Jon Skeet | 2017-08-11 | 2 | -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 Lenten | 2017-07-26 | 2 | -4/+6 |
| | | | |||||
* | | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChong | Yilun Chong | 2017-07-24 | 3 | -226/+274 |
|\ \ \ | |_|/ |/| | | Proto2 test message support to conformance test | ||||
| * | | delete backup files | Yilun Chong | 2017-07-05 | 1 | -155/+0 |
| | | | |||||
| * | | fix php failing list and csharp generated proto | Yilun Chong | 2017-07-05 | 2 | -211/+370 |
| | | | |||||
| * | | add some test proto2 supported, add js proto2 supported, fixed some error | Yilun Chong | 2017-06-30 | 1 | -5/+5 |
| | | | |||||
| * | | change php objc nodejs csharp ruby | Yilun Chong | 2017-06-29 | 1 | -16/+15 |
| | | | |||||
| * | | fix csharp conformance test | Yilun Chong | 2017-06-28 | 1 | -1/+1 |
| | | | |||||
| * | | fix csharp conformance test | Yilun Chong | 2017-06-28 | 1 | -16/+16 |
| | | | |||||
| * | | fix csharp | Yilun Chong | 2017-06-28 | 1 | -15/+15 |
| | | | |||||
| * | | add csharp support | Yilun Chong | 2017-06-28 | 2 | -12/+57 |
| | | | |||||
* | | | Support PHP generic services (#3269) | Matt A | 2017-07-18 | 1 | -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 file | Jon Skeet | 2017-07-13 | 1 | -1/+1 |
| | | | |||||
* | | | C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V> | Jean-Rémy Bancel | 2017-07-12 | 2 | -0/+27 |
| | | | |||||
* | | | Ensure leaveOpen is true when writing to a buffer | Jon Skeet | 2017-07-04 | 3 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 Skeet | 2017-07-03 | 2 | -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 Yang | 2017-06-05 | 1 | -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 error | John Brock | 2017-05-25 | 1 | -1/+5 |
| | | |||||
* | | Add IncludeSource in csproj as per review comments | Jon Skeet | 2017-05-24 | 1 | -0/+1 |
| | | |||||
* | | Convert C# projects to MSBuild (csproj) format | Jon Skeet | 2017-05-24 | 19 | -284/+155 |
|/ | | | | | | | | | | | | | | | | | 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. | ||||
* | Update version number and changelog for 3.3.0 | Feng Xiao | 2017-04-05 | 1 | -1/+1 |
| | |||||
* | Fix C++ build for down-integration. | Feng Xiao | 2017-03-29 | 3 | -47/+86 |
| | |||||
* | Merge pull request #2884 from anandolee/master | Jie Luo | 2017-03-27 | 3 | -19/+78 |
|\ | | | | | Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options. | ||||
| * | Add FormatEnumAsInt support for Json Format. And scale ↵ | Jie Luo | 2017-03-24 | 3 | -19/+78 |
| | | | | | | | | JsonFormatter.Settings to multiple options. | ||||
* | | Add file option php_class_prefix (#2849) | Paul Yang | 2017-03-17 | 1 | -56/+88 |
|/ | | | | This option will be prepended to generated classes of all messages in the containing file. | ||||
* | There might be duplicated enum values when allow_alias is true. Add ↵ | Jie Luo | 2017-02-28 | 4 | -90/+234 |
| | | | | PreferredAlias into OriginalNameAttribute to remove the duplication (#2727) | ||||
* | Upgrading test-related libraries | John Brock | 2017-02-23 | 1 | -2/+2 |
| | | | | | NUnit 3.4.0 —> 3.6.0 dotnet-test-nunit 3.4.0-alpha-2 —> 3.4.0-beta-3 |