Merge pull request #725 from piotrpMSFT/piotrpMSFT/issue724/CliUtilsPublic

Cli.Utils internal --> public
squashed

src/Microsoft.DotNet.Cli.Utils/AnsiColorExtensions.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal static class AnsiColorExtensions
+    public static class AnsiColorExtensions
     {
         public static string Black(this string text)
         {

src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs

@@ -6,7 +6,7 @@ using System.IO;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal class AnsiConsole
+    public class AnsiConsole
     {
         private AnsiConsole(TextWriter writer, bool useConsoleColor)
         {

src/Microsoft.DotNet.Cli.Utils/Command.cs

@@ -15,7 +15,7 @@ using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal class Command
+    public class Command
     {
         private readonly Process _process;
         private readonly StreamForwarder _stdOut;
@@ -335,7 +335,7 @@ namespace Microsoft.DotNet.Cli.Utils
         }
     }
 
-    internal sealed class StreamForwarder
+    public sealed class StreamForwarder
     {
         private const int DefaultBufferSize = 256;
 
@@ -345,12 +345,12 @@ namespace Microsoft.DotNet.Cli.Utils
         private Action<string> _write;
         private Action<string> _writeLine;
 
-        internal StreamForwarder(int bufferSize = DefaultBufferSize)
+        public StreamForwarder(int bufferSize = DefaultBufferSize)
         {
             _bufferSize = bufferSize;
         }
 
-        internal void Capture()
+        public void Capture()
         {
             if (_capture != null)
             {
@@ -359,12 +359,12 @@ namespace Microsoft.DotNet.Cli.Utils
             _capture = new StringWriter();
         }
 
-        internal string GetCapturedOutput()
+        public string GetCapturedOutput()
         {
             return _capture?.GetStringBuilder()?.ToString();
         }
 
-        internal void ForwardTo(Action<string> write, Action<string> writeLine)
+        public void ForwardTo(Action<string> write, Action<string> writeLine)
         {
             if (writeLine == null)
             {
@@ -378,14 +378,14 @@ namespace Microsoft.DotNet.Cli.Utils
             _writeLine = writeLine;
         }
 
-        internal Thread BeginRead(TextReader reader)
+        public Thread BeginRead(TextReader reader)
         {
             var thread = new Thread(() => Read(reader)) { IsBackground = true };
             thread.Start();
             return thread;
         }
 
-        internal void Read(TextReader reader)
+        public void Read(TextReader reader)
         {
             _builder = new StringBuilder();
             var buffer = new char[_bufferSize];

src/Microsoft.DotNet.Cli.Utils/CommandContext.cs

@@ -8,13 +8,13 @@ using System.Threading.Tasks;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal static class CommandContext
+    public static class CommandContext
     {
-        internal static class Variables
+        public static class Variables
         {
             private static readonly string Prefix = "DOTNET_CLI_CONTEXT_";
-            internal static readonly string Verbose = Prefix + "VERBOSE";
+            public static readonly string Verbose = Prefix + "VERBOSE";
-            internal static readonly string AnsiPassThru = Prefix + "ANSI_PASS_THRU";
+            public static readonly string AnsiPassThru = Prefix + "ANSI_PASS_THRU";
         }
 
         private static Lazy<bool> _verbose = new Lazy<bool>(() => GetBool(Variables.Verbose));

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Chain.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.DotNet.Cli.Utils.CommandParsing
 {
-    internal struct Chain<TLeft, TDown>
+    public struct Chain<TLeft, TDown>
     {
         public Chain(TLeft left, TDown down)
             : this()

src/Microsoft.DotNet.Cli.Utils/CommandParsing/CommandGrammar.cs

@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace Microsoft.DotNet.Cli.Utils.CommandParsing
 {
-    internal class CommandGrammar : Grammar
+    public class CommandGrammar : Grammar
     {
         private CommandGrammar(Func<string, string> variable, bool preserveSurroundingQuotes)
         {

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Cursor.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.DotNet.Cli.Utils.CommandParsing
 {
-    internal struct Cursor
+    public struct Cursor
     {
         private readonly string _text;
         private readonly int _start;

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Grammar.cs

@@ -6,7 +6,7 @@ using System.Linq;
 
 namespace Microsoft.DotNet.Cli.Utils.CommandParsing
 {
-    internal class Grammar
+    public class Grammar
     {
         protected static Parser<IList<TValue>> Rep1<TValue>(Parser<TValue> parser)
         {

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Parser.cs

@@ -3,5 +3,5 @@
 
 namespace Microsoft.DotNet.Cli.Utils.CommandParsing
 {
-    internal delegate Result<TValue> Parser<TValue>(Cursor cursor);
+    public delegate Result<TValue> Parser<TValue>(Cursor cursor);
 }

src/Microsoft.DotNet.Cli.Utils/CommandParsing/ParserExtensions.cs

@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace Microsoft.DotNet.Cli.Utils.CommandParsing
 {
-    internal static class ParserExtensions
+    public static class ParserExtensions
     {
         public static Parser<Chain<T1, T2>> And<T1, T2>(this Parser<T1> parser1,
             Parser<T2> parser2)

src/Microsoft.DotNet.Cli.Utils/CommandParsing/Result.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.DotNet.Cli.Utils.CommandParsing
 {
-    internal struct Result<TValue>
+    public struct Result<TValue>
     {
         public Result(TValue value, Cursor remainder)
             : this()

src/Microsoft.DotNet.Cli.Utils/Constants.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal static class Constants
+    public static class Constants
     {
         public static readonly string ProjectFileName = "project.json";
         public static readonly string ExeSuffix = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty;

src/Microsoft.DotNet.Cli.Utils/DebugHelper.cs

@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal static class DebugHelper
+    public static class DebugHelper
     {
         [Conditional("DEBUG")]
         public static void HandleDebugSwitch(ref string[] args)

src/Microsoft.DotNet.Cli.Utils/Env.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal static class Env
+    public static class Env
     {
         private static IEnumerable<string> _searchPaths;
         private static IEnumerable<string> _executableExtensions;

src/Microsoft.DotNet.Cli.Utils/PathUtility.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 
 namespace Microsoft.DotNet.Tools.Common
 {
-    internal static class PathUtility
+    public static class PathUtility
     {
         public static bool IsPlaceholderFile(string path)
         {

src/Microsoft.DotNet.Cli.Utils/Reporter.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 namespace Microsoft.DotNet.Cli.Utils
 {
     // Stupid-simple console manager
-    internal class Reporter
+    public class Reporter
     {
         private static readonly Reporter Null = new Reporter(console: null);
         private static object _lock = new object();

src/Microsoft.DotNet.Cli.Utils/ScriptExecutor.cs

@@ -8,7 +8,7 @@ using Microsoft.DotNet.ProjectModel;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal static class ScriptExecutor
+    public static class ScriptExecutor
     {
         public static Command CreateCommandForScript(Project project, string scriptCommandLine, IDictionary<string, string> variables)
         {

src/Microsoft.DotNet.Cli.Utils/ScriptNames.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
-    internal static class ScriptNames
+    public static class ScriptNames
     {
         public const string PreCompile = "precompile";
         public const string PostCompile = "postcompile";

src/Microsoft.DotNet.Cli.Utils/project.json

@@ -1,8 +1,6 @@
 {
   "version": "1.0.0-*",
-
+  
-  "shared": "**/*.cs",
-
   "dependencies": {
     "NETStandard.Library": "1.0.0-rc2-23616",
     "Microsoft.DotNet.ProjectModel": "1.0.0",

src/Microsoft.DotNet.Cli/project.json

@@ -7,10 +7,7 @@
     "dependencies": {
         "NETStandard.Library": "1.0.0-rc2-23616",
         
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Compiler.Common/project.json

@@ -11,10 +11,7 @@
         "System.CommandLine": "0.1.0-*",
         "Microsoft.CodeAnalysis.CSharp":  "1.1.1",
         "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*"
-            "type": "build",
-            "version": "1.0.0-*"
-        }
     },
     "frameworks": {
         "dnxcore50": { }

src/Microsoft.DotNet.Tools.Builder/project.json

@@ -12,10 +12,7 @@
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
     "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
     "Microsoft.DotNet.Tools.Compiler": "1.0.0-*",
-    "Microsoft.DotNet.Cli.Utils": {
+    "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-      "type": "build",
-      "version": "1.0.0-*"
-    },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
       "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Compiler.Csc/project.json

@@ -9,10 +9,7 @@
         
         "Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20151228-02",
 
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Compiler.Fsc/project.json

@@ -9,10 +9,7 @@
         
         "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218",
 
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Compiler.Native/project.json

@@ -7,10 +7,7 @@
     "dependencies": {
         "NETStandard.Library": "1.0.0-rc2-23616",
         
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Compiler/project.json

@@ -9,10 +9,7 @@
     "System.Reflection.Metadata": "1.1.0",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
     "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
-    "Microsoft.DotNet.Cli.Utils": {
+    "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-      "type": "build",
-      "version": "1.0.0-*"
-    },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
       "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.New/project.json

@@ -8,10 +8,7 @@
         "NETStandard.Library": "1.0.0-rc2-23616",
 
         "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Pack/project.json

@@ -10,10 +10,7 @@
     
     "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-    "Microsoft.DotNet.Cli.Utils": {
+    "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-      "type": "build",
-      "version": "1.0.0-*"
-    },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
       "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Publish/project.json

@@ -8,10 +8,7 @@
         "NETStandard.Library": "1.0.0-rc2-23616",
 
         "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Repl.Csi/project.json

@@ -9,10 +9,7 @@
         
         "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20151228-02",
 
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Repl/project.json

@@ -8,10 +8,7 @@
         "NETStandard.Library": "1.0.0-rc2-23616",
         
         "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Resgen/project.json

@@ -11,10 +11,7 @@
 
         "Microsoft.CodeAnalysis.CSharp":  "1.1.1",
         "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-            "type": "build",
-            "version": "1.0.0-*"
-        },
         "Microsoft.Extensions.CommandLineUtils.Sources": {
             "type": "build",
             "version": "1.0.0-*"

src/Microsoft.DotNet.Tools.Run/project.json

@@ -11,10 +11,7 @@
         "System.CommandLine" : "0.1.0-d111815-3",
 
         "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-        "Microsoft.DotNet.Cli.Utils": {
+        "Microsoft.DotNet.Cli.Utils": "1.0.0-*"
-            "type": "build",
-            "version": "1.0.0-*"
-        }
     },
     "frameworks": {
         "dnxcore50": { }

src/Microsoft.DotNet.Tools.Test/project.json

@@ -14,10 +14,7 @@
     "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23616",
     "Microsoft.NETCore.TestHost": "1.0.0-rc2-23616",
     "Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*",
-    "Microsoft.DotNet.Cli.Utils": {
+    "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-      "type": "build",
-      "version": "1.0.0-*"
-    },
     "Microsoft.Dnx.Runtime.CommandParsing.Sources": {
       "version": "1.0.0-*",
       "type": "build"

tools/MultiProjectValidator/project.json

@@ -8,7 +8,7 @@
     "dependencies": {
       "NETStandard.Library": "1.0.0-rc2-23614",
       "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-      "Microsoft.DotNet.Cli.Utils": "1.0.0-*", 
+      "Microsoft.DotNet.Cli.Utils": "1.0.0-*"
     },
 
     "frameworks": {