Internalize ICommand and all implementations

TomFinley · TomFinley · commit 9ebc1224b914 · 2018-11-15T16:49:14.000-08:00
diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.PipelineInference", "src\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj", "{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InferenceTesting", "test\Microsoft.ML.InferenceTesting\Microsoft.ML.InferenceTesting.csproj", "{E278EC99-E6EE-49FE-92E6-0A309A478D98}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Data", "src\Microsoft.ML.Data\Microsoft.ML.Data.csproj", "{AD92D96B-0E96-4F22-8DCE-892E13B1F282}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Onnx", "src\Microsoft.ML.Onnx\Microsoft.ML.Onnx.csproj", "{65D0603E-B96C-4DFC-BDD1-705891B88C18}"
@@ -175,14 +173,6 @@ Global
 		{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
 		{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
 		{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
@@ -520,7 +510,6 @@ Global
 		{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{46F2F967-C23F-4076-858D-33F7DA9BD2DA} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{2D7391C9-8254-4B8F-BF26-FADAF8F02F44} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
-		{E278EC99-E6EE-49FE-92E6-0A309A478D98} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{AD92D96B-0E96-4F22-8DCE-892E13B1F282} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{65D0603E-B96C-4DFC-BDD1-705891B88C18} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{707BB22C-7E5F-497A-8C2F-74578F675705} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
diff --git a/src/Microsoft.ML.Api/GenerateCodeCommand.cs b/src/Microsoft.ML.Api/GenerateCodeCommand.cs
@@ -24,7 +24,7 @@ namespace Microsoft.ML.Runtime.Api
     ///
     /// REVIEW: Consider adding support for generating VBuffers instead of arrays, maybe for high dimensionality vectors.
     /// </summary>
-    public sealed class GenerateCodeCommand : ICommand
+    internal sealed class GenerateCodeCommand : ICommand
     {
         public const string LoadName = "GenerateSamplePredictionCode";
         private const string CodeTemplatePath = "Microsoft.ML.Api.GeneratedCodeTemplate.csresource";
diff --git a/src/Microsoft.ML.Core/ComponentModel/AssemblyLoadingUtils.cs b/src/Microsoft.ML.Core/ComponentModel/AssemblyLoadingUtils.cs
@@ -6,11 +6,11 @@
 using System;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using System.Reflection;
 
 namespace Microsoft.ML.Runtime
 {
+    [BestFriend]
     internal static class AssemblyLoadingUtils
     {
         /// <summary>
diff --git a/src/Microsoft.ML.Core/Data/ICommand.cs b/src/Microsoft.ML.Core/Data/ICommand.cs
@@ -11,9 +11,11 @@ namespace Microsoft.ML.Runtime.Command
     /// <summary>
     /// The signature for commands.
     /// </summary>
-    public delegate void SignatureCommand();
+    [BestFriend]
+    internal delegate void SignatureCommand();
 
-    public interface ICommand
+    [BestFriend]
+    internal interface ICommand
     {
         void Run();
     }
diff --git a/src/Microsoft.ML.Data/Commands/EvaluateCommand.cs b/src/Microsoft.ML.Data/Commands/EvaluateCommand.cs
@@ -162,7 +162,7 @@ public static IDataTransform Create(IHostEnvironment env, Arguments args, IDataV
         }
     }
 
-    public sealed class EvaluateCommand : DataCommand.ImplBase<EvaluateCommand.Arguments>
+    internal sealed class EvaluateCommand : DataCommand.ImplBase<EvaluateCommand.Arguments>
     {
         public sealed class Arguments : DataCommand.ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Commands/SaveDataCommand.cs b/src/Microsoft.ML.Data/Commands/SaveDataCommand.cs
@@ -22,7 +22,7 @@
 
 namespace Microsoft.ML.Runtime.Data
 {
-    public sealed class SaveDataCommand : DataCommand.ImplBase<SaveDataCommand.Arguments>
+    internal sealed class SaveDataCommand : DataCommand.ImplBase<SaveDataCommand.Arguments>
     {
         public sealed class Arguments : DataCommand.ArgumentsBase
         {
@@ -87,7 +87,7 @@ private void RunCore(IChannel ch)
         }
     }
 
-    public sealed class ShowDataCommand : DataCommand.ImplBase<ShowDataCommand.Arguments>
+    internal sealed class ShowDataCommand : DataCommand.ImplBase<ShowDataCommand.Arguments>
     {
         public sealed class Arguments : DataCommand.ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Commands/SavePredictorCommand.cs b/src/Microsoft.ML.Data/Commands/SavePredictorCommand.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.ML.Runtime.Tools
 {
-    public sealed class SavePredictorCommand : ICommand
+    internal sealed class SavePredictorCommand : ICommand
     {
         public sealed class Arguments
         {
diff --git a/src/Microsoft.ML.Data/Commands/ScoreCommand.cs b/src/Microsoft.ML.Data/Commands/ScoreCommand.cs
@@ -37,7 +37,7 @@ public interface IDataScorerTransform : IDataTransform, ITransformTemplate
 
     public delegate void SignatureBindableMapper(IPredictor predictor);
 
-    public sealed class ScoreCommand : DataCommand.ImplBase<ScoreCommand.Arguments>
+    internal sealed class ScoreCommand : DataCommand.ImplBase<ScoreCommand.Arguments>
     {
         public sealed class Arguments : DataCommand.ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Commands/ShowSchemaCommand.cs b/src/Microsoft.ML.Data/Commands/ShowSchemaCommand.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.ML.Runtime.Data
 {
-    public sealed class ShowSchemaCommand : DataCommand.ImplBase<ShowSchemaCommand.Arguments>
+    internal sealed class ShowSchemaCommand : DataCommand.ImplBase<ShowSchemaCommand.Arguments>
     {
         public sealed class Arguments : DataCommand.ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Commands/TestCommand.cs b/src/Microsoft.ML.Data/Commands/TestCommand.cs
@@ -14,8 +14,12 @@
 
 namespace Microsoft.ML.Runtime.Data
 {
-    // This command is essentially chaining together Score and Evaluate, without the need to save the intermediary scored data.
-    public sealed class TestCommand : DataCommand.ImplBase<TestCommand.Arguments>
+    /// <summary>
+    /// This command is essentially chaining together <see cref="ScoreCommand"/> and
+    /// <see cref="EvaluateCommand"/>, without the need to save the intermediary scored data.
+    /// </summary>
+    [BestFriend]
+    internal sealed class TestCommand : DataCommand.ImplBase<TestCommand.Arguments>
     {
         public sealed class Arguments : DataCommand.ArgumentsBase
         {
diff --git a/src/Microsoft.ML.Data/Commands/TypeInfoCommand.cs b/src/Microsoft.ML.Data/Commands/TypeInfoCommand.cs
@@ -17,7 +17,7 @@
 
 namespace Microsoft.ML.Data.Commands
 {
-    public sealed class TypeInfoCommand : ICommand
+    internal sealed class TypeInfoCommand : ICommand
     {
         internal const string LoadName = "TypeInfo";
         internal const string Summary = "Displays information about the standard primitive " +
diff --git a/src/Microsoft.ML.Data/DataLoadSave/Binary/BinaryLoader.cs b/src/Microsoft.ML.Data/DataLoadSave/Binary/BinaryLoader.cs
@@ -2137,7 +2137,7 @@ public override ValueGetter<UInt128> GetIdGetter()
             }
         }
 
-        public sealed class InfoCommand : ICommand
+        internal sealed class InfoCommand : ICommand
         {
             public const string LoadName = "IdvInfo";
 
diff --git a/src/Microsoft.ML.FastTree/GamTrainer.cs b/src/Microsoft.ML.FastTree/GamTrainer.cs
@@ -981,7 +981,7 @@ public void SaveSummary(TextWriter writer, RoleMappedSchema schema)
         /// <see cref="GamPredictorBase"/>, it is convenient to have the command itself nested within the base
         /// predictor class.
         /// </summary>
-        public sealed class VisualizationCommand : DataCommand.ImplBase<VisualizationCommand.Arguments>
+        internal sealed class VisualizationCommand : DataCommand.ImplBase<VisualizationCommand.Arguments>
         {
             public const string Summary = "Loads a model trained with a GAM learner, and starts an interactive web session to visualize it.";
             public const string LoadName = "GamVisualization";
diff --git a/src/Microsoft.ML.FastTree/SumupPerformanceCommand.cs b/src/Microsoft.ML.FastTree/SumupPerformanceCommand.cs
@@ -29,7 +29,7 @@ namespace Microsoft.ML.Trainers.FastTree
     /// <summary>
     /// This is an internal utility command to measure the performance of the IntArray sumup operation.
     /// </summary>
-    public sealed class SumupPerformanceCommand : ICommand
+    internal sealed class SumupPerformanceCommand : ICommand
     {
         public sealed class Arguments
         {
diff --git a/src/Microsoft.ML.Legacy/Microsoft.ML.Legacy.csproj b/src/Microsoft.ML.Legacy/Microsoft.ML.Legacy.csproj
@@ -6,10 +6,6 @@
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Common\AssemblyLoadingUtils.cs" Link="Common\AssemblyLoadingUtils.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
diff --git a/src/Microsoft.ML.Legacy/Properties/AssemblyInfo.cs b/src/Microsoft.ML.Legacy/Properties/AssemblyInfo.cs
@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Reflection;
+using Microsoft.ML;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
-[assembly: InternalsVisibleTo("Microsoft.ML.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
+[assembly: InternalsVisibleTo("Microsoft.ML.Tests" + PublicKey.TestValue)]
+[assembly: InternalsVisibleTo("Microsoft.ML.Core.Tests" + PublicKey.TestValue)]
diff --git a/src/Microsoft.ML.Legacy/Runtime/EntryPoints/CodeGen/ModuleGenerator.cs b/src/Microsoft.ML.Legacy/Runtime/EntryPoints/CodeGen/ModuleGenerator.cs
@@ -21,7 +21,7 @@
 
 namespace Microsoft.ML.Runtime.EntryPoints.CodeGen
 {
-    public class ModuleGenerator : IGenerator
+    internal sealed class ModuleGenerator : IGenerator
     {
         private readonly string _modulePrefix;
         private readonly bool _generateModule;
diff --git a/src/Microsoft.ML.Legacy/Runtime/EntryPoints/JsonUtils/ExecuteGraphCommand.cs b/src/Microsoft.ML.Legacy/Runtime/EntryPoints/JsonUtils/ExecuteGraphCommand.cs
@@ -21,7 +21,7 @@
 
 namespace Microsoft.ML.Runtime.EntryPoints.JsonUtils
 {
-    public sealed class ExecuteGraphCommand : ICommand
+    internal sealed class ExecuteGraphCommand : ICommand
     {
         public sealed class Arguments
         {
diff --git a/src/Microsoft.ML.Legacy/Runtime/Internal/Tools/CSharpApiGenerator.cs b/src/Microsoft.ML.Legacy/Runtime/Internal/Tools/CSharpApiGenerator.cs
@@ -22,7 +22,7 @@
 
 namespace Microsoft.ML.Runtime.Internal.Tools
 {
-    public sealed class CSharpApiGenerator : IGenerator
+    internal sealed class CSharpApiGenerator : IGenerator
     {
         public sealed class Arguments
         {
diff --git a/src/Microsoft.ML.Maml/ChainCommand.cs b/src/Microsoft.ML.Maml/ChainCommand.cs
@@ -15,7 +15,8 @@ namespace Microsoft.ML.Runtime.Tools
 {
     using Stopwatch = System.Diagnostics.Stopwatch;
 
-    public sealed class ChainCommand : ICommand
+    [BestFriend]
+    internal sealed class ChainCommand : ICommand
     {
         public sealed class Arguments
         {
diff --git a/src/Microsoft.ML.Maml/HelpCommand.cs b/src/Microsoft.ML.Maml/HelpCommand.cs
@@ -23,14 +23,15 @@
 
 namespace Microsoft.ML.Runtime.Tools
 {
-    public interface IGenerator
+    [BestFriend]
+    internal interface IGenerator
     {
         void Generate(IEnumerable<HelpCommand.Component> infos);
     }
 
     public delegate void SignatureModuleGenerator(string regenerate);
 
-    public sealed class HelpCommand : ICommand
+    internal sealed class HelpCommand : ICommand
     {
         public sealed class Arguments
         {
@@ -423,7 +424,7 @@ private void GenerateModule(List<Component> components)
         }
     }
 
-    public sealed class XmlGenerator : IGenerator
+    internal sealed class XmlGenerator : IGenerator
     {
         public sealed class Arguments
         {
diff --git a/src/Microsoft.ML.Maml/Microsoft.ML.Maml.csproj b/src/Microsoft.ML.Maml/Microsoft.ML.Maml.csproj
@@ -7,10 +7,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Common\AssemblyLoadingUtils.cs" Link="Common\AssemblyLoadingUtils.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.Maml/Properties/AssemblyInfo.cs b/src/Microsoft.ML.Maml/Properties/AssemblyInfo.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using Microsoft.ML;
 
-[assembly: InternalsVisibleTo("Microsoft.ML.TestFramework, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
-[assembly: InternalsVisibleTo("Microsoft.ML.Benchmarks, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
+[assembly: InternalsVisibleTo("Microsoft.ML.TestFramework" + PublicKey.TestValue)]
+[assembly: InternalsVisibleTo("Microsoft.ML.Benchmarks" + PublicKey.TestValue)]
+
+[assembly: InternalsVisibleTo("Microsoft.ML.Legacy" + PublicKey.Value)]
+[assembly: InternalsVisibleTo("Microsoft.ML.ResultProcessor" + PublicKey.Value)]
diff --git a/src/Microsoft.ML.Maml/VersionCommand.cs b/src/Microsoft.ML.Maml/VersionCommand.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.ML.Runtime.Tools
 {
-    public sealed class VersionCommand : ICommand
+    internal sealed class VersionCommand : ICommand
     {
         internal const string Summary = "Prints the TLC version.";
 
diff --git a/src/Microsoft.ML.PipelineInference/GenerateSweepCandidatesCommand.cs b/src/Microsoft.ML.PipelineInference/GenerateSweepCandidatesCommand.cs
@@ -10,23 +10,23 @@
 using Microsoft.ML.Runtime.CommandLine;
 using Microsoft.ML.Runtime.Data;
 using Microsoft.ML.Runtime.Internal.Utilities;
-using Microsoft.ML.Runtime.MLTesting.Inference;
 using Microsoft.ML.Runtime.PipelineInference;
 using Microsoft.ML.Runtime.Sweeper;
 
 [assembly: LoadableClass(typeof(GenerateSweepCandidatesCommand), typeof(GenerateSweepCandidatesCommand.Arguments), typeof(SignatureCommand),
     "Generate Experiment Candidates", "GenerateSweepCandidates", DocName = "command/GenerateSweepCandidates.md")]
 
-namespace Microsoft.ML.Runtime.MLTesting.Inference
+namespace Microsoft.ML.Runtime.PipelineInference
 {
     /// <summary>
     /// This is a command that takes as an input:
     /// 1- the schema of a dataset, in the format produced by InferSchema
-    /// 2- the path to the datafile 
-    /// and generates experiment candidates by combining all the transform recipes suggested for the dataset, with all the learners available for the task. 
+    /// 2- the path to the datafile
+    /// and generates experiment candidates by combining all the transform recipes suggested for the dataset, with all the learners available for the task.
     /// </summary>
-    public sealed class GenerateSweepCandidatesCommand : ICommand
+    internal sealed class GenerateSweepCandidatesCommand : ICommand
     {
+#pragma warning disable CS0649 // The fields will still be set via the reflection driven mechanisms.
         public sealed class Arguments
         {
             [Argument(ArgumentType.Required, HelpText = "Text file with data to analyze.", ShortName = "data")]
@@ -53,6 +53,7 @@ public sealed class Arguments
             [Argument(ArgumentType.AtMostOnce, HelpText = "If this option is provided, the result RSP are indented and written in separate files for easier visual inspection. Otherwise all the generated RSPs are written to a single file, one RSP per line.")]
             public bool Indent;
         }
+#pragma warning disable CS0649
 
         private readonly IHost _host;
         private readonly string _dataFile;
diff --git a/src/Microsoft.ML.ResultProcessor/Microsoft.ML.ResultProcessor.csproj b/src/Microsoft.ML.ResultProcessor/Microsoft.ML.ResultProcessor.csproj
@@ -7,10 +7,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Common\AssemblyLoadingUtils.cs" Link="Common\AssemblyLoadingUtils.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
diff --git a/src/Microsoft.ML.Sweeper/Microsoft.ML.Sweeper.csproj b/src/Microsoft.ML.Sweeper/Microsoft.ML.Sweeper.csproj
@@ -13,11 +13,6 @@
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
     <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
     <ProjectReference Include="..\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj" />
-
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Common\AssemblyLoadingUtils.cs" Link="Common\AssemblyLoadingUtils.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.Sweeper/Properties/AssemblyInfo.cs b/src/Microsoft.ML.Sweeper/Properties/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+using Microsoft.ML;
+
+[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Legacy" + PublicKey.Value)]
+[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.PipelineInference" + PublicKey.Value)]
diff --git a/src/Microsoft.ML.Sweeper/SweepCommand.cs b/src/Microsoft.ML.Sweeper/SweepCommand.cs
@@ -16,8 +16,10 @@
 
 namespace Microsoft.ML.Runtime.Sweeper
 {
-    public sealed class SweepCommand : ICommand
+    [BestFriend]
+    internal sealed class SweepCommand : ICommand
     {
+#pragma warning disable CS0649 // The fields will still be set via the reflection driven mechanisms.
         public sealed class Arguments
         {
             [Argument(ArgumentType.Multiple, HelpText = "Config runner", ShortName = "run,ev,evaluator", SignatureType = typeof(SignatureConfigRunner))]
@@ -39,6 +41,7 @@ public sealed class Arguments
             [Argument(ArgumentType.AtMostOnce, HelpText = "Random seed", ShortName = "seed")]
             public int? RandomSeed;
         }
+#pragma warning restore CS0649
 
         internal const string Summary = "Given a command line template and sweep ranges, creates and runs a sweep.";
 
diff --git a/test/Microsoft.ML.InferenceTesting/Microsoft.ML.InferenceTesting.csproj b/test/Microsoft.ML.InferenceTesting/Microsoft.ML.InferenceTesting.csproj
diff --git a/test/Microsoft.ML.Predictor.Tests/Commands/InferRecipesCommand.cs b/test/Microsoft.ML.Predictor.Tests/Commands/InferRecipesCommand.cs
diff --git a/test/Microsoft.ML.Predictor.Tests/Commands/InferSchemaCommand.cs b/test/Microsoft.ML.Predictor.Tests/Commands/InferSchemaCommand.cs
diff --git a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace Microsoft.ML.Runtime.Api`
`24`	`24`	`///`
`25`	`25`	`/// REVIEW: Consider adding support for generating VBuffers instead of arrays, maybe for high dimensionality vectors.`
`26`	`26`	`/// </summary>`
`27`		`- public sealed class GenerateCodeCommand : ICommand`
	`27`	`+ internal sealed class GenerateCodeCommand : ICommand`
`28`	`28`	`{`
`29`	`29`	`public const string LoadName = "GenerateSamplePredictionCode";`
`30`	`30`	`private const string CodeTemplatePath = "Microsoft.ML.Api.GeneratedCodeTemplate.csresource";`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`using System;`
`7`	`7`	`using System.IO;`
`8`	`8`	`using System.IO.Compression;`
`9`		`-using System.Linq;`
`10`	`9`	`using System.Reflection;`
`11`	`10`
`12`	`11`	`namespace Microsoft.ML.Runtime`
`13`	`12`	`{`
	`13`	`+ [BestFriend]`
`14`	`14`	`internal static class AssemblyLoadingUtils`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,11 @@ namespace Microsoft.ML.Runtime.Command`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// The signature for commands.`
`13`	`13`	`/// </summary>`
`14`		`- public delegate void SignatureCommand();`
	`14`	`+ [BestFriend]`
	`15`	`+ internal delegate void SignatureCommand();`
`15`	`16`
`16`		`- public interface ICommand`
	`17`	`+ [BestFriend]`
	`18`	`+ internal interface ICommand`
`17`	`19`	`{`
`18`	`20`	`void Run();`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public static IDataTransform Create(IHostEnvironment env, Arguments args, IDataV`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`165`		`- public sealed class EvaluateCommand : DataCommand.ImplBase<EvaluateCommand.Arguments>`
	`165`	`+ internal sealed class EvaluateCommand : DataCommand.ImplBase<EvaluateCommand.Arguments>`
`166`	`166`	`{`
`167`	`167`	`public sealed class Arguments : DataCommand.ArgumentsBase`
`168`	`168`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`namespace Microsoft.ML.Runtime.Data`
`24`	`24`	`{`
`25`		`- public sealed class SaveDataCommand : DataCommand.ImplBase<SaveDataCommand.Arguments>`
	`25`	`+ internal sealed class SaveDataCommand : DataCommand.ImplBase<SaveDataCommand.Arguments>`
`26`	`26`	`{`
`27`	`27`	`public sealed class Arguments : DataCommand.ArgumentsBase`
`28`	`28`	`{`
`@@ -87,7 +87,7 @@ private void RunCore(IChannel ch)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- public sealed class ShowDataCommand : DataCommand.ImplBase<ShowDataCommand.Arguments>`
	`90`	`+ internal sealed class ShowDataCommand : DataCommand.ImplBase<ShowDataCommand.Arguments>`
`91`	`91`	`{`
`92`	`92`	`public sealed class Arguments : DataCommand.ArgumentsBase`
`93`	`93`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`namespace Microsoft.ML.Runtime.Tools`
`22`	`22`	`{`
`23`		`- public sealed class SavePredictorCommand : ICommand`
	`23`	`+ internal sealed class SavePredictorCommand : ICommand`
`24`	`24`	`{`
`25`	`25`	`public sealed class Arguments`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public interface IDataScorerTransform : IDataTransform, ITransformTemplate`
`37`	`37`
`38`	`38`	`public delegate void SignatureBindableMapper(IPredictor predictor);`
`39`	`39`
`40`		`- public sealed class ScoreCommand : DataCommand.ImplBase<ScoreCommand.Arguments>`
	`40`	`+ internal sealed class ScoreCommand : DataCommand.ImplBase<ScoreCommand.Arguments>`
`41`	`41`	`{`
`42`	`42`	`public sealed class Arguments : DataCommand.ArgumentsBase`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,12 @@`
`14`	`14`
`15`	`15`	`namespace Microsoft.ML.Runtime.Data`
`16`	`16`	`{`
`17`		`- // This command is essentially chaining together Score and Evaluate, without the need to save the intermediary scored data.`
`18`		`- public sealed class TestCommand : DataCommand.ImplBase<TestCommand.Arguments>`
	`17`	`+ /// <summary>`
	`18`	`+ /// This command is essentially chaining together <see cref="ScoreCommand"/> and`
	`19`	`+ /// <see cref="EvaluateCommand"/>, without the need to save the intermediary scored data.`
	`20`	`+ /// </summary>`
	`21`	`+ [BestFriend]`
	`22`	`+ internal sealed class TestCommand : DataCommand.ImplBase<TestCommand.Arguments>`
`19`	`23`	`{`
`20`	`24`	`public sealed class Arguments : DataCommand.ArgumentsBase`
`21`	`25`	`{`