diff options
| author |  Jon Skeet <jonskeet@google.com> | 2015-11-19 17:14:23 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-11-22 16:30:36 +0000 |
| commit | a2667aafd80b0b37e529a94be3ce4df66d8ad6cb (patch) | |
| tree | 331da99dc0dc12fc13f395f3dfd32dc4ab726078 /csharp/src/Google.Protobuf.Conformance | |
| parent | 72ec33676fd40ccfe719ace162fcf859ae9251bc (diff) | |
Generated code changes for previous commit (basically InternalBuildGeneratedFileFrom => FromGeneratedCode)
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance')
| -rw-r--r-- | csharp/src/Google.Protobuf.Conformance/Conformance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/csharp/src/Google.Protobuf.Conformance/Conformance.cs index b9ab4820..50ce1de4 100644 --- a/csharp/src/Google.Protobuf.Conformance/Conformance.cs +++ b/csharp/src/Google.Protobuf.Conformance/Conformance.cs @@ -134,7 +134,7 @@ namespace Conformance { "QlVGEAESCAoESlNPThACKkAKC0ZvcmVpZ25FbnVtEg8KC0ZPUkVJR05fRk9P", "EAASDwoLRk9SRUlHTl9CQVIQARIPCgtGT1JFSUdOX0JBWhACQiEKH2NvbS5n", "b29nbGUucHJvdG9idWYuY29uZm9ybWFuY2ViBnByb3RvMw==")); - descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedCodeInfo(new[] {typeof(global::Conformance.WireFormat), typeof(global::Conformance.ForeignEnum), }, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Conformance.ConformanceRequest), global::Conformance.ConformanceRequest.Parser, new[]{ "ProtobufPayload", "JsonPayload", "RequestedOutputFormat" }, new[]{ "Payload" }, null, null), |