organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
2538 commits 28 branches 36 tags 41 MiB
Commit graph

2538 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jon Skeet
c671095e91 Address review comments. 2015-08-08 07:26:26 +01:00
Jon Skeet
889b88a29f Remove reference to generic types within XML comment. 
Visual Studio is happy with it, but Mono isn't :(
 2015-08-08 07:25:29 +01:00
Jon Skeet
6f300442bc Tidying up - fix a bunch of TODOs and remove outdated ones. 2015-08-08 07:25:28 +01:00
Jon Skeet
cac4531323 Merge pull request #694 from jskeet/groups 
Fix groups handling in C#
 2015-08-08 07:24:57 +01:00
Jon Skeet
6e16037c99 Address review comments. 2015-08-08 07:24:28 +01:00
Paul Yang
b76b76ba4f Merge pull request #645 from zsurocking/master 
Down integrate. Generate a package name suffix ".nano" for nano messages
 2015-08-06 18:12:35 -07:00
Paul Yang
914e6ace03 Merge pull request #696 from TeBoring/temp 
Remove unused .pb.h #includes.
 2015-08-06 17:46:15 -07:00
Bo Yang
5e47a68b32 Remove unused .pb.h #includes. 2015-08-06 11:23:50 -07:00
Jon Skeet
5bdc57292f Generated code for previous commit. 2015-08-06 11:40:43 +01:00
Jon Skeet
e7f88ff129 Skip groups properly. 
Now the generated code doesn't need to check for end group tags, as it will skip whole groups at a time.
Currently it will ignore extraneous end group tags, which may or may not be a good thing.
Renamed ConsumeLastField to SkipLastField as it felt more natural.
Removed WireFormat.IsEndGroupTag as it's no longer useful.

This mostly fixes issue 688.

(Generated code changes coming in next commit.)
 2015-08-06 11:40:32 +01:00
Jan Tattermusch
ad8a889d1e Merge pull request #692 from jskeet/tag-0 
Change ReadTag/PeekTag behaviour to return 0 at EOF
 2015-08-05 17:16:13 -07:00
Jon Skeet
38032688a7 Make InvalidProtocolBufferException.InvalidTag internal. 
We don't need to expose the InvalidProtocolBufferException factory method now that the generated code doesn't throw the exception.
 2015-08-05 17:48:53 +01:00
Jon Skeet
1a57ad8b41 Generated code changes for previous commit. 2015-08-05 11:23:52 +01:00
Jon Skeet
ff334a60eb Change ReadTag and PeekTag to just use 0 as a return value for "end of stream", rather than using an awkward out parameter. 
This simplifies quite a lot of code.

Generated code in next commit.
 2015-08-05 11:23:38 +01:00
Jon Skeet
607940321c Merge pull request #689 from jskeet/fix-eof 
C# conformance tests
 2015-08-05 09:11:25 +01:00
Jon Skeet
c13a612dc4 Update AssemblyInfo for conformance - mostly to fix version numbers. 2015-08-05 07:09:43 +01:00
Jon Skeet
15bf55e225 Validate that after reading a message, we've consumed as many bytes as we expected to. 
We should now have no conformance failures.
 2015-08-05 07:09:43 +01:00
Jon Skeet
fe355b26ec Generated code changes for previous commit. 2015-08-05 07:09:42 +01:00
Jon Skeet
9df2defa29 Consume unknown fields when parsing. 
This is expected to be the cause of the conformance test failures.
Generated code in next commit.
 2015-08-05 07:09:41 +01:00
Jon Skeet
b6defa7c11 Added C# conformance tests. 
The tests are run from Travis in the same way as on other
platforms. Currently some expected failures - but only expected
in that they're what we got to start with. Will try to fix them in
other pull requests.
 2015-08-05 07:09:40 +01:00
Jon Skeet
044c36ebef First pass at C# conformance tests. 
Completely untested so far - easier to get started in VS and then transfer to Linux for tweaking...
 2015-08-05 07:09:39 +01:00
Jon Skeet
d77d70d227 Merge pull request #691 from jskeet/xml-documentation 
Document everything, and turn on errors if we fail to document anything in the future
 2015-08-05 07:09:17 +01:00
Jon Skeet
30e8157550 Fix one cref that Mono was unhappy with 2015-08-05 06:39:43 +01:00
Jan Tattermusch
95910f1c7d Merge pull request #684 from jskeet/unused 
Fix build warnings around unused variables
 2015-08-04 16:04:25 -07:00
Xiao Hang
9fd0f1526f Merge remote-tracking branch 'upstream/master' 2015-08-04 15:07:44 -07:00
Xiao Hang
f5a3abc204 Merge branch 'master' of https://github.com/zsurocking/protobuf 2015-08-04 14:32:13 -07:00
Xiao Hang
ebcd51ce0f Merge branch 'master' of https://github.com/zsurocking/protobuf 2015-08-04 14:30:39 -07:00
Jon Skeet
811fc89f0e Document everything, and turn on errors if we fail to document anything in the future. 2015-08-04 15:58:39 +01:00
Jon Skeet
99a81d297c Fix build warnings around unused variables 2015-08-04 07:10:36 +01:00
Feng Xiao
dc80689af3 Merge pull request #653 from airtimemedia/master 
Various compilation fixes
 2015-08-03 10:19:32 -07:00
Jon Skeet
b59bfcb309 Merge pull request #681 from jskeet/json-fieldmask 
JSON formatting for FieldMask
 2015-08-03 17:32:28 +01:00
Jon Skeet
8136ad5c3c Merge pull request #677 from jskeet/move-protos 
Remove a redundant layer of directory hierarchy.
 2015-08-03 15:19:50 +01:00
Jon Skeet
415f72e079 Merge pull request #680 from jskeet/aptca 
Allow partially-trusted callers again.
 2015-08-03 14:05:52 +01:00
Jon Skeet
0e30de3d6b JSON formatting for FieldMask 2015-08-03 14:03:11 +01:00
Jon Skeet
db9f47a3ed Merge pull request #678 from jskeet/stream-ctor 
Expose Coded*Stream constructors directly.
 2015-08-03 14:02:44 +01:00
Jon Skeet
0e0e0c97e7 Expose Coded*Stream constructors directly. 2015-08-03 11:30:15 +01:00
Jon Skeet
0f370b468b Remove a redundant layer of directory hierarchy. 2015-08-03 11:29:59 +01:00
Jon Skeet
e94bdd9303 Allow partially-trusted callers again. 
Fixes issue #552. (And yay, it looks like our build profile supports this...)
 2015-08-03 11:24:17 +01:00
Jon Skeet
bf1cc9217a Merge pull request #675 from jtattermusch/signing 
Add ReleaseSigned configuration for C#
 2015-08-03 11:16:31 +01:00
Jon Skeet
da776fbd1e Merge pull request #672 from jskeet/json-struct 
Formatting of Struct as JSON
 2015-08-03 10:56:24 +01:00
Jon Skeet
e7caf15577 Initial pass at formatting Struct as JSON. 
This seems remarkably little code, but it appears to work. I can add tests for invalid structs at some point, once the general approach is approved.
 2015-08-03 09:32:36 +01:00
Jon Skeet
115e6c735e Merge pull request #671 from jskeet/json-time 
JSON formatting for Timestamp and Duration
 2015-08-03 09:31:19 +01:00
Jon Skeet
801b169bce Addressed issues raised in code review. Will merge when green. 2015-08-03 09:26:05 +01:00
Jon Skeet
16e272e0c4 Format JSON for Duration and Timestamp. 
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.
 2015-08-03 09:26:04 +01:00
Jan Tattermusch
e61b528b5a Update Makefile.am 2015-08-02 14:27:01 -07:00
Jan Tattermusch
d331d2f60f make changes and fixes in signing 2015-08-02 01:24:27 -07:00
Jan Tattermusch
0df900f0dc added protoc.exe and well known protobuf files to the nuspec file 2015-08-02 01:20:42 -07:00
Jan Tattermusch
538ef54f1e build signed assemblies 2015-08-02 01:20:40 -07:00
Jan Tattermusch
80f89b4ecf Merge pull request #669 from jskeet/simpify-json-tests 
Simpify json tests
 2015-08-01 13:34:14 -07:00
Jan Tattermusch
82aa6bbdfc Merge pull request #668 from jskeet/json_ordering 
Fix C# JSON field ordering
 2015-08-01 13:30:07 -07:00