First part of making the C# runtime work with the new codegen.

1) Remove CSharpOptions
2) A new version of DescriptorProtoFile (with manual changes from codegen - it would otherwise be Descriptor.cs)
3) Turn off CLS compliance (which we'll remove from the codebase entirely; I don't think it's actually relevant these days)
4) Add "public imports" to FileDescriptor, with code broadly copied from the Java codebase.
Lots more changes to commit before it will build and tests run, but one step at a time...

1 files changed, 0 insertions, 19 deletions

diff --git a/csharp/src/ProtocolBuffers/Descriptors/MessageDescriptor.cs b/csharp/src/ProtocolBuffers/Descriptors/MessageDescriptor.cs
index d438c0ff..5b29849c 100644
--- a/csharp/src/ProtocolBuffers/Descriptors/MessageDescriptor.cs
+++ b/csharp/src/ProtocolBuffers/Descriptors/MessageDescriptor.cs
@@ -159,25 +159,6 @@ namespace Google.ProtocolBuffers.Descriptors
         }

 

         /// <summary>

-        /// Finds a field by its property name, as it would be generated by protogen.

-        /// </summary>

-        /// <param name="propertyName">The property name within this message type.</param>

-        /// <returns>The field's descriptor, or null if not found.</returns>

-        public FieldDescriptor FindFieldByPropertyName(string propertyName)

-        {

-            // For reasonably short messages, this will be more efficient than a dictionary

-            // lookup. It also means we don't need to do things lazily with locks etc.

-            foreach (FieldDescriptor field in Fields)

-            {

-                if (field.CSharpOptions.PropertyName == propertyName)

-                {

-                    return field;

-                }

-            }

-            return null;

-        }

-

-        /// <summary>

         /// Finds a nested descriptor by name. The is valid for fields, nested

         /// message types and enums.

         /// </summary>