aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expose Coded*Stream constructors directly.Jon Skeet2015-08-0311-127/+100
|
* Merge pull request #675 from jtattermusch/signingJon Skeet2015-08-0314-92/+87
|\ | | | | Add ReleaseSigned configuration for C#
| * Update Makefile.amJan Tattermusch2015-08-021-2/+2
| |
| * make changes and fixes in signingJan Tattermusch2015-08-0210-96/+16
| |
| * added protoc.exe and well known protobuf files to the nuspec fileJan Tattermusch2015-08-021-1/+15
| |
| * build signed assembliesJan Tattermusch2015-08-0215-36/+97
| |
* | Merge pull request #672 from jskeet/json-structJon Skeet2015-08-032-3/+98
|\ \ | | | | | | Formatting of Struct as JSON
| * | Initial pass at formatting Struct as JSON.Jon Skeet2015-08-032-3/+98
|/ / | | | | | | 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-timeJon Skeet2015-08-034-11/+174
|\ \ | |/ |/| JSON formatting for Timestamp and Duration
| * Addressed issues raised in code review. Will merge when green.Jon Skeet2015-08-032-26/+18
| |
| * Format JSON for Duration and Timestamp.Jon Skeet2015-08-033-11/+182
|/ | | | 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.
* Merge pull request #669 from jskeet/simpify-json-testsJan Tattermusch2015-08-011-60/+71
|\ | | | | Simpify json tests
| * Simplify the JSON tests for readabilityJon Skeet2015-07-311-60/+71
| | | | | | | | Use ' instead of " in the expected JSON, then replace it before asserting.
* | Merge pull request #668 from jskeet/json_orderingJan Tattermusch2015-08-014-36/+353
|\| | | | | Fix C# JSON field ordering
| * Fix JSON formatting to always emit fields in field order, including oneofsJon Skeet2015-07-314-36/+353
| |
* | Merge pull request #643 from yukawa/fix_win_unicode_buildPaul Yang2015-07-311-1/+1
|\ \ | | | | | | Fix build failure on Windows when Unicode build is enabled.
| * | Fix build failure on Windows when Unicode build is enabled.Yohei Yukawa2015-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for e9abc404df99ef85d3e25aaaccd4aa83e381, 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.
* | | Merge pull request #667 from jskeet/fix-field-orderingsJan Tattermusch2015-07-312-1/+14
|\ \ \ | | |/ | |/| Fix trivial bug in field orderings.
| * | Fix trivial bug in field orderings.Jon Skeet2015-07-312-1/+14
|/ / | | | | | | (Shows the benefit of unit testing even code "too simple to fail"...)
* | Merge pull request #666 from jskeet/wkt-timesJon Skeet2015-07-317-0/+563
|\ \ | | | | | | Well-known type operations for Timestamp and Duration
| * | Well-known type operations for Timestamp and Duration (but not JSON formatting).Jon Skeet2015-07-317-0/+563
|/ / | | | | | | | | 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.
* | Merge pull request #665 from jskeet/types_fieldJon Skeet2015-07-314-7/+251
|\ \ | | | | | | Handle field names of "descriptor" and "types".
| * | Handle field names of "descriptor" and "types".Jon Skeet2015-07-314-7/+251
|/ /
* | Merge pull request #664 from jtattermusch/expose_umbrella_class_name2Jan Tattermusch2015-07-306-34/+28
|\ \ | | | | | | Expose GetUmbrellaClassName in csharp_names.h
| * | refactor umbrella class helpersJan Tattermusch2015-07-306-34/+28
|/ /
* | Merge pull request #632 from google/csharp-experimentalJan Tattermusch2015-07-30385-255618/+32710
|\ \ | | | | | | Merge C# proto3 from csharp-experimental to master
| * \ Merge pull request #660 from jskeet/throw-on-nullJan Tattermusch2015-07-3019-149/+169
| |\ \ | | | | | | | | Throw on null for string/bytes single fields
| | * | Generated code for previous commit.Jon Skeet2015-07-309-57/+57
| | | |
| | * | Prohibit null values for string/bytes fields in generated code.Jon Skeet2015-07-303-13/+12
| | | |
| | * | Rename ThrowHelper to Preconditions and make it public - we'll want to use ↵Jon Skeet2015-07-307-79/+100
| |/ / | | | | | | | | | | | | | | | | | | it from the generated code soon. Additionally, change it to return the value passed, and make it generic with a class constraint. A separate method doesn't have the class constraint, for more unusual scenarios.
| * | Merge pull request #659 from jskeet/fix-frozenJon Skeet2015-07-3021-327/+3
| |\ \ | | | | | | | | Remove a few hangers-on from frozenness.
| | * | Generated code from previous commit.Jon Skeet2015-07-3018-315/+0
| | | |
| | * | More freezing tidy-up; generated code in next commit.Jon Skeet2015-07-302-5/+2
| | | |
| | * | Minor bits of left-over frozenness.Jon Skeet2015-07-302-7/+1
| |/ /
| * | Merge pull request #654 from jtattermusch/csharp_hide_freezeJon Skeet2015-07-3035-1498/+8
| |\ \ | | | | | | | | Remove the C# Freeze API
| | * | regenerate codeJan Tattermusch2015-07-2918-1192/+0
| | | |
| | * | remove the freeze APIJan Tattermusch2015-07-2917-306/+8
| | | |
| * | | Merge pull request #655 from jtattermusch/csharp_expose_more_info_about_serviceJon Skeet2015-07-301-0/+10
| |\ \ \ | | |/ / | |/| | Expose IsClientStreaming and IsServerStreaming in MethodDescriptor
| | * | add IsClientStreaming and IsServerStreaming to MethodDescriptorJan Tattermusch2015-07-291-0/+10
| |/ /
| * | Merge pull request #638 from jskeet/portableJan Tattermusch2015-07-2919-21/+457
| |\ \ | | | | | | | | First attempt at using profile 259 for Google.Protobuf.
| | * | Update the readme file to indicate supported platformsJon Skeet2015-07-281-0/+11
| | | |
| | * | Humbug - previous commit didn't include project file changes :(Jon Skeet2015-07-281-0/+2
| | | |
| | * | Tweaks to Profile259 supportJon Skeet2015-07-286-11/+303
| | | | | | | | | | | | | | | | | | | | | | | | - Fix nupec paths - Remove an obsolete part of the JSON build - Add documentation and tests to reflection extension methods, and improve implementations
| | * | First attempt at using profile 259 for Google.Protobuf.Jon Skeet2015-07-2714-15/+146
| |/ / | | | | | | | | | | | | | | | | | | | | | This requires .NET 4.5, and there are a few compatibility changes required around reflection. Creating a PR from this to see how our CI systems handle it. Will want to add more documentation, validation and probably tests before merging. This is in aid of issue #590.
| * | Merge pull request #641 from jtattermusch/csharp_descriptor_databaseJon Skeet2015-07-252-4/+21
| |\ \ | | | | | | | | Expose original binary data for file descriptor
| | * | expose original binary data for filedescriptorJan Tattermusch2015-07-242-4/+21
| |/ /
| * | Merge pull request #634 from jskeet/reflection2Jon Skeet2015-07-239-199/+342
| |\ \ | | | | | | | | Reflection part 2 - for discussion
| | * | Implemented Jan's suggestion of FieldCollection, replacing ↵Jon Skeet2015-07-226-119/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FieldAccessorCollection. I think Jan was actually suggesting keeping both, but that feels redundant to me. The test diff is misleading here IMO, because I wouldn't expect real code using reflection to use several accessors one after another like this, unless it was within a loop. Evidence to the contrary would be welcome :) This change also incidentally goes part way to fixing the issue of the JSON formatter not writing out the fields in field number order - with this change, it does except for oneofs, which we can fix in a follow-up change. I haven't actually added a test with a message with fields deliberately out of order - I'm happy to do so though. It feels like it would make sense to be in google/src/protobuf, but it's not entirely clear what the rules of engagement are for adding new messages there. (unittest_proto3.proto?)
| | * | Added newlinesJon Skeet2015-07-222-2/+2
| | | |
| | * | First pass at making field access simpler.Jon Skeet2015-07-227-175/+309
| |/ / | | | | | | | | | This is definitely not ready to ship - I'm "troubled" by the disconnect between a list of fields in declaration order, and a mapping of field accessors by field number/name. Discussion required, but I find that easier when we've got code to look at :)