aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf/WellKnownTypes
Commit message (Collapse)AuthorAgeFilesLines
* Cherrypick for csharp, including:Jie Luo2017-12-1910-78/+410
| | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
* 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
|
* Update descriptor protosJisi Liu2017-10-181-0/+6
|
* Merge master into 3.4.xJisi Liu2017-07-181-7/+36
|\
| * 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.
* | Update csharp and php descriptorJisi Liu2017-07-182-21/+39
|/
* Fix C++ build for down-integration.Feng Xiao2017-03-292-1/+39
|
* Fixes for .NET 3.5 compatibilityJohn Brock2017-02-231-1/+1
| | | | | * Changing DOTNET35 framework symbols in preprocessor directives to the default built-in value of NET35. * Adding extension method StreamExtension.CopyTo for .NET 3.5 because it didn’t exist until .NET 4, and adding associated unit tests.
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* remove leading whitespace in C# xml commentsJan Tattermusch2016-12-1210-577/+577
|
* Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-224-11/+16
| | | | | | This seems to be necessary to prevent warnings in some compiler configurations, particularly for tag numbers that are too large to fit in a signed 32-bit int.
* Change JSON field name formattingJon Skeet2016-11-031-5/+5
| | | | | | | | | This affects cases with leading capital letters. This breaks compatibility with previous C# releases, but fixes compatibility with other implementations. See #2278 for details.
* Bump library veriosn to 3.1Bo Yang2016-10-1010-34/+38
|
* Changes to generated code from previous commitJon Skeet2016-07-0410-41/+500
|
* Adding conditional compiler symbol to support .NET 3.5 (#1713)detlevschwabe2016-06-282-4/+5
| | | | * Adding condition compiler symbol to support .NET 3.5
* Merge pull request #1471 from jskeet/any-hostJon Skeet2016-05-061-10/+38
|\ | | | | Allow custom type URL prefixes in Any.Pack
| * Allow custom type URL prefixes in Any.PackJon Skeet2016-04-291-10/+38
| | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459.
* | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-282-1/+3
|/
* Regenerate well-known types for C#Jon Skeet2016-04-207-24/+84
| | | | | (There are documentation changes and new fields in descriptor.proto that have resulted in changes to the serialized descriptor, but no breaking changes for C#.)
* Regenerate all C# code and make it compileJon Skeet2016-04-203-57/+57
| | | | JSON tests fail, as we're not using OriginalNameAttribute yet.
* Replace StringBuilder with TextWriter in JsonFormatteravgweb2016-03-061-8/+9
|
* Generated code changes from previous commitJon Skeet2016-02-046-21/+21
|
* Rename Preconditions to ProtoPreconditionsJon Skeet2016-02-044-15/+15
| | | | (Generated code changes in next commit.)
* Generated code for GeneratedCodeInfo changeJon Skeet2016-02-0410-36/+36
|
* Ensure that FieldMask, Timestamp and Duration ToString() calls don't throwJon Skeet2016-01-203-9/+273
| | | | | | | | | | | | | The usage of ICustomDiagnosticMessage here is non-essential - ToDiagnosticString doesn't actually get called by ToString() in this case, due to JsonFormatter code. It was intended to make it clearer that it *did* have a custom format... but then arguably I should do the same for Value, Struct, Any etc. Moving some of the code out of JsonFormatter and into Duration/Timestamp/FieldMask likewise feels somewhat nice, somewhat nasty... basically there are JSON-specific bits of formatting, but also domain-specific bits of computation. <sigh> Thoughts welcome.
* Fixes to JSON timestamp/duration representationsJon Skeet2016-01-152-3/+42
|
* Prohibit null values in map fieldsJon Skeet2016-01-117-64/+96
| | | | | On deserialization, missing values for message types are replaced with a "default" message.
* Generated code changes from previous commit.Jon Skeet2015-12-1510-26/+26
|
* Generated code changes for previous commit (basically ↵Jon Skeet2015-11-2210-10/+10
| | | | InternalBuildGeneratedFileFrom => FromGeneratedCode)
* Generated code from previous commit.Jon Skeet2015-11-1910-26/+26
|
* Generated code changes and manual changes for previous commit.Jon Skeet2015-11-0911-340/+313
|
* Generated code for previous commit.Jon Skeet2015-11-068-0/+88
|
* Implement JSON parsing in C#.Jon Skeet2015-11-034-0/+153
| | | | | | | | | | This includes all the well-known types except Any. Some aspects are likely to require further work when the details of the JSON parsing expectations are hammered out in more detail. Some of these have "ignored" tests already. Note that the choice *not* to use Json.NET was made for two reasons: - Going from 0 dependencies to 1 dependency is a big hit, and there's not much benefit here - Json.NET parses more leniently than we'd want; accommodating that would be nearly as much work as writing the tokenizer This only really affects the JsonTokenizer, which could be replaced by Json.NET. The JsonParser code would be about the same length with Json.NET... but I wouldn't be as confident in it.
* Generated code for previous commit (oneof case contributing to hash code and ↵Jon Skeet2015-10-241-0/+2
| | | | equality).
* Generated code from previous commit.Jon Skeet2015-10-0110-0/+758
|
* Fix typo in oneof case enum commentJon Skeet2015-09-301-1/+1
|
* Generated code changes for previous commit.Jon Skeet2015-09-2910-11/+11
|
* Generated code for previous commitJon Skeet2015-09-2910-0/+22
|
* Merge pull request #785 from jskeet/csharp-directoriesJan Tattermusch2015-09-2310-96/+388
|\ | | | | Generate C# directory hierarchy with new option
| * Regenerated code. Most changes are whitespace, removing trailing spaces.Jon Skeet2015-09-0110-96/+388
| | | | | | | | Other changes are due to the well-known types changing without us regenerating.
* | Pack/Unpack implementation for Any.Jon Skeet2015-09-041-0/+79
|/ | | | | We still need the JSON representation, which relies on something like a DescriptorPool to fetch message types from based on the type URL. That will come a bit later. (The DescriptorPool comment in this commit is just a note which will prove useful if we use DescriptorPool itself.)
* Generated code for previous commit.Jon Skeet2015-08-0610-100/+25
|
* Generated code changes for previous commit.Jon Skeet2015-08-0510-75/+25
|
* Generated code changes for previous commit.Jon Skeet2015-08-0510-0/+25
|
* Document everything, and turn on errors if we fail to document anything in ↵Jon Skeet2015-08-043-2/+30
| | | | the future.
* Format JSON for Duration and Timestamp.Jon Skeet2015-08-031-1/+1
| | | | This is taking an approach of putting all the logic in JsonFormatter. That's helpful in terms of concealing the details of whether or not to wrap the value in quotes, but it does lack flexibility. I don't *think* we want to allow user-defined formatting of messages, so that much shouldn't be a problem.
* Well-known type operations for Timestamp and Duration (but not JSON formatting).Jon Skeet2015-07-313-0/+370
| | | | | While I've provided operators, I haven't yet provided the method equivalents. It's not clear to me that they're actually a good idea, while we're really targeting C# developers who definitely *can* use the user-defined operators.
* Generated code for previous commit.Jon Skeet2015-07-306-17/+17
|
* Generated code from previous commit.Jon Skeet2015-07-3010-75/+0
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 01:42:22 +0000