Merge branch 'release' into dev

Microsoft.DotNet.Watcher.Tools.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{66517987-2A5A-4330-B130-207039378FD4}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-watch", "src\dotnet-watch\dotnet-watch.xproj", "{8A8CEABC-AC47-43FF-A5DF-69224F7E1F46}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Watcher.Tools", "src\Microsoft.DotNet.Watcher.Tools\Microsoft.DotNet.Watcher.Tools.xproj", "{8A8CEABC-AC47-43FF-A5DF-69224F7E1F46}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Watcher.Core", "src\Microsoft.DotNet.Watcher.Core\Microsoft.DotNet.Watcher.Core.xproj", "{D3DA3BBB-E206-404F-AEE6-17FB9B6F1221}"
 EndProject
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F5B382BC-258F-46E1-AC3D-10E5CCD55134}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-watch.FunctionalTests", "test\dotnet-watch.FunctionalTests\dotnet-watch.FunctionalTests.xproj", "{16BADE2F-1184-4518-8A70-B68A19D0805B}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Watcher.Tools.FunctionalTests", "test\Microsoft.DotNet.Watcher.Tools.FunctionalTests\Microsoft.DotNet.Watcher.Tools.FunctionalTests.xproj", "{16BADE2F-1184-4518-8A70-B68A19D0805B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApps", "TestApps", "{2876B12E-5841-4792-85A8-2929AEE11885}"
 EndProject

NuGetPackageVerifier.json

@@ -4,7 +4,7 @@
             "AdxVerificationCompositeRule"
         ],
         "packages": {
-            "dotnet-watch": { },
+            "Microsoft.DotNet.Watcher.Tools": { },
             "Microsoft.DotNet.Watcher.Core": { }
         }
     },

src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs

@@ -5,7 +5,7 @@ using System;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DotNet.Watcher
+namespace Microsoft.DotNet.Watcher.Tools
 {
     /// <summary>
     /// Logger to print formatted command output.

src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs

@@ -5,7 +5,7 @@ using System;
 using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DotNet.Watcher
+namespace Microsoft.DotNet.Watcher.Tools
 {
     public class CommandOutputProvider : ILoggerProvider
     {

src/Microsoft.DotNet.Watcher.Tools/Program.cs

@@ -11,7 +11,7 @@ using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.DotNet.Watcher.Core;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DotNet.Watcher
+namespace Microsoft.DotNet.Watcher.Tools
 {
     public class Program
     {

src/Microsoft.DotNet.Watcher.Tools/Properties/AssemblyInfo.cs

@@ -5,7 +5,6 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-[assembly:InternalsVisibleTo("dotnet-watch.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: AssemblyCompany("Microsoft Corporation.")]

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

@@ -1,6 +1,7 @@
 {
   "version": "1.0.0-*",
   "compilationOptions": {
+    "outputName": "dotnet-watch",
     "warningsAsErrors": true,
     "emitEntryPoint": true,
     "keyFile": "../../tools/Key.snk",
@@ -14,7 +15,7 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
   "frameworks": {
-    "netstandard1.5": {
+    "netcoreapp1.0": {
       "imports": [
         "portable-net451+win8",
         "dnxcore50"

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/AppWithDepsTests.cs

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class AppWithDepsTests
     {

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs

@@ -9,7 +9,7 @@ using System.Threading;
 using Microsoft.DotNet.Watcher.Core.Internal;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class FileWatcherTests
     {

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/GlobbingAppTests.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Threading;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class GlobbingAppTests
     {

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/NoDepsAppTests.cs

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class NoDepsAppTests
     {

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/DotNetWatchScenario.cs

@@ -7,11 +7,11 @@ using System.Diagnostics;
 using System.IO;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class DotNetWatchScenario : IDisposable
     {
-        protected const string DotnetWatch = "dotnet-watch";
+        protected const string DotnetWatch = "Microsoft.DotNet.Watcher.Tools";
 
         protected static readonly string _repositoryRoot = FindRepoRoot();
         protected static readonly string _artifactsFolder = Path.Combine(_repositoryRoot, "artifacts", "build");

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs

@@ -10,7 +10,7 @@ using System.Threading;
 using System.Xml.Linq;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class ProjectToolScenario: IDisposable
     {

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs

@@ -6,7 +6,7 @@ using System.IO;
 using System.Threading;
 using Microsoft.DotNet.Watcher.Core.Internal;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public class WaitForFileToChange : IDisposable
     {

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Waiters.cs

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
-namespace Microsoft.DotNet.Watcher.FunctionalTests
+namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
     public static class Waiters
     {

test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json

@@ -17,11 +17,17 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "imports": [
         "portable-net451+win8",
         "dnxcore50"
-      ]
+      ],
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-*"
+        }
+      }
     }
   },
   "testRunner": "xunit"

test/TestApps/AppWithDeps/project.json

@@ -9,7 +9,7 @@
   },
 
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",

test/TestApps/Dependency/project.json

@@ -6,7 +6,7 @@
   },
 
   "frameworks": {
-    "netstandardapp1.5": {
+    "netstandard1.5": {
       "imports": [
         "dnxcore50",
         "portable-net451+win8"

test/TestApps/GlobbingApp/project.json

@@ -12,7 +12,7 @@
   ],
 
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",

test/TestApps/NoDepsApp/project.json

@@ -5,7 +5,7 @@
   },
 
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",