AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,520 Commits 35 Branches 138 Tags 124 MiB
1a57ad8b41
Commit Graph

2520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Paul Yang
bfbf35da9e Merge pull request #643 from yukawa/fix_win_unicode_build 
Fix build failure on Windows when Unicode build is enabled.
 2015-07-31 11:36:51 -07:00
Jan Tattermusch
abd7083b0c Merge pull request #667 from jskeet/fix-field-orderings 
Fix trivial bug in field orderings.
 2015-07-31 11:29:07 -07:00
Jon Skeet
6cf5f660e5 Simplify the JSON tests for readability 
Use ' instead of " in the expected JSON, then replace it before asserting.
 2015-07-31 10:46:24 +01:00
Jon Skeet
4fed0b515f Fix JSON formatting to always emit fields in field order, including oneofs 2015-07-31 10:34:20 +01:00
Jon Skeet
fd02e45b2a Fix trivial bug in field orderings. 
(Shows the benefit of unit testing even code "too simple to fail"...)
 2015-07-31 10:34:04 +01:00
Jon Skeet
c20f67fdb4 Merge pull request #666 from jskeet/wkt-times 
Well-known type operations for Timestamp and Duration
 2015-07-31 10:12:52 +01:00
Jon Skeet
9629797331 Well-known type operations for Timestamp and Duration (but not JSON formatting). 
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.
 2015-07-31 08:14:11 +01:00
Jon Skeet
5bdb1fb311 Merge pull request #665 from jskeet/types_field 
Handle field names of "descriptor" and "types".
 2015-07-31 08:13:47 +01:00
Jon Skeet
f994cfe808 Handle field names of "descriptor" and "types". 2015-07-31 07:00:25 +01:00
Yohei Yukawa
8c27eea686 Fix build failure on Windows when Unicode build is enabled. 
This is a follow up CL for e9abc404df,
which breaks build when UNICODE macro is defined.

protoc has explicitly called MBCS version of APIs / funcsions
rather than UTF-16 (wchar_t) version of them regardless of
UNICODE macro definition (and it indeed works as expected).
Hence it makes sense to call GetModuleFileNameA explicitly.
 2015-07-30 18:10:17 -07:00
Jan Tattermusch
b193503aa7 Merge pull request #664 from jtattermusch/expose_umbrella_class_name2 
Expose GetUmbrellaClassName in csharp_names.h
 2015-07-30 16:40:23 -07:00
Jan Tattermusch
43a2dee708 refactor umbrella class helpers 2015-07-30 14:54:09 -07:00
Jan Tattermusch
12febd0a76 Merge pull request #632 from google/csharp-experimental 
Merge C# proto3 from csharp-experimental to master
 2015-07-30 14:51:11 -07:00
Jan Tattermusch
bde01d5326 Merge pull request #660 from jskeet/throw-on-null 
Throw on null for string/bytes single fields
 2015-07-30 11:49:27 -07:00
Tom Hughes
c6095505dc Move pthread include. 
Based on pull request feedback. See commit 60c5222 for why the pthread
header is necessary.
 2015-07-30 09:30:31 -07:00