Removed some uses of InternalsVisibleTo, made some stuff public

src/ProtoBench/ProtoBench.csproj

@@ -54,7 +54,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />

src/ProtoGen/Generator.cs

@@ -124,7 +124,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
     /// Note: this method is internal rather than private to allow testing.
     /// </summary>
     /// <exception cref="DependencyResolutionException">Not all dependencies could be resolved.</exception>
-    internal static IList<FileDescriptor> ConvertDescriptors(CSharpFileOptions options, params FileDescriptorSet[] descriptorProtos) {
+    public static IList<FileDescriptor> ConvertDescriptors(CSharpFileOptions options, params FileDescriptorSet[] descriptorProtos) {
       // Simple strategy: Keep going through the list of protos to convert, only doing ones where
       // we've already converted all the dependencies, until we get to a stalemate
       List<FileDescriptorProto> fileList = new List<FileDescriptorProto>();

src/ProtoGen/ProgramPreprocess.cs

@@ -11,7 +11,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
   /// --descriptor_set_out= is specified the proto buffer file is kept, otherwise it will be removed
   /// after code generation.
   /// </summary>
-  internal class ProgramPreprocess {
+  public class ProgramPreprocess {
     private static int Main(string[] args) {
       try {
         return Environment.ExitCode = Run(args);
@@ -22,7 +22,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
       }
     }
 
-    internal static int Run(params string[] args) {
+    public static int Run(params string[] args) {
       bool deleteFile = false;
       string tempFile = null;
       int result;

src/ProtoGen/Properties/AssemblyInfo.cs

@@ -34,9 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("2.3.0.277")]
 [assembly: AssemblyVersion("2.3.0.277")]
 [assembly: AssemblyFileVersion("2.3.0.277")]
-[assembly: InternalsVisibleTo("Google.ProtocolBuffers.ProtoGen.Test,PublicKey=" +
-"0024000004800000940000000602000000240000525341310004000001000100cf43741ffc3e65" +
-"c85707245e144e90f1bb82f20d1b1555846008d4d5d5c9270a980350dcb1ddd40fcdde13c2780c" +
-"75c9057123daa5613cb6551e2b8bd2254e8f84b3893369869e5119b752442aef7156c4defc489b" +
-"96c44ff801fe8d94199e048f8ff414813c9c811a029bcd697040700dc66982539e9b368cb5e725" +
-"feed60f2")]
+

src/ProtoGen/SourceGenerators.cs

@@ -37,6 +37,9 @@ using System.Collections.Generic;
 using Google.ProtocolBuffers.Descriptors;
 
 namespace Google.ProtocolBuffers.ProtoGen {
+
+  public delegate TResult Func<T, TResult>(T arg);
+
   internal static class SourceGenerators {
 
     private static readonly Dictionary<Type, Func<IDescriptor, ISourceGenerator>> GeneratorFactories = new Dictionary<Type, Func<IDescriptor, ISourceGenerator>> {

src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs

@@ -35,6 +35,9 @@
 using System;
 using NUnit.Framework;
 
+delegate void Action();
+
+
 namespace Google.ProtocolBuffers.Collections {
   [TestFixture]
   public class PopsicleListTest {

src/ProtocolBuffers/Descriptors/EnumDescriptor.cs

@@ -95,7 +95,7 @@ namespace Google.ProtocolBuffers.Descriptors {
     /// </summary>
     /// <param name="name">The unqualified name of the value (e.g. "FOO").</param>
     /// <returns>The value's descriptor, or null if not found.</returns>
-    internal EnumValueDescriptor FindValueByName(string name) {
+    public EnumValueDescriptor FindValueByName(string name) {
       return File.DescriptorPool.FindSymbol<EnumValueDescriptor>(FullName + "." + name);
     }
 

src/ProtocolBuffers/Descriptors/FileDescriptor.cs

@@ -81,7 +81,7 @@ namespace Google.ProtocolBuffers.Descriptors {
     /// Allows a file descriptor to be configured with a set of external options, e.g. from the
     /// command-line arguments to protogen.
     /// </summary>
-    internal void ConfigureWithDefaultOptions(CSharpFileOptions options) {
+    public void ConfigureWithDefaultOptions(CSharpFileOptions options) {
       csharpFileOptions = BuildOrFakeWithDefaultOptions(options);
     }
 

src/ProtocolBuffers/NameHelpers.cs

@@ -39,13 +39,13 @@ namespace Google.ProtocolBuffers {
   /// <summary>
   /// Helpers for converting names to pascal case etc.
   /// </summary>
-  internal class NameHelpers {
+  public class NameHelpers {
 
-    internal static string UnderscoresToPascalCase(string input) {
+    public static string UnderscoresToPascalCase(string input) {
       return UnderscoresToPascalOrCamelCase(input, true);
     }
 
-    internal static string UnderscoresToCamelCase(string input) {
+    public static string UnderscoresToCamelCase(string input) {
       return UnderscoresToPascalOrCamelCase(input, false);
     }
 

src/ProtocolBuffers/Properties/AssemblyInfo.cs

@@ -68,22 +68,19 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyFileVersion("2.3.0.277")]
 #endif
 
-[assembly:InternalsVisibleTo("Google.ProtocolBuffers.Test,PublicKey="+
-"00240000048000009400000006020000002400005253413100040000010001008179f2dd31a648"+
-"2a2359dbe33e53701167a888e7c369a9ae3210b64f93861d8a7d286447e58bc167e3d99483beda"+
-"72f738140072bb69990bc4f98a21365de2c105e848974a3d210e938b0a56103c0662901efd6b78"+
-"0ee6dbe977923d46a8fda18fb25c65dd73b149a5cd9f3100668b56649932dadd8cf5be52eb1dce"+
-"ad5cedbf")]
-[assembly: InternalsVisibleTo("Google.ProtocolBuffersLite.Test,PublicKey=" +
-"00240000048000009400000006020000002400005253413100040000010001008179f2dd31a648" +
-"2a2359dbe33e53701167a888e7c369a9ae3210b64f93861d8a7d286447e58bc167e3d99483beda" +
-"72f738140072bb69990bc4f98a21365de2c105e848974a3d210e938b0a56103c0662901efd6b78" +
-"0ee6dbe977923d46a8fda18fb25c65dd73b149a5cd9f3100668b56649932dadd8cf5be52eb1dce" +
-"ad5cedbf")]
-[assembly: InternalsVisibleTo("ProtoGen,PublicKey=" +
-"00240000048000009400000006020000002400005253413100040000010001006d739020e13bdc" +
-"038e86fa8aa5e1b13aae65d3ae79d622816c6067ab5b6955be50cc887130117582349208c13a55" +
-"5e09a6084558f989ccde66094f07822808d3a9b922b0e85b912070032e90bb35360be7efb7982b" +
-"702d7a5c6ed1e21d8ca587b4f4c9d2b81210d3641cc75f506cdfc628ac5453ff0a6886986c981d" +
-"12245bc7")]
+[assembly: InternalsVisibleTo("Google.ProtocolBuffers.Test,PublicKey=" + Google.ProtocolBuffers.Properties.KnownKeys.PublishedKey)]
+[assembly: InternalsVisibleTo("Google.ProtocolBuffersLite.Test,PublicKey=" + Google.ProtocolBuffers.Properties.KnownKeys.PublishedKey)]
+
 [assembly: CLSCompliant(true)]
+
+namespace Google.ProtocolBuffers.Properties
+{
+    class KnownKeys
+    {
+        public const string PublishedKey = @"00240000048000009400000006020000002400005253413100040000110000003b4611704c5379" +
+                                            "39c3e0fbe9447dd6fa5462507f9dd4fd9fbf0712457e415b037da6d2c4eb5d2c7d29c86380af68" +
+                                            "7cf400401bb183f2a70bd3b631c1fcb7db8aa66c766694a9fb53fa765df6303104da8c978f3b6d" +
+                                            "53909cd30685b8bc9922c726cd82b5995e9e2cfca6df7a2d189d851492e49f4b76f269ce6dfd08" +
+                                            "c34a7d98";
+    }
+}

src/ProtocolBuffers/WireFormat.cs

@@ -52,13 +52,13 @@ namespace Google.ProtocolBuffers {
 
 #region Fixed sizes.
     // TODO(jonskeet): Move these somewhere else. They're messy. Consider making FieldType a smarter kind of enum
-    internal const int Fixed32Size = 4;
-    internal const int Fixed64Size = 8;
-    internal const int SFixed32Size = 4;
-    internal const int SFixed64Size = 8;
-    internal const int FloatSize = 4;
-    internal const int DoubleSize = 8;
-    internal const int BoolSize = 1;
+    public const int Fixed32Size = 4;
+    public const int Fixed64Size = 8;
+    public const int SFixed32Size = 4;
+    public const int SFixed64Size = 8;
+    public const int FloatSize = 4;
+    public const int DoubleSize = 8;
+    public const int BoolSize = 1;
 #endregion
 
     [CLSCompliant(false)]