Fix descriptor reflection in various ways

- The protos are no longer publicly exposed at all
- Oneof detection now works (as we default to -1, not 0)
- OneofDescriptor exposes the fields in the oneof
- Removed unnecessary code for replacing protos - remnant of extensions
- There's now just the non-generic form of IDescriptor

1 files changed, 2 insertions, 13 deletions

diff --git a/csharp/src/ProtocolBuffers/Descriptors/IDescriptor.cs b/csharp/src/ProtocolBuffers/Descriptors/IDescriptor.cs
index 2c2db127..92c6d463 100644
--- a/csharp/src/ProtocolBuffers/Descriptors/IDescriptor.cs
+++ b/csharp/src/ProtocolBuffers/Descriptors/IDescriptor.cs
@@ -33,23 +33,12 @@
 namespace Google.Protobuf.Descriptors

 {

     /// <summary>

-    /// The non-generic form of the IDescriptor interface. Useful for describing a general

-    /// descriptor.

+    /// Interface implemented by all descriptor types.

     /// </summary>

     public interface IDescriptor

     {

         string Name { get; }

         string FullName { get; }

         FileDescriptor File { get; }

-        IMessage Proto { get; }

-    }

-

-    /// <summary>

-    /// Strongly-typed form of the IDescriptor interface.

-    /// </summary>

-    /// <typeparam name="TProto">Protocol buffer type underlying this descriptor type</typeparam>

-    internal interface IDescriptor<TProto> : IDescriptor where TProto : IMessage

-    {

-        new TProto Proto { get; }

-    }

+    }    

 }
\ No newline at end of file