diff --git a/DotNetTools.sln b/DotNetTools.sln
index 8852cbde1a..f5b20b98f9 100644
--- a/DotNetTools.sln
+++ b/DotNetTools.sln
@@ -1,4 +1,3 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
@@ -7,8 +6,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{66517987-2A5
EndProject
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
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8321E0D1-9A47-4D2F-AED8-3AE636D44E35}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
@@ -47,10 +44,6 @@ Global
{8A8CEABC-AC47-43FF-A5DF-69224F7E1F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A8CEABC-AC47-43FF-A5DF-69224F7E1F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A8CEABC-AC47-43FF-A5DF-69224F7E1F46}.Release|Any CPU.Build.0 = Release|Any CPU
- {D3DA3BBB-E206-404F-AEE6-17FB9B6F1221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D3DA3BBB-E206-404F-AEE6-17FB9B6F1221}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D3DA3BBB-E206-404F-AEE6-17FB9B6F1221}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D3DA3BBB-E206-404F-AEE6-17FB9B6F1221}.Release|Any CPU.Build.0 = Release|Any CPU
{16BADE2F-1184-4518-8A70-B68A19D0805B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{16BADE2F-1184-4518-8A70-B68A19D0805B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{16BADE2F-1184-4518-8A70-B68A19D0805B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,21 +72,20 @@ Global
{7B331122-83B1-4F08-A119-DC846959844C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B331122-83B1-4F08-A119-DC846959844C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B331122-83B1-4F08-A119-DC846959844C}.Release|Any CPU.Build.0 = Release|Any CPU
- {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Release|Any CPU.Build.0 = Release|Any CPU
{8A2E6961-6B12-4A8E-8215-3E7301D52EAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A2E6961-6B12-4A8E-8215-3E7301D52EAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A2E6961-6B12-4A8E-8215-3E7301D52EAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A2E6961-6B12-4A8E-8215-3E7301D52EAC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {53F3B53D-303A-4DAA-9C38-4F55195FA5B9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8A8CEABC-AC47-43FF-A5DF-69224F7E1F46} = {66517987-2A5A-4330-B130-207039378FD4}
- {D3DA3BBB-E206-404F-AEE6-17FB9B6F1221} = {66517987-2A5A-4330-B130-207039378FD4}
{16BADE2F-1184-4518-8A70-B68A19D0805B} = {F5B382BC-258F-46E1-AC3D-10E5CCD55134}
{2876B12E-5841-4792-85A8-2929AEE11885} = {F5B382BC-258F-46E1-AC3D-10E5CCD55134}
{4F0D8A80-221F-4BCB-822E-44A0655F537E} = {2876B12E-5841-4792-85A8-2929AEE11885}
@@ -102,7 +94,7 @@ Global
{2F48041A-F7D1-478F-9C38-D41F0F05E8CA} = {2876B12E-5841-4792-85A8-2929AEE11885}
{8730E848-CA0F-4E0A-9A2F-BC22AD0B2C4E} = {66517987-2A5A-4330-B130-207039378FD4}
{7B331122-83B1-4F08-A119-DC846959844C} = {F5B382BC-258F-46E1-AC3D-10E5CCD55134}
- {53F3B53D-303A-4DAA-9C38-4F55195FA5B9} = {66517987-2A5A-4330-B130-207039378FD4}
{8A2E6961-6B12-4A8E-8215-3E7301D52EAC} = {F5B382BC-258F-46E1-AC3D-10E5CCD55134}
+ {53F3B53D-303A-4DAA-9C38-4F55195FA5B9} = {66517987-2A5A-4330-B130-207039378FD4}
EndGlobalSection
EndGlobal
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index fe8b1557a4..6f028d94a6 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -5,7 +5,6 @@
],
"packages": {
"Microsoft.DotNet.Watcher.Tools": { },
- "Microsoft.DotNet.Watcher.Core": { },
"Microsoft.Extensions.Caching.SqlConfig.Tools": { },
"Microsoft.Extensions.SecretManager.Tools": { }
}
diff --git a/src/Microsoft.DotNet.Watcher.Core/Microsoft.DotNet.Watcher.Core.xproj b/src/Microsoft.DotNet.Watcher.Core/Microsoft.DotNet.Watcher.Core.xproj
deleted file mode 100644
index c8b26f14d5..0000000000
--- a/src/Microsoft.DotNet.Watcher.Core/Microsoft.DotNet.Watcher.Core.xproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- d3da3bbb-e206-404f-aee6-17fb9b6f1221
- .\obj
- .\bin\
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Watcher.Core/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Watcher.Core/Properties/AssemblyInfo.cs
deleted file mode 100644
index 540e9029bc..0000000000
--- a/src/Microsoft.DotNet.Watcher.Core/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Reflection;
-using System.Resources;
-
-[assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: NeutralResourcesLanguage("en-US")]
-[assembly: AssemblyCompany("Microsoft Corporation.")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft .NET")]
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Watcher.Core/project.json b/src/Microsoft.DotNet.Watcher.Core/project.json
deleted file mode 100644
index 2f3f041420..0000000000
--- a/src/Microsoft.DotNet.Watcher.Core/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "version": "1.0.0-*",
- "description": "Core logic for the dotnet-watch command line tool.",
- "packOptions": {
- "tags": [
- "dotnet",
- "watch"
- ]
- },
- "buildOptions": {
- "warningsAsErrors": true,
- "keyFile": "../../tools/Key.snk",
- "nowarn": [
- "CS1591"
- ],
- "xmlDoc": true
- },
- "dependencies": {
- "Microsoft.DotNet.ProjectModel": "1.0.0-*",
- "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
- "Microsoft.Extensions.FileProviders.Abstractions": "1.1.0-*",
- "Microsoft.Extensions.FileProviders.Physical": "1.1.0-*",
- "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*",
- "Microsoft.Extensions.FileSystemGlobbing": "1.1.0-*",
- "Microsoft.Extensions.Process.Sources": {
- "type": "build",
- "version": "1.1.0-*"
- }
- },
- "frameworks": {
- "netstandard1.6": {}
- }
-}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs b/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs
index 03ab69567c..4d7c998622 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using Microsoft.Extensions.CommandLineUtils;
-namespace Microsoft.DotNet.Watcher.Tools
+namespace Microsoft.DotNet.Watcher
{
internal class CommandLineOptions
{
diff --git a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs b/src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs
index 9ad0149db1..aeb90f45c2 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs
+++ b/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.Tools
+namespace Microsoft.DotNet.Watcher
{
///
/// Logger to print formatted command output.
diff --git a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs b/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs
index 34d2149009..7d9c2fd808 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs
@@ -4,7 +4,7 @@
using System.Runtime.InteropServices;
using Microsoft.Extensions.Logging;
-namespace Microsoft.DotNet.Watcher.Tools
+namespace Microsoft.DotNet.Watcher
{
public class CommandOutputProvider : ILoggerProvider
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/DotNetWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/DotNetWatcher.cs
similarity index 98%
rename from src/Microsoft.DotNet.Watcher.Core/DotNetWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/DotNetWatcher.cs
index 2fe63625d2..d159af747f 100644
--- a/src/Microsoft.DotNet.Watcher.Core/DotNetWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/DotNetWatcher.cs
@@ -7,10 +7,10 @@ using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.Watcher.Core.Internal;
+using Microsoft.DotNet.Watcher.Internal;
using Microsoft.Extensions.Logging;
-namespace Microsoft.DotNet.Watcher.Core
+namespace Microsoft.DotNet.Watcher
{
public class DotNetWatcher
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/DotnetFileWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/DotnetFileWatcher.cs
similarity index 98%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/DotnetFileWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/DotnetFileWatcher.cs
index 8f2e44b5e7..e76fa088f6 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/DotnetFileWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/DotnetFileWatcher.cs
@@ -4,7 +4,7 @@
using System;
using System.IO;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
internal class DotnetFileWatcher : IFileSystemWatcher
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/FileWatcherFactory.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/FileWatcherFactory.cs
similarity index 95%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/FileWatcherFactory.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/FileWatcherFactory.cs
index 7d782a0db7..248342571f 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/FileWatcherFactory.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/FileWatcherFactory.cs
@@ -3,7 +3,7 @@
using System;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public static class FileWatcherFactory
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/IFileSystemWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/IFileSystemWatcher.cs
similarity index 88%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/IFileSystemWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/IFileSystemWatcher.cs
index c944bb9d64..4bfc6bac6d 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/IFileSystemWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/IFileSystemWatcher.cs
@@ -3,7 +3,7 @@
using System;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public interface IFileSystemWatcher : IDisposable
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/PollingFileWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/PollingFileWatcher.cs
similarity index 99%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/PollingFileWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/PollingFileWatcher.cs
index a6ed82ce1c..1920eecb90 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/PollingFileWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/PollingFileWatcher.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
using System.IO;
using System.Threading;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
internal class PollingFileWatcher : IFileSystemWatcher
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/IFileWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/IFileWatcher.cs
similarity index 87%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/IFileWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/IFileWatcher.cs
index ab1f255003..1e43363789 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/IFileWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/IFileWatcher.cs
@@ -3,7 +3,7 @@
using System;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public interface IFileWatcher : IDisposable
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/IProcessWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/IProcessWatcher.cs
similarity index 90%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/IProcessWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/IProcessWatcher.cs
index 86960b28b3..e80bd7c0a9 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/IProcessWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/IProcessWatcher.cs
@@ -5,7 +5,7 @@ using System;
using System.Threading;
using System.Threading.Tasks;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public interface IProcessWatcher
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/IProject.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/IProject.cs
similarity index 88%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/IProject.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/IProject.cs
index a2a2389f06..ca1dfb670a 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/IProject.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/IProject.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public interface IProject
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/IProjectProvider.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/IProjectProvider.cs
similarity index 86%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/IProjectProvider.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/IProjectProvider.cs
index bcbf63aaae..30b2a94ee9 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/IProjectProvider.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/IProjectProvider.cs
@@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public interface IProjectProvider
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/FileWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/FileWatcher.cs
similarity index 98%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/FileWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/FileWatcher.cs
index e0dbcabed5..79036c28de 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/FileWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/FileWatcher.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public class FileWatcher : IFileWatcher
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProcessWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProcessWatcher.cs
similarity index 97%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProcessWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProcessWatcher.cs
index 4fa8872d14..466ef9be17 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProcessWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProcessWatcher.cs
@@ -7,7 +7,7 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Internal;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public class ProcessWatcher : IProcessWatcher
{
@@ -55,6 +55,5 @@ namespace Microsoft.DotNet.Watcher.Core.Internal
return exitCode;
});
}
-
}
}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/Project.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/Project.cs
similarity index 98%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/Project.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/Project.cs
index 11df0238c1..10d8624df3 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/Project.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/Project.cs
@@ -8,7 +8,7 @@ using System.Linq;
using Microsoft.DotNet.ProjectModel.Files;
using Microsoft.DotNet.ProjectModel.Graph;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
internal class Project : IProject
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProjectProvider.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProjectProvider.cs
similarity index 98%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProjectProvider.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProjectProvider.cs
index a03bae0cf6..6d1cf3d99e 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProjectProvider.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProjectProvider.cs
@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using Microsoft.DotNet.ProjectModel;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public class ProjectProvider : IProjectProvider
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/IncludeContextExtensions.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/IncludeContextExtensions.cs
similarity index 94%
rename from src/Microsoft.DotNet.Watcher.Core/IncludeContextExtensions.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/IncludeContextExtensions.cs
index 2f422c777d..d01703999d 100644
--- a/src/Microsoft.DotNet.Watcher.Core/IncludeContextExtensions.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/IncludeContextExtensions.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.DotNet.ProjectModel.Files;
-namespace Microsoft.DotNet.Watcher.Core
+namespace Microsoft.DotNet.Watcher.Internal
{
internal static class IncludeContextExtensions
{
diff --git a/src/Microsoft.DotNet.Watcher.Core/Internal/ProjectWatcher.cs b/src/Microsoft.DotNet.Watcher.Tools/Internal/ProjectWatcher.cs
similarity index 98%
rename from src/Microsoft.DotNet.Watcher.Core/Internal/ProjectWatcher.cs
rename to src/Microsoft.DotNet.Watcher.Tools/Internal/ProjectWatcher.cs
index e94afb7dd4..6b5fce3ab5 100644
--- a/src/Microsoft.DotNet.Watcher.Core/Internal/ProjectWatcher.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Internal/ProjectWatcher.cs
@@ -7,7 +7,7 @@ using System.IO;
using System.Threading;
using System.Threading.Tasks;
-namespace Microsoft.DotNet.Watcher.Core.Internal
+namespace Microsoft.DotNet.Watcher.Internal
{
public class ProjectWatcher : IDisposable
{
diff --git a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.xproj b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.xproj
index 8d14e52973..f6e8a5813a 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.xproj
+++ b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.xproj
@@ -10,6 +10,9 @@
.\obj
.\bin\
+
+ Microsoft.DotNet.Watcher
+
2.0
diff --git a/src/Microsoft.DotNet.Watcher.Tools/Program.cs b/src/Microsoft.DotNet.Watcher.Tools/Program.cs
index d3f0631134..d96726f258 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/Program.cs
+++ b/src/Microsoft.DotNet.Watcher.Tools/Program.cs
@@ -5,10 +5,9 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.DotNet.Watcher.Core;
using Microsoft.Extensions.Logging;
-namespace Microsoft.DotNet.Watcher.Tools
+namespace Microsoft.DotNet.Watcher
{
public class Program
{
diff --git a/src/Microsoft.DotNet.Watcher.Tools/project.json b/src/Microsoft.DotNet.Watcher.Tools/project.json
index e9cf189495..3779fdc757 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/project.json
+++ b/src/Microsoft.DotNet.Watcher.Tools/project.json
@@ -18,11 +18,15 @@
"xmlDoc": true
},
"dependencies": {
- "Microsoft.DotNet.Watcher.Core": "1.0.0-*",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
+ "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils": "1.1.0-*",
"Microsoft.Extensions.Logging": "1.1.0-*",
- "Microsoft.Extensions.Logging.Console": "1.1.0-*"
+ "Microsoft.Extensions.Logging.Console": "1.1.0-*",
+ "Microsoft.Extensions.Process.Sources": {
+ "type": "build",
+ "version": "1.1.0-*"
+ }
},
"frameworks": {
"netcoreapp1.0": {
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
index e9be4869a1..f627a5bd0d 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
-using Microsoft.DotNet.Watcher.Core.Internal;
+using Microsoft.DotNet.Watcher.Internal;
using Xunit;
namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs
index 38ced6b437..995e61a738 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs
@@ -4,7 +4,7 @@
using System;
using System.IO;
using System.Threading;
-using Microsoft.DotNet.Watcher.Core.Internal;
+using Microsoft.DotNet.Watcher.Internal;
namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
{
diff --git a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
index 76af431397..b2aa208cba 100644
--- a/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
+++ b/test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
@@ -11,7 +11,7 @@
"type": "build",
"version": "1.1.0-*"
},
- "Microsoft.DotNet.Watcher.Core": "1.0.0-*",
+ "Microsoft.DotNet.Watcher.Tools": "1.0.0-*",
"Newtonsoft.Json": "9.0.1",
"System.Threading.Thread": "4.0.0",
"xunit": "2.2.0-*"