Index: third_party/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs |
diff --git a/third_party/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs b/third_party/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs |
index 19827c4844587f444123580f5c6ac33cac8a29d5..00ee64f8a58bb75acf39fdb736462c474601478c 100644 |
--- a/third_party/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs |
+++ b/third_party/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs |
@@ -48,7 +48,7 @@ namespace Google.Protobuf.Conformance |
// This way we get the binary streams instead of readers/writers. |
var input = new BinaryReader(Console.OpenStandardInput()); |
var output = new BinaryWriter(Console.OpenStandardOutput()); |
- var typeRegistry = TypeRegistry.FromMessages(TestAllTypes.Descriptor); |
+ var typeRegistry = TypeRegistry.FromMessages(ProtobufTestMessages.Proto3.TestAllTypes.Descriptor); |
int count = 0; |
while (RunTest(input, output, typeRegistry)) |
@@ -81,17 +81,17 @@ namespace Google.Protobuf.Conformance |
private static ConformanceResponse PerformRequest(ConformanceRequest request, TypeRegistry typeRegistry) |
{ |
- TestAllTypes message; |
+ ProtobufTestMessages.Proto3.TestAllTypes message; |
try |
{ |
switch (request.PayloadCase) |
{ |
case ConformanceRequest.PayloadOneofCase.JsonPayload: |
var parser = new JsonParser(new JsonParser.Settings(20, typeRegistry)); |
- message = parser.Parse<TestAllTypes>(request.JsonPayload); |
+ message = parser.Parse<ProtobufTestMessages.Proto3.TestAllTypes>(request.JsonPayload); |
break; |
case ConformanceRequest.PayloadOneofCase.ProtobufPayload: |
- message = TestAllTypes.Parser.ParseFrom(request.ProtobufPayload); |
+ message = ProtobufTestMessages.Proto3.TestAllTypes.Parser.ParseFrom(request.ProtobufPayload); |
break; |
default: |
throw new Exception("Unsupported request payload: " + request.PayloadCase); |