diff options
| author |  Jon Skeet <skeet@pobox.com> | 2015-08-25 17:51:40 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-08-25 17:51:40 +0100 |
| commit | f9aed2088d702d3fb55dc87707e13bdaef6e2067 (patch) | |
| tree | 5616ab5262a8b6f00ede00f60db984012b383dfd /csharp/generate_protos.sh | |
| parent | 3253634dcb2cbd5917d10aebc1a18a7692b237a3 (diff) | |
| parent | 31d119af22b09310355d24e122472f8d619556cf (diff) | |
Merge pull request #732 from jskeet/fix-descriptor-proto
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
Diffstat (limited to 'csharp/generate_protos.sh')
| -rwxr-xr-x | csharp/generate_protos.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index 962f2a9c..0d217a9d 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -36,11 +36,8 @@ if [ -z "$PROTOC" ]; then fi # Descriptor proto -# TODO(jonskeet): Remove fixup -cp src/google/protobuf/descriptor.proto src/google/protobuf/descriptor_proto_file.proto $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf/Reflection \ - src/google/protobuf/descriptor_proto_file.proto -rm src/google/protobuf/descriptor_proto_file.proto + src/google/protobuf/descriptor.proto $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf/WellKnownTypes \ src/google/protobuf/any.proto \ |