Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #694 from jskeet/groups | Jon Skeet | 2015-08-08 |
|\ | | | | | Fix groups handling in C# | ||
| * | Address review comments. | Jon Skeet | 2015-08-08 |
| | | |||
* | | Merge pull request #645 from zsurocking/master | Paul Yang | 2015-08-06 |
|\ \ | | | | | | | Down integrate. Generate a package name suffix ".nano" for nano messages | ||
* \ \ | Merge pull request #696 from TeBoring/temp | Paul Yang | 2015-08-06 |
|\ \ \ | | | | | | | | | Remove unused .pb.h #includes. | ||
| * | | | Remove unused .pb.h #includes. | Bo Yang | 2015-08-06 |
|/ / / | |||
| | * | Generated code for previous commit. | Jon Skeet | 2015-08-06 |
| | | | |||
| | * | Skip groups properly. | Jon Skeet | 2015-08-06 |
| |/ |/| | | | | | | | | | | | | | | | | | | | 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.) | ||
* | | Merge pull request #692 from jskeet/tag-0 | Jan Tattermusch | 2015-08-05 |
|\ \ | | | | | | | Change ReadTag/PeekTag behaviour to return 0 at EOF | ||
| * | | Make InvalidProtocolBufferException.InvalidTag internal. | Jon Skeet | 2015-08-05 |
| | | | | | | | | | | | | We don't need to expose the InvalidProtocolBufferException factory method now that the generated code doesn't throw the exception. | ||
| * | | Generated code changes for previous commit. | Jon Skeet | 2015-08-05 |
| | | | |||
| * | | Change ReadTag and PeekTag to just use 0 as a return value for "end of ↵ | Jon Skeet | 2015-08-05 |
|/ / | | | | | | | | | | | | | | | stream", rather than using an awkward out parameter. This simplifies quite a lot of code. Generated code in next commit. | ||
* | | Merge pull request #689 from jskeet/fix-eof | Jon Skeet | 2015-08-05 |
|\ \ | | | | | | | C# conformance tests | ||
| * | | Update AssemblyInfo for conformance - mostly to fix version numbers. | Jon Skeet | 2015-08-05 |
| | | | |||
| * | | Validate that after reading a message, we've consumed as many bytes as we ↵ | Jon Skeet | 2015-08-05 |
| | | | | | | | | | | | | | | | | | | expected to. We should now have no conformance failures. | ||
| * | | Generated code changes for previous commit. | Jon Skeet | 2015-08-05 |
| | | | |||
| * | | Consume unknown fields when parsing. | Jon Skeet | 2015-08-05 |
| | | | | | | | | | | | | | | | This is expected to be the cause of the conformance test failures. Generated code in next commit. | ||
| * | | Added C# conformance tests. | Jon Skeet | 2015-08-05 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||
| * | | First pass at C# conformance tests. | Jon Skeet | 2015-08-05 |
|/ / | | | | | | | Completely untested so far - easier to get started in VS and then transfer to Linux for tweaking... | ||
* | | Merge pull request #691 from jskeet/xml-documentation | Jon Skeet | 2015-08-05 |
|\ \ | | | | | | | Document everything, and turn on errors if we fail to document anything in the future | ||
| * | | Fix one cref that Mono was unhappy with | Jon Skeet | 2015-08-05 |
| | | | |||
* | | | Merge pull request #684 from jskeet/unused | Jan Tattermusch | 2015-08-04 |
|\ \ \ | | | | | | | | | Fix build warnings around unused variables | ||
| | | * | Merge remote-tracking branch 'upstream/master' | Xiao Hang | 2015-08-04 |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-08-04 |
| | | |\ | |||
| | | * \ | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-08-04 |
| | | |\ \ | |||
| | * | | | | Document everything, and turn on errors if we fail to document anything in ↵ | Jon Skeet | 2015-08-04 |
| |/ / / / |/| | | | | | | | | | | | | | | the future. | ||
| * | | | | Fix build warnings around unused variables | Jon Skeet | 2015-08-04 |
|/ / / / | |||
* | | | | Merge pull request #653 from airtimemedia/master | Feng Xiao | 2015-08-03 |
|\ \ \ \ | | | | | | | | | | | Various compilation fixes | ||
* \ \ \ \ | Merge pull request #681 from jskeet/json-fieldmask | Jon Skeet | 2015-08-03 |
|\ \ \ \ \ | | | | | | | | | | | | | JSON formatting for FieldMask | ||
* \ \ \ \ \ | Merge pull request #677 from jskeet/move-protos | Jon Skeet | 2015-08-03 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove a redundant layer of directory hierarchy. | ||
* \ \ \ \ \ \ | Merge pull request #680 from jskeet/aptca | Jon Skeet | 2015-08-03 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow partially-trusted callers again. | ||
| | | * | | | | | JSON formatting for FieldMask | Jon Skeet | 2015-08-03 |
| |_|/ / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #678 from jskeet/stream-ctor | Jon Skeet | 2015-08-03 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Expose Coded*Stream constructors directly. | ||
| * | | | | | | | Expose Coded*Stream constructors directly. | Jon Skeet | 2015-08-03 |
|/ / / / / / / | |||
| | * / / / / | Remove a redundant layer of directory hierarchy. | Jon Skeet | 2015-08-03 |
| |/ / / / / |/| | | | | | |||
| * | | | | | Allow partially-trusted callers again. | Jon Skeet | 2015-08-03 |
|/ / / / / | | | | | | | | | | | | | | | | Fixes issue #552. (And yay, it looks like our build profile supports this...) | ||
* | | | | | Merge pull request #675 from jtattermusch/signing | Jon Skeet | 2015-08-03 |
|\ \ \ \ \ | | | | | | | | | | | | | Add ReleaseSigned configuration for C# | ||
* \ \ \ \ \ | Merge pull request #672 from jskeet/json-struct | Jon Skeet | 2015-08-03 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Formatting of Struct as JSON | ||
| * | | | | | | Initial pass at formatting Struct as JSON. | Jon Skeet | 2015-08-03 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | 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. | ||
* | | | | | | Merge pull request #671 from jskeet/json-time | Jon Skeet | 2015-08-03 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | JSON formatting for Timestamp and Duration | ||
| * | | | | | | Addressed issues raised in code review. Will merge when green. | Jon Skeet | 2015-08-03 |
| | | | | | | | |||
| * | | | | | | Format JSON for Duration and Timestamp. | Jon Skeet | 2015-08-03 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | 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. | ||
| * | | | | | Update Makefile.am | Jan Tattermusch | 2015-08-02 |
| | | | | | | |||
| * | | | | | make changes and fixes in signing | Jan Tattermusch | 2015-08-02 |
| | | | | | | |||
| * | | | | | added protoc.exe and well known protobuf files to the nuspec file | Jan Tattermusch | 2015-08-02 |
| | | | | | | |||
| * | | | | | build signed assemblies | Jan Tattermusch | 2015-08-02 |
|/ / / / / | |||
* | | | | | Merge pull request #669 from jskeet/simpify-json-tests | Jan Tattermusch | 2015-08-01 |
|\ \ \ \ \ | | | | | | | | | | | | | Simpify json tests | ||
* \ \ \ \ \ | Merge pull request #668 from jskeet/json_ordering | Jan Tattermusch | 2015-08-01 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix C# JSON field ordering | ||
* \ \ \ \ \ \ | Merge pull request #643 from yukawa/fix_win_unicode_build | Paul Yang | 2015-07-31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix build failure on Windows when Unicode build is enabled. | ||
* \ \ \ \ \ \ \ | Merge pull request #667 from jskeet/fix-field-orderings | Jan Tattermusch | 2015-07-31 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix trivial bug in field orderings. | ||
| | | | * | | | | | Simplify the JSON tests for readability | Jon Skeet | 2015-07-31 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Use ' instead of " in the expected JSON, then replace it before asserting. |