Change where we rename Descriptor.cs to DescriptorProtoFile.cs.

We now do this in protoc instead of the generation simpler.

Benefits:
- Generation script is simpler
- Detection is simpler as we now only need to care about one filename
- The embedded descriptor knows itself as "google/protobuf/descriptor.proto" avoiding dependency issues

This PR also makes the "invalid dependency" exception clearer in terms of expected and actual dependencies.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/google/protobuf/compiler/csharp/csharp_helpers.cc b/src/google/protobuf/compiler/csharp/csharp_helpers.cc
index d25dcba9..333b4912 100644
--- a/src/google/protobuf/compiler/csharp/csharp_helpers.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_helpers.cc
@@ -118,6 +118,12 @@ std::string GetFileNamespace(const FileDescriptor* descriptor) {
 }
 
 std::string GetUmbrellaClassUnqualifiedName(const FileDescriptor* descriptor) {
+  // We manually rename Descriptor to DescriptorProtoFile to avoid collisions with
+  // the static Descriptor property. It would be nice to be able to do this with an
+  // option, but it would be rarely used.
+  if (IsDescriptorProto(descriptor)) {
+    return "DescriptorProtoFile";
+  }
   // umbrella_classname can no longer be set using message option.
   std::string proto_file = descriptor->name();
   int lastslash = proto_file.find_last_of("/");