Adam Cozzette
b1216d95db
Updated checked-in generated code
2018-03-14 11:17:06 -07:00
Jon Skeet
0c52335587
Update .NET SDK to 2.0.3
...
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.
2018-01-25 19:42:15 +00:00
Jon Skeet
47b7d2c7ca
Add DiscardUnknownFields support for C#
...
By default, unknown fields are preserved when parsing. To discard
them, use a parser configured to do so:
var parser = MyMessage.Parser.WithDiscardUnknownFields(true);
2018-01-15 02:53:45 -05:00
Jisi Liu
383a4941d5
Merge remote-tracking branch 'origin/3.5.x' into master
2018-01-03 09:28:40 -08:00
Jisi Liu
d106399d39
Merge pull request #4072 from google/jieluo
...
Cherrypick for csharp, including:
2017-12-19 17:45:56 -08:00
Jie Luo
b308580bb1
Cherrypick for csharp, including:
...
Add preserve UnknownFields
Compare floating point values bitwise
Add auto-generated header to C# generated files
2017-12-19 15:38:02 -08:00
Jisi Liu
050fc9a437
Update version number to 3.5.1
2017-12-19 11:00:33 -08:00
Jan Tattermusch
426cf6f31e
Add auto-generated header to C# generated files ( #4038 )
...
* Add auto-generated header to C# generated files
* regenerate C# protos
2017-12-13 14:36:29 -08:00
Jie Luo
bfd254e14f
Add unknown field support for csharp ( #3936 )
...
Add unknown field support for csharp
2017-12-13 13:48:58 -08:00
Feng Xiao
75eceb8424
Update generated code.
2017-12-12 14:57:34 -08:00
Jon Skeet
31c54d1289
Regenerated code from previous C# codegen commit
...
With this in place, all tests should pass.
Fixes #3725 .
2017-12-09 09:49:24 +00:00
Jon Skeet
f3e9a65d75
Compare floating point values bitwise in C#
...
This is the manual code part of the Google.Protobuf library, and tests.
Some tests will fail until codegen is changed and rerun.
2017-12-09 09:49:24 +00:00
Adam Cozzette
0ba8eea655
Merge branch 'master' into down-integrate
2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7
Integrated internal changes from Google
2017-12-01 10:05:10 -08:00
Adam Cozzette
a27da09339
Merge branch '3.5.x' into 3.5.x-merge
2017-11-30 13:34:51 -08:00
Jie Luo
6d6099553b
Update csharp version number ( #3958 )
2017-11-29 16:10:44 -08:00
Jon Skeet
74f64b667c
Fix JsonTokenizer exception message
2017-11-29 07:14:57 +00:00
Jon Skeet
91ff83c024
Remove non-C# options from C#-only test protos
2017-11-14 07:31:59 +00:00
Jon Skeet
8cf53f8dfc
MMinor fix-ups to C# tests from changes in earlier commits
2017-11-12 15:29:15 +00:00
Jon Skeet
b5cdf0eac6
Regenerated test code for C#
2017-11-12 15:29:15 +00:00
Jon Skeet
aa77eab622
Move C#-only test protos to csharp/protos
...
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#.
2017-11-12 15:29:15 +00:00
Jan Tattermusch
5f96191459
ParseFrom<T> for array slice is missing
2017-11-10 09:01:32 +01:00
Jan Tattermusch
4a5e1bd043
check already performed by MergeFrom
2017-11-10 09:01:07 +01:00
Jan Tattermusch
435f61102b
allow message parsing from an array slice
2017-11-10 09:00:52 +01:00
Jan Tattermusch
30b6e54327
ParseFrom<T> for array slice is missing
2017-11-09 18:33:15 +01:00
Jan Tattermusch
07542e78da
check already performed by MergeFrom
2017-11-09 18:27:45 +01:00
Jan Tattermusch
0c874a6a19
allow message parsing from an array slice
2017-11-09 14:23:14 +01:00
Jisi Liu
97dd175a91
Update version number to 3.5.0
2017-11-02 14:16:22 -07:00
Jon Skeet
cbe250591f
Fix merging with message-valued oneof
...
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.
2017-10-31 17:11:40 -07:00
xuwei-k
05b56d01c1
update joda-time javadoc url
2017-10-30 17:48:54 +09:00
Jon Skeet
e8c9ae1209
Add parser settings WithXyz methods
2017-10-28 07:47:43 +01:00
Jon Skeet
a985451253
Add JsonParser setting to ignore unknown field values
...
Note that the default behavior is still to throw an exception; you
need to opt into ignoring unknown fields.
Fixes #2838 .
2017-10-28 07:47:43 +01:00
Jisi Liu
ecf2957106
Update descriptor protos
2017-10-18 14:21:22 -07:00
Jisi Liu
de15e73d58
Merge remote-tracking branch 'origin/3.4.x' into master
2017-10-11 14:44:03 -07:00
Jisi Liu
dba647a6b2
Bump version for minor release
2017-09-14 11:12:55 -07:00
Adam Cozzette
13fd045dbb
Integrated internal changes from Google
2017-09-14 10:03:57 -07:00
Jan Tattermusch
5de05654aa
Google.Protobuf should target net45
2017-09-12 11:56:34 +02:00
Feng Xiao
49b31dc5f7
Update C# generated file for addressbook.proto
2017-09-11 14:43:14 -07:00
Jan Tattermusch
50a64759dd
Google.Protobuf should target net45
2017-09-05 17:59:03 +02:00
Paul Yang
2807436cd8
change the field number of php_generic_service to fix the conflict with ( #3576 )
...
internal descriptor.proto
2017-08-30 16:50:07 -07:00
Jisi Liu
139775ccc0
Merge remote-tracking branch 'origin/3.4.x' into mergemaster
2017-08-18 16:25:35 -07:00
Jon Skeet
e0d24cc84a
Detect invalid tags with a field number of 0 in C#
...
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.
2017-08-11 19:33:53 +01:00
Bo Yang
8f4b8e430a
Merge branch 'master' into 3.4.x
2017-08-05 10:42:29 -07:00
Jisi Liu
6c64f11778
Bump csharp version
2017-08-02 13:20:13 -07:00
Thomas Van Lenten
9a4692d8af
Update the comment on the message_type to cover what it should be.
2017-07-26 17:07:01 -04:00
Jisi Liu
759245a49a
Merge from master
2017-07-25 11:52:33 -07:00
Jisi Liu
7bb39bef1a
Update version number for 3.4.0
2017-07-24 16:03:49 -07:00
Yilun Chong
a713b73076
Merge pull request #3281 from BSBandme/ConformanceTestYilunChong
...
Proto2 test message support to conformance test
2017-07-24 14:50:52 -07:00
Paul Yang
50aa4febaf
Merge pull request #3375 from TeBoring/3.3.x
...
Merge 3.3.x into master
2017-07-19 06:58:05 -07:00
Jisi Liu
3af881c7e2
Merge master into 3.4.x
2017-07-18 16:26:16 -07:00
