diff options
| author | Jon Skeet <jonskeet@google.com> | 2016-04-08 12:33:09 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2016-04-20 03:46:00 +0100 |
| commit | 84ea2c7a81c69ce675d025074d6891a32ea3f629 (patch) | |
| tree | 3d35abd02e1415129fdce76624243b99e36714f6 /csharp/src/Google.Protobuf.Conformance/Program.cs | |
| parent | 75626ed79c726ed9fd96d9d143ce6b6c88413bf8 (diff) | |
| download | protobuf-84ea2c7a81c69ce675d025074d6891a32ea3f629.tar.gz protobuf-84ea2c7a81c69ce675d025074d6891a32ea3f629.tar.bz2 protobuf-84ea2c7a81c69ce675d025074d6891a32ea3f629.zip | |
Regenerate all C# code and make it compile
JSON tests fail, as we're not using OriginalNameAttribute yet.
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance/Program.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf.Conformance/Program.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Program.cs b/csharp/src/Google.Protobuf.Conformance/Program.cs index f3f7e295..19827c48 100644 --- a/csharp/src/Google.Protobuf.Conformance/Program.cs +++ b/csharp/src/Google.Protobuf.Conformance/Program.cs @@ -109,10 +109,10 @@ namespace Google.Protobuf.Conformance { switch (request.RequestedOutputFormat) { - case global::Conformance.WireFormat.JSON: + case global::Conformance.WireFormat.Json: var formatter = new JsonFormatter(new JsonFormatter.Settings(false, typeRegistry)); return new ConformanceResponse { JsonPayload = formatter.Format(message) }; - case global::Conformance.WireFormat.PROTOBUF: + case global::Conformance.WireFormat.Protobuf: return new ConformanceResponse { ProtobufPayload = message.ToByteString() }; default: throw new Exception("Unsupported request output format: " + request.PayloadCase); |