Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | csharp: add support for the json_name option | alien | 2016-03-18 | 6 | -8/+207 |
| | | | | | Conflicts: csharp/src/Google.Protobuf/JsonFormatter.cs | ||||
* | Replace StringBuilder with TextWriter in JsonFormatter | avgweb | 2016-03-06 | 5 | -131/+157 |
| | |||||
* | Fix copy/paste typo in CodedInputStreamTest | Jon Skeet | 2016-03-01 | 1 | -1/+1 |
| | |||||
* | Implement IDisposable for CodedInputStream and CodedOutputStream | Jon Skeet | 2016-02-29 | 5 | -12/+152 |
| | | | | | This fixes issue #679 and issue #1282. (The .gitignore change is just around ncrunch; I can put it in a separate PR if you really want.) | ||||
* | Require VS2015 in the solution file | Jon Skeet | 2016-02-22 | 1 | -3/+3 |
| | |||||
* | Merge pull request #1240 from jskeet/validate_group | Jan Tattermusch | 2016-02-18 | 3 | -12/+77 |
|\ | | | | | Validate that end-group tags match their corresponding start-group tags | ||||
| * | Validate that end-group tags match their corresponding start-group tags | Jon Skeet | 2016-02-15 | 3 | -12/+77 |
| | | | | | | | | | | | | | | | | This detects: - An end-group tag with the wrong field number (doesn't match the start-group field) - An end-group tag with no preceding start-group tag Fixes issue #688. | ||||
* | | Merge pull request #1239 from jskeet/call_generate_protos | Jon Skeet | 2016-02-18 | 1 | -1/+1 |
|\ \ | | | | | | | Generate C# code whenever descriptor.proto changes | ||||
| * | | Generate C# code whenever descriptor.proto changes | Jon Skeet | 2016-02-15 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | This is a start to fixing issue #1212. It won't help for test protos, conformance etc, but it will definitely be better than nothing, and would have highlighted a change in descriptor.proto which broken C# earlier. | ||||
* / | Add more tests around merging wrappers | Jon Skeet | 2016-02-15 | 1 | -2/+41 |
|/ | | | | This was in an attempt to fix the wrapper handling corner case, but it's really fiddly. | ||||
* | Merge pull request #1218 from jskeet/nuspec-dependencies | Jan Tattermusch | 2016-02-11 | 1 | -0/+10 |
|\ | | | | | nuspec dependency fixes | ||||
| * | nuspec dependency fixes | Jon Skeet | 2016-02-08 | 1 | -0/+10 |
| | | | | | | | | | | | | | | Explicitly don't add any dependencies for "old" platforms, to avoid unnecessary dependencies in those cases. Fixes issue #1203. | ||||
* | | Add a link | Jan Tattermusch | 2016-02-10 | 1 | -2/+2 |
| | | |||||
* | | Use checked-in key to build ReleaseSigned | Jan Tattermusch | 2016-02-09 | 2 | -2/+2 |
| | | |||||
* | | add private key for strong name assemblies | Jan Tattermusch | 2016-02-09 | 2 | -1/+5 |
|/ | |||||
* | Generated code changes from previous commit | Jon Skeet | 2016-02-04 | 11 | -53/+53 |
| | |||||
* | Rename Preconditions to ProtoPreconditions | Jon Skeet | 2016-02-04 | 14 | -86/+91 |
| | | | | (Generated code changes in next commit.) | ||||
* | Generated code for GeneratedCodeInfo change | Jon Skeet | 2016-02-04 | 19 | -168/+478 |
| | |||||
* | Rename GeneratedCodeInfo to GeneratedClrTypeInfo | Jon Skeet | 2016-02-04 | 4 | -12/+12 |
| | | | | | | | Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type. Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code. Generated code changes in next commit. | ||||
* | Clarify readme | Jon Skeet | 2016-02-03 | 1 | -16/+32 |
| | |||||
* | Merge pull request #1158 from jskeet/nonnormalized-tostring | Jan Tattermusch | 2016-01-26 | 10 | -71/+378 |
|\ | | | | | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw | ||||
| * | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw | Jon Skeet | 2016-01-20 | 10 | -71/+378 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The usage of ICustomDiagnosticMessage here is non-essential - ToDiagnosticString doesn't actually get called by ToString() in this case, due to JsonFormatter code. It was intended to make it clearer that it *did* have a custom format... but then arguably I should do the same for Value, Struct, Any etc. Moving some of the code out of JsonFormatter and into Duration/Timestamp/FieldMask likewise feels somewhat nice, somewhat nasty... basically there are JSON-specific bits of formatting, but also domain-specific bits of computation. <sigh> Thoughts welcome. | ||||
* | | Fix mistakes in highest-representable float64 integers | Jon Skeet | 2016-01-21 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1096 from jskeet/custom-to-string | Jan Tattermusch | 2016-01-19 | 7 | -1/+142 |
|\ | | | | | Introduce ICustomDiagnosticMessage to allow for custom string formatting | ||||
| * | Introduce ICustomDiagnosticMessage to allow for custom string formatting | Jon Skeet | 2016-01-13 | 7 | -1/+142 |
| | | | | | | | | This fixes issue #933, effectively. | ||||
* | | Fix broken test | Jon Skeet | 2016-01-15 | 1 | -1/+1 |
| | | |||||
* | | Make sure that | Jon Skeet | 2016-01-15 | 3 | -8/+68 |
| | | | | | | | | | | | | "valueField": null is parsed appropriately, i.e. that it remembers that the field is set. | ||||
* | | Reject JSON containing the same oneof field twice | Jon Skeet | 2016-01-15 | 2 | -0/+22 |
| | | |||||
* | | Change handling of unknown enums: we now write out the value as a number. | Jon Skeet | 2016-01-15 | 4 | -36/+23 |
| | | |||||
* | | Extra strictness for FieldMask conversion | Jon Skeet | 2016-01-15 | 4 | -2/+51 |
| | | |||||
* | | Allow the original field name (rather than camel-cased) when parsing JSON | Jon Skeet | 2016-01-15 | 2 | -3/+23 |
| | | |||||
* | | Fixes to JSON timestamp/duration representations | Jon Skeet | 2016-01-15 | 8 | -35/+139 |
| | | |||||
* | | Report serialization errors in conformance tests | Jon Skeet | 2016-01-15 | 1 | -8/+15 |
| | | |||||
* | | Prohibit null values in repeated and map fields in JSON | Jon Skeet | 2016-01-15 | 2 | -1/+38 |
| | | |||||
* | | Throw a better exception when invalid base64 is detected in JSON | Jon Skeet | 2016-01-15 | 3 | -1/+28 |
| | | |||||
* | | Support (and test) numeric enum parsing in JSON | Jon Skeet | 2016-01-15 | 2 | -0/+29 |
| | | |||||
* | | Fix handling of repeated wrappers | Jon Skeet | 2016-01-15 | 3 | -77/+94 |
| | | | | | | | | | | Previously we were incorrectly packing wrapper types. This also refactors FieldCodec a bit as well, using more C# 6-ness. | ||||
* | | JSON conformance test fixes | Jon Skeet | 2016-01-13 | 3 | -0/+16 |
|/ | | | | | - Spot an Any without a type URL - In the conformance test runner, catch exceptions due to generally-invalid JSON | ||||
* | Merge pull request #1089 from jskeet/map-null | Jan Tattermusch | 2016-01-12 | 13 | -174/+167 |
|\ | | | | | Prohibit null values in maps | ||||
| * | Prohibit null values in map fields | Jon Skeet | 2016-01-11 | 13 | -174/+167 |
| | | | | | | | | | | On deserialization, missing values for message types are replaced with a "default" message. | ||||
* | | Fix typos in README.md/CHANGES.txt | Dongjoon Hyun | 2016-01-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1098 from jskeet/wkt-json | Jan Tattermusch | 2016-01-08 | 3 | -63/+55 |
|\ | | | | | Ensure all formatted well-known-type values are valid JSON | ||||
| * | Ensure all formatted well-known-type values are valid JSON | Jon Skeet | 2016-01-06 | 3 | -63/+55 |
| | | | | | | | | | | | | | | This involves quoting timestamp/duration/field-mask values, even when they're not in fields. It's better for consistency. Fixes issue #1097. | ||||
* | | Merge pull request #1088 from jskeet/codec-pruning | Jan Tattermusch | 2016-01-08 | 1 | -5/+0 |
|\ \ | | | | | | | Remove unused method in FieldCodec. | ||||
| * | | Remove unused method in FieldCodec. | Jon Skeet | 2016-01-05 | 1 | -5/+0 |
| |/ | | | | | | | (The method was last used a very long time ago, if ever.) | ||||
* / | Improve number handling in JSON parsing | Jon Skeet | 2016-01-06 | 2 | -51/+91 |
|/ | | | | | | - Tighten up on Infinity/NaN handling in terms of whitespace handling (and test casing) - Validate that values are genuinely integers when they've been parsed from a JSON number (ignoring the fact that 1.0000000000000000001 == 1 as a double...) - Allow exponents and decimal points in string representations | ||||
* | Fix C# source generation shell script and remove out of date notes | Jon Skeet | 2016-01-04 | 2 | -125/+1301 |
| | | | | | The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path. The notes around "fix-ups" have been out of date for some time now. | ||||
* | add reference generator dependency | Jan Tattermusch | 2015-12-17 | 2 | -0/+14 |
| | |||||
* | Merge pull request #1049 from jskeet/any-format | Jon Skeet | 2015-12-17 | 21 | -117/+191 |
|\ | | | | | Handle Any formatting for diagnostic purposes | ||||
| * | Generated code changes from previous commit. | Jon Skeet | 2015-12-15 | 19 | -114/+117 |
| | |