aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Fix build warnings around unused variablesGravatar Jon Skeet2015-08-04
|
* Merge pull request #653 from airtimemedia/masterGravatar Feng Xiao2015-08-03
|\ | | | | Various compilation fixes
* \ Merge pull request #681 from jskeet/json-fieldmaskGravatar Jon Skeet2015-08-03
|\ \ | | | | | | JSON formatting for FieldMask
* \ \ Merge pull request #677 from jskeet/move-protosGravatar Jon Skeet2015-08-03
|\ \ \ | | | | | | | | Remove a redundant layer of directory hierarchy.
* \ \ \ Merge pull request #680 from jskeet/aptcaGravatar Jon Skeet2015-08-03
|\ \ \ \ | | | | | | | | | | Allow partially-trusted callers again.
| | | * | JSON formatting for FieldMaskGravatar Jon Skeet2015-08-03
| |_|/ / |/| | |
* | | | Merge pull request #678 from jskeet/stream-ctorGravatar Jon Skeet2015-08-03
|\ \ \ \ | | | | | | | | | | Expose Coded*Stream constructors directly.
| * | | | Expose Coded*Stream constructors directly.Gravatar Jon Skeet2015-08-03
|/ / / /
| | * / Remove a redundant layer of directory hierarchy.Gravatar Jon Skeet2015-08-03
| |/ / |/| |
| * | Allow partially-trusted callers again.Gravatar Jon Skeet2015-08-03
|/ / | | | | | | Fixes issue #552. (And yay, it looks like our build profile supports this...)
* | Merge pull request #675 from jtattermusch/signingGravatar Jon Skeet2015-08-03
|\ \ | | | | | | Add ReleaseSigned configuration for C#
* \ \ Merge pull request #672 from jskeet/json-structGravatar Jon Skeet2015-08-03
|\ \ \ | | | | | | | | Formatting of Struct as JSON
| * | | Initial pass at formatting Struct as JSON.Gravatar Jon Skeet2015-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-timeGravatar Jon Skeet2015-08-03
|\ \ \ | | | | | | | | JSON formatting for Timestamp and Duration
| * | | Addressed issues raised in code review. Will merge when green.Gravatar Jon Skeet2015-08-03
| | | |
| * | | Format JSON for Duration and Timestamp.Gravatar Jon Skeet2015-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.amGravatar Jan Tattermusch2015-08-02
| | |
| * | make changes and fixes in signingGravatar Jan Tattermusch2015-08-02
| | |
| * | added protoc.exe and well known protobuf files to the nuspec fileGravatar Jan Tattermusch2015-08-02
| | |
| * | build signed assembliesGravatar Jan Tattermusch2015-08-02
|/ /
* | Merge pull request #669 from jskeet/simpify-json-testsGravatar Jan Tattermusch2015-08-01
|\ \ | | | | | | Simpify json tests
* \ \ Merge pull request #668 from jskeet/json_orderingGravatar Jan Tattermusch2015-08-01
|\ \ \ | | | | | | | | Fix C# JSON field ordering
* \ \ \ Merge pull request #643 from yukawa/fix_win_unicode_buildGravatar Paul Yang2015-07-31
|\ \ \ \ | | | | | | | | | | Fix build failure on Windows when Unicode build is enabled.
* \ \ \ \ Merge pull request #667 from jskeet/fix-field-orderingsGravatar Jan Tattermusch2015-07-31
|\ \ \ \ \ | | | | | | | | | | | | Fix trivial bug in field orderings.
| | | | * | Simplify the JSON tests for readabilityGravatar Jon Skeet2015-07-31
| | | |/ / | | | | | | | | | | | | | | | Use ' instead of " in the expected JSON, then replace it before asserting.
| | | * / Fix JSON formatting to always emit fields in field order, including oneofsGravatar Jon Skeet2015-07-31
| | |/ / | |/| |
| * | | Fix trivial bug in field orderings.Gravatar Jon Skeet2015-07-31
|/ / / | | | | | | | | | (Shows the benefit of unit testing even code "too simple to fail"...)
* | | Merge pull request #666 from jskeet/wkt-timesGravatar Jon Skeet2015-07-31
|\ \ \ | | | | | | | | Well-known type operations for Timestamp and Duration
| * | | Well-known type operations for Timestamp and Duration (but not JSON formatting).Gravatar Jon Skeet2015-07-31
|/ / / | | | | | | | | | | | | 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_fieldGravatar Jon Skeet2015-07-31
|\ \ \ | | | | | | | | Handle field names of "descriptor" and "types".
| * | | Handle field names of "descriptor" and "types".Gravatar Jon Skeet2015-07-31
|/ / /
| * | Fix build failure on Windows when Unicode build is enabled.Gravatar Yohei Yukawa2015-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #664 from jtattermusch/expose_umbrella_class_name2Gravatar Jan Tattermusch2015-07-30
|\ \ \ | | | | | | | | Expose GetUmbrellaClassName in csharp_names.h
| * | | refactor umbrella class helpersGravatar Jan Tattermusch2015-07-30
|/ / /
* | | Merge pull request #632 from google/csharp-experimentalGravatar Jan Tattermusch2015-07-30
|\ \ \ | | | | | | | | Merge C# proto3 from csharp-experimental to master
| * \ \ Merge pull request #660 from jskeet/throw-on-nullGravatar Jan Tattermusch2015-07-30
| |\ \ \ | | | | | | | | | | Throw on null for string/bytes single fields
| | | | * Move pthread include.Gravatar Tom Hughes2015-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | Based on pull request feedback. See commit 60c5222 for why the pthread header is necessary.
| | * | | Generated code for previous commit.Gravatar Jon Skeet2015-07-30
| | | | |
| | * | | Prohibit null values for string/bytes fields in generated code.Gravatar Jon Skeet2015-07-30
| | | | |
| | * | | Rename ThrowHelper to Preconditions and make it public - we'll want to use ↵Gravatar Jon Skeet2015-07-30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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-frozenGravatar Jon Skeet2015-07-30
| |\ \ \ | | | | | | | | | | Remove a few hangers-on from frozenness.
| | * | | Generated code from previous commit.Gravatar Jon Skeet2015-07-30
| | | | |
| | * | | More freezing tidy-up; generated code in next commit.Gravatar Jon Skeet2015-07-30
| | | | |
| | * | | Minor bits of left-over frozenness.Gravatar Jon Skeet2015-07-30
| |/ / /
| * | | Merge pull request #654 from jtattermusch/csharp_hide_freezeGravatar Jon Skeet2015-07-30
| |\ \ \ | | | | | | | | | | Remove the C# Freeze API
| * \ \ \ Merge pull request #655 from jtattermusch/csharp_expose_more_info_about_serviceGravatar Jon Skeet2015-07-30
| |\ \ \ \ | | | | | | | | | | | | Expose IsClientStreaming and IsServerStreaming in MethodDescriptor
| | | * | | regenerate codeGravatar Jan Tattermusch2015-07-29
| | | | | |
| | | * | | remove the freeze APIGravatar Jan Tattermusch2015-07-29
| | |/ / / | |/| | |
| | * | | add IsClientStreaming and IsServerStreaming to MethodDescriptorGravatar Jan Tattermusch2015-07-29
| |/ / /
* | | | Merge pull request #652 from TeBoring/objectivecGravatar Paul Yang2015-07-29
|\ \ \ \ | | | | | | | | | | Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.h