huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge Microsoft.DotNet.Watcher{.Core} into {.Tools} 

History: in the days of DNX, there was a plan to share code between dnx-watch and Visual Studio tooling to watch the system. We split the package into two pieces with this intention. Since then, dotnet-cli has replaced DNX and MSBuild will replace project.json. The shared watch code isn't necessary, nor is it an API we want to support.
This commit is contained in:
Nate McMaster 2016-09-26 12:04:12 -07:00
parent f90594a647
commit 61dc862e4d
29 changed files with 37 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DotNetTools.sln
View File

@ -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

1
NuGetPackageVerifier.json
View File

@ -5,7 +5,6 @@
],
"packages": {
"Microsoft.DotNet.Watcher.Tools": { },
"Microsoft.DotNet.Watcher.Core": { },
"Microsoft.Extensions.Caching.SqlConfig.Tools": { },
"Microsoft.Extensions.SecretManager.Tools": { }
}

17
src/Microsoft.DotNet.Watcher.Core/Microsoft.DotNet.Watcher.Core.xproj
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>d3da3bbb-e206-404f-aee6-17fb9b6f1221</ProjectGuid>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

11
src/Microsoft.DotNet.Watcher.Core/Properties/AssemblyInfo.cs
View File

@ -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")]

33
src/Microsoft.DotNet.Watcher.Core/project.json
View File

@ -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": {}
}
}

2
src/Microsoft.DotNet.Watcher.Tools/CommandLineOptions.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Tools/CommandOutputLogger.cs
View File

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

2
src/Microsoft.DotNet.Watcher.Tools/CommandOutputProvider.cs
View File

@ -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
{

4
src/Microsoft.DotNet.Watcher.Core/DotNetWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/DotNetWatcher.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/DotnetFileWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/DotnetFileWatcher.cs
View File

@ -4,7 +4,7 @@
using System;
using System.IO;
namespace Microsoft.DotNet.Watcher.Core.Internal
namespace Microsoft.DotNet.Watcher.Internal
{
internal class DotnetFileWatcher : IFileSystemWatcher
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/FileWatcherFactory.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/FileWatcherFactory.cs
View File

@ -3,7 +3,7 @@
using System;
namespace Microsoft.DotNet.Watcher.Core.Internal
namespace Microsoft.DotNet.Watcher.Internal
{
public static class FileWatcherFactory
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/IFileSystemWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/IFileSystemWatcher.cs
View File

@ -3,7 +3,7 @@
using System;
namespace Microsoft.DotNet.Watcher.Core.Internal
namespace Microsoft.DotNet.Watcher.Internal
{
public interface IFileSystemWatcher : IDisposable
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/FileWatcher/PollingFileWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/FileWatcher/PollingFileWatcher.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/IFileWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/IFileWatcher.cs
View File

@ -3,7 +3,7 @@
using System;
namespace Microsoft.DotNet.Watcher.Core.Internal
namespace Microsoft.DotNet.Watcher.Internal
{
public interface IFileWatcher : IDisposable
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/IProcessWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/IProcessWatcher.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/IProject.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/IProject.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic;
namespace Microsoft.DotNet.Watcher.Core.Internal
namespace Microsoft.DotNet.Watcher.Internal
{
public interface IProject
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/IProjectProvider.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/IProjectProvider.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/FileWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/FileWatcher.cs
View File

@ -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
{

3
src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProcessWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProcessWatcher.cs
View File

@ -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;
});
}
}
}

2
src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/Project.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/Project.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/ProjectProvider.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/Implementation/ProjectProvider.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Core/IncludeContextExtensions.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/IncludeContextExtensions.cs
View File

@ -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
{

2
src/Microsoft.DotNet.Watcher.Core/Internal/ProjectWatcher.cs → src/Microsoft.DotNet.Watcher.Tools/Internal/ProjectWatcher.cs
View File

@ -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
{

3
src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.xproj
View File

@ -10,6 +10,9 @@
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<RootNamespace>Microsoft.DotNet.Watcher</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>

3
src/Microsoft.DotNet.Watcher.Tools/Program.cs
View File

@ -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
{

8
src/Microsoft.DotNet.Watcher.Tools/project.json
View File

@ -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": {

2
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/FileWatcherTests.cs
View File

@ -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

2
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/WaitForFileToChange.cs
View File

@ -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
{

2
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/project.json
View File

@ -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-*"