Workaround for Mono bug 516379

src/AddressBook/AddressBookProtos.cs

@@ -233,11 +233,11 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return PhoneNumber.Descriptor; }
+            get { return global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber.Descriptor; }
           }
           
           public override PhoneNumber DefaultInstanceForType {
-            get { return PhoneNumber.DefaultInstance; }
+            get { return global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber.DefaultInstance; }
           }
           
           public override PhoneNumber BuildPartial() {
@@ -259,7 +259,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
           }
           
           public override Builder MergeFrom(PhoneNumber other) {
-            if (other == PhoneNumber.DefaultInstance) return this;
+            if (other == global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber.DefaultInstance) return this;
             if (other.HasNumber) {
               Number = other.Number;
             }
@@ -517,11 +517,11 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return Person.Descriptor; }
+        get { return global::Google.ProtocolBuffers.Examples.AddressBook.Person.Descriptor; }
       }
       
       public override Person DefaultInstanceForType {
-        get { return Person.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.Examples.AddressBook.Person.DefaultInstance; }
       }
       
       public override Person BuildPartial() {
@@ -544,7 +544,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
       }
       
       public override Builder MergeFrom(Person other) {
-        if (other == Person.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.Examples.AddressBook.Person.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
@@ -836,11 +836,11 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return AddressBook.Descriptor; }
+        get { return global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook.Descriptor; }
       }
       
       public override AddressBook DefaultInstanceForType {
-        get { return AddressBook.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook.DefaultInstance; }
       }
       
       public override AddressBook BuildPartial() {
@@ -863,7 +863,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
       }
       
       public override Builder MergeFrom(AddressBook other) {
-        if (other == AddressBook.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook.DefaultInstance) return this;
         if (other.person_.Count != 0) {
           base.AddRange(other.person_, result.person_);
         }

src/ProtoGen/MessageGenerator.cs

@@ -349,11 +349,11 @@ namespace Google.ProtocolBuffers.ProtoGen {
       writer.WriteLine("}");
       writer.WriteLine();
       writer.WriteLine("public override pbd::MessageDescriptor DescriptorForType {");
-      writer.WriteLine("  get {{ return {0}.Descriptor; }}", ClassName);
+      writer.WriteLine("  get {{ return {0}.Descriptor; }}", FullClassName);
       writer.WriteLine("}");
       writer.WriteLine();
       writer.WriteLine("public override {0} DefaultInstanceForType {{", ClassName);
-      writer.WriteLine("  get {{ return {0}.DefaultInstance; }}", ClassName);
+      writer.WriteLine("  get {{ return {0}.DefaultInstance; }}", FullClassName);
       writer.WriteLine("}");
       writer.WriteLine();
     
@@ -386,7 +386,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
         // Optimization:  If other is the default instance, we know none of its
         // fields are set so we can skip the merge.
         writer.Indent();
-        writer.WriteLine("if (other == {0}.DefaultInstance) return this;", ClassName);
+        writer.WriteLine("if (other == {0}.DefaultInstance) return this;", FullClassName);
         foreach (FieldDescriptor field in Descriptor.Fields) {
           SourceGenerators.CreateFieldGenerator(field).GenerateMergingCode(writer);
         }

src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs

@@ -203,11 +203,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return OptionsMessage.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.OptionsMessage.Descriptor; }
       }
       
       public override OptionsMessage DefaultInstanceForType {
-        get { return OptionsMessage.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.OptionsMessage.DefaultInstance; }
       }
       
       public override OptionsMessage BuildPartial() {
@@ -229,7 +229,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(OptionsMessage other) {
-        if (other == OptionsMessage.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.OptionsMessage.DefaultInstance) return this;
         if (other.HasNormal) {
           Normal = other.Normal;
         }

src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs

@@ -199,11 +199,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestEmbedOptimizedForSize.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.Descriptor; }
       }
       
       public override TestEmbedOptimizedForSize DefaultInstanceForType {
-        get { return TestEmbedOptimizedForSize.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.DefaultInstance; }
       }
       
       public override TestEmbedOptimizedForSize BuildPartial() {
@@ -226,7 +226,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(TestEmbedOptimizedForSize other) {
-        if (other == TestEmbedOptimizedForSize.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.DefaultInstance) return this;
         if (other.HasOptionalMessage) {
           MergeOptionalMessage(other.OptionalMessage);
         }

src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs

@@ -180,11 +180,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return ImportMessage.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.ImportMessage.Descriptor; }
       }
       
       public override ImportMessage DefaultInstanceForType {
-        get { return ImportMessage.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.ImportMessage.DefaultInstance; }
       }
       
       public override ImportMessage BuildPartial() {
@@ -206,7 +206,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(ImportMessage other) {
-        if (other == ImportMessage.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.ImportMessage.DefaultInstance) return this;
         if (other.HasD) {
           D = other.D;
         }

src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs

@@ -202,11 +202,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestMessageSet.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSet.Descriptor; }
       }
       
       public override TestMessageSet DefaultInstanceForType {
-        get { return TestMessageSet.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSet.DefaultInstance; }
       }
       
       public override TestMessageSet BuildPartial() {
@@ -228,7 +228,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(TestMessageSet other) {
-        if (other == TestMessageSet.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSet.DefaultInstance) return this;
           this.MergeExtensionFields(other);
         this.MergeUnknownFields(other.UnknownFields);
         return this;
@@ -392,11 +392,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestMessageSetContainer.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.Descriptor; }
       }
       
       public override TestMessageSetContainer DefaultInstanceForType {
-        get { return TestMessageSetContainer.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.DefaultInstance; }
       }
       
       public override TestMessageSetContainer BuildPartial() {
@@ -418,7 +418,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(TestMessageSetContainer other) {
-        if (other == TestMessageSetContainer.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.DefaultInstance) return this;
         if (other.HasMessageSet) {
           MergeMessageSet(other.MessageSet);
         }
@@ -631,11 +631,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestMessageSetExtension1.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.Descriptor; }
       }
       
       public override TestMessageSetExtension1 DefaultInstanceForType {
-        get { return TestMessageSetExtension1.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.DefaultInstance; }
       }
       
       public override TestMessageSetExtension1 BuildPartial() {
@@ -657,7 +657,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(TestMessageSetExtension1 other) {
-        if (other == TestMessageSetExtension1.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.DefaultInstance) return this;
         if (other.HasI) {
           I = other.I;
         }
@@ -847,11 +847,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestMessageSetExtension2.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.Descriptor; }
       }
       
       public override TestMessageSetExtension2 DefaultInstanceForType {
-        get { return TestMessageSetExtension2.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.DefaultInstance; }
       }
       
       public override TestMessageSetExtension2 BuildPartial() {
@@ -873,7 +873,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(TestMessageSetExtension2 other) {
-        if (other == TestMessageSetExtension2.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.DefaultInstance) return this;
         if (other.HasStr) {
           Str = other.Str;
         }
@@ -1104,11 +1104,11 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return Item.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.Descriptor; }
           }
           
           public override Item DefaultInstanceForType {
-            get { return Item.DefaultInstance; }
+            get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.DefaultInstance; }
           }
           
           public override Item BuildPartial() {
@@ -1130,7 +1130,7 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override Builder MergeFrom(Item other) {
-            if (other == Item.DefaultInstance) return this;
+            if (other == global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.DefaultInstance) return this;
             if (other.HasTypeId) {
               TypeId = other.TypeId;
             }
@@ -1327,11 +1327,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return RawMessageSet.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Descriptor; }
       }
       
       public override RawMessageSet DefaultInstanceForType {
-        get { return RawMessageSet.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.DefaultInstance; }
       }
       
       public override RawMessageSet BuildPartial() {
@@ -1354,7 +1354,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override Builder MergeFrom(RawMessageSet other) {
-        if (other == RawMessageSet.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.TestProtos.RawMessageSet.DefaultInstance) return this;
         if (other.item_.Count != 0) {
           base.AddRange(other.item_, result.item_);
         }

src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs

@@ -181,11 +181,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestOptimizedForSize.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Descriptor; }
       }
       
       public override TestOptimizedForSize DefaultInstanceForType {
-        get { return TestOptimizedForSize.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.DefaultInstance; }
       }
       
       public override TestOptimizedForSize BuildPartial() {
@@ -348,11 +348,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestRequiredOptimizedForSize.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRequiredOptimizedForSize.Descriptor; }
       }
       
       public override TestRequiredOptimizedForSize DefaultInstanceForType {
-        get { return TestRequiredOptimizedForSize.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRequiredOptimizedForSize.DefaultInstance; }
       }
       
       public override TestRequiredOptimizedForSize BuildPartial() {
@@ -479,11 +479,11 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return TestOptionalOptimizedForSize.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestOptionalOptimizedForSize.Descriptor; }
       }
       
       public override TestOptionalOptimizedForSize DefaultInstanceForType {
-        get { return TestOptionalOptimizedForSize.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestOptionalOptimizedForSize.DefaultInstance; }
       }
       
       public override TestOptionalOptimizedForSize BuildPartial() {

src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs

@@ -253,11 +253,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return CSharpFileOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.CSharpFileOptions.Descriptor; }
       }
       
       public override CSharpFileOptions DefaultInstanceForType {
-        get { return CSharpFileOptions.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.CSharpFileOptions.DefaultInstance; }
       }
       
       public override CSharpFileOptions BuildPartial() {
@@ -279,7 +279,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override Builder MergeFrom(CSharpFileOptions other) {
-        if (other == CSharpFileOptions.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.CSharpFileOptions.DefaultInstance) return this;
         if (other.HasNamespace) {
           Namespace = other.Namespace;
         }
@@ -569,11 +569,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return CSharpFieldOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.CSharpFieldOptions.Descriptor; }
       }
       
       public override CSharpFieldOptions DefaultInstanceForType {
-        get { return CSharpFieldOptions.DefaultInstance; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.CSharpFieldOptions.DefaultInstance; }
       }
       
       public override CSharpFieldOptions BuildPartial() {
@@ -595,7 +595,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override Builder MergeFrom(CSharpFieldOptions other) {
-        if (other == CSharpFieldOptions.DefaultInstance) return this;
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.CSharpFieldOptions.DefaultInstance) return this;
         if (other.HasPropertyName) {
           PropertyName = other.PropertyName;
         }