diff --git a/CODEOWNERS b/CODEOWNERS index d93147292fd8..43030908dc88 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -80,9 +80,9 @@ /test/TestAssets/TestProjects/Watch*/ @tmat @dotnet/roslyn-ide /test/dotnet-watch.Tests/ @tmat @dotnet/roslyn-ide /test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng -/src/BuiltInTools/* @tmat @dotnet/roslyn-ide -/src/BuiltInTools/BrowserRefresh @dotnet/aspnet-blazor-eng -/src/BuiltInTools/AspireService @dotnet/aspnet-blazor-eng +/src/Dotnet.Watch/ @tmat @dotnet/roslyn-ide +/src/Dotnet.Watch/BrowserRefresh @dotnet/aspnet-blazor-eng +/src/Dotnet.Watch/AspireService @dotnet/aspnet-blazor-eng # Compatibility tools owned by runtime team /src/Compatibility/ @dotnet/area-infrastructure-libraries diff --git a/cli.slnf b/cli.slnf index 630b3b217cc1..82fdbf143408 100644 --- a/cli.slnf +++ b/cli.slnf @@ -2,7 +2,7 @@ "solution": { "path": "sdk.slnx", "projects": [ - "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", + "src\\Dotnet.Watch\\dotnet-watch\\dotnet-watch.csproj", "src\\Cli\\dotnet\\dotnet.csproj", "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj", "test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj", diff --git a/documentation/specs/dotnet-watch-for-maui.md b/documentation/specs/dotnet-watch-for-maui.md index b4915d05c09c..d09093d7d0c5 100644 --- a/documentation/specs/dotnet-watch-for-maui.md +++ b/documentation/specs/dotnet-watch-for-maui.md @@ -56,7 +56,7 @@ This ensures only processes that received the public key via the environment var ### 1. WebSocket Capability Detection -[ProjectGraphUtilities.cs](../../src/BuiltInTools/Watch/Build/ProjectGraphUtilities.cs) checks for the `HotReloadWebSockets` capability. +[ProjectGraphUtilities.cs](../../src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs) checks for the `HotReloadWebSockets` capability. ### 2. MobileAppModel diff --git a/eng/dotnet-format/validate.rsp b/eng/dotnet-format/validate.rsp index b42437137cd5..d38768e941ab 100644 --- a/eng/dotnet-format/validate.rsp +++ b/eng/dotnet-format/validate.rsp @@ -1,4 +1,4 @@ -./src/BuiltInTools/dotnet-format.slnf +./src/Dotnet.Format/dotnet-format.slnf --exclude ./tests/projects/ --verify-no-changes diff --git a/sdk.slnx b/sdk.slnx index 6ed9cd703fca..48eeb32e49b6 100644 --- a/sdk.slnx +++ b/sdk.slnx @@ -40,29 +40,29 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/source-build.slnf b/source-build.slnf index 5c332b844bcd..8b2d543e1f53 100644 --- a/source-build.slnf +++ b/source-build.slnf @@ -4,10 +4,10 @@ "projects": [ "src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj", "src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj", - "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", - "src\\BuiltInTools\\DotNetDeltaApplier\\Microsoft.Extensions.DotNetDeltaApplier.csproj", - "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj", - "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", + "src\\Dotnet.Watch\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", + "src\\Dotnet.Watch\\DotNetDeltaApplier\\Microsoft.Extensions.DotNetDeltaApplier.csproj", + "src\\Dotnet.Watch\\DotNetWatchTasks\\DotNetWatchTasks.csproj", + "src\\Dotnet.Watch\\dotnet-watch\\dotnet-watch.csproj", "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj", "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj", "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj", diff --git a/src/BuiltInTools/AspireService/.editorconfig b/src/Dotnet.Watch/AspireService/.editorconfig similarity index 100% rename from src/BuiltInTools/AspireService/.editorconfig rename to src/Dotnet.Watch/AspireService/.editorconfig diff --git a/src/BuiltInTools/AspireService/AspireServerService.cs b/src/Dotnet.Watch/AspireService/AspireServerService.cs similarity index 100% rename from src/BuiltInTools/AspireService/AspireServerService.cs rename to src/Dotnet.Watch/AspireService/AspireServerService.cs diff --git a/src/BuiltInTools/AspireService/Contracts/IAspireServerEvents.cs b/src/Dotnet.Watch/AspireService/Contracts/IAspireServerEvents.cs similarity index 100% rename from src/BuiltInTools/AspireService/Contracts/IAspireServerEvents.cs rename to src/Dotnet.Watch/AspireService/Contracts/IAspireServerEvents.cs diff --git a/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs b/src/Dotnet.Watch/AspireService/Helpers/CertGenerator.cs similarity index 100% rename from src/BuiltInTools/AspireService/Helpers/CertGenerator.cs rename to src/Dotnet.Watch/AspireService/Helpers/CertGenerator.cs diff --git a/src/BuiltInTools/AspireService/Helpers/ExceptionExtensions.cs b/src/Dotnet.Watch/AspireService/Helpers/ExceptionExtensions.cs similarity index 100% rename from src/BuiltInTools/AspireService/Helpers/ExceptionExtensions.cs rename to src/Dotnet.Watch/AspireService/Helpers/ExceptionExtensions.cs diff --git a/src/BuiltInTools/AspireService/Helpers/HttpContextExtensions.cs b/src/Dotnet.Watch/AspireService/Helpers/HttpContextExtensions.cs similarity index 100% rename from src/BuiltInTools/AspireService/Helpers/HttpContextExtensions.cs rename to src/Dotnet.Watch/AspireService/Helpers/HttpContextExtensions.cs diff --git a/src/BuiltInTools/AspireService/Helpers/LoggerProvider.cs b/src/Dotnet.Watch/AspireService/Helpers/LoggerProvider.cs similarity index 100% rename from src/BuiltInTools/AspireService/Helpers/LoggerProvider.cs rename to src/Dotnet.Watch/AspireService/Helpers/LoggerProvider.cs diff --git a/src/BuiltInTools/AspireService/Helpers/SocketConnectionManager.cs b/src/Dotnet.Watch/AspireService/Helpers/SocketConnectionManager.cs similarity index 100% rename from src/BuiltInTools/AspireService/Helpers/SocketConnectionManager.cs rename to src/Dotnet.Watch/AspireService/Helpers/SocketConnectionManager.cs diff --git a/src/BuiltInTools/AspireService/Helpers/SocketUtilities.cs b/src/Dotnet.Watch/AspireService/Helpers/SocketUtilities.cs similarity index 100% rename from src/BuiltInTools/AspireService/Helpers/SocketUtilities.cs rename to src/Dotnet.Watch/AspireService/Helpers/SocketUtilities.cs diff --git a/src/BuiltInTools/AspireService/Helpers/WebSocketConnection.cs b/src/Dotnet.Watch/AspireService/Helpers/WebSocketConnection.cs similarity index 100% rename from src/BuiltInTools/AspireService/Helpers/WebSocketConnection.cs rename to src/Dotnet.Watch/AspireService/Helpers/WebSocketConnection.cs diff --git a/src/BuiltInTools/AspireService/Microsoft.WebTools.AspireService.Package.csproj b/src/Dotnet.Watch/AspireService/Microsoft.WebTools.AspireService.Package.csproj similarity index 100% rename from src/BuiltInTools/AspireService/Microsoft.WebTools.AspireService.Package.csproj rename to src/Dotnet.Watch/AspireService/Microsoft.WebTools.AspireService.Package.csproj diff --git a/src/BuiltInTools/AspireService/Microsoft.WebTools.AspireService.projitems b/src/Dotnet.Watch/AspireService/Microsoft.WebTools.AspireService.projitems similarity index 100% rename from src/BuiltInTools/AspireService/Microsoft.WebTools.AspireService.projitems rename to src/Dotnet.Watch/AspireService/Microsoft.WebTools.AspireService.projitems diff --git a/src/BuiltInTools/AspireService/Microsoft.WebTools.AspireService.shproj b/src/Dotnet.Watch/AspireService/Microsoft.WebTools.AspireService.shproj similarity index 100% rename from src/BuiltInTools/AspireService/Microsoft.WebTools.AspireService.shproj rename to src/Dotnet.Watch/AspireService/Microsoft.WebTools.AspireService.shproj diff --git a/src/BuiltInTools/AspireService/Models/ErrorResponse.cs b/src/Dotnet.Watch/AspireService/Models/ErrorResponse.cs similarity index 100% rename from src/BuiltInTools/AspireService/Models/ErrorResponse.cs rename to src/Dotnet.Watch/AspireService/Models/ErrorResponse.cs diff --git a/src/BuiltInTools/AspireService/Models/InfoResponse.cs b/src/Dotnet.Watch/AspireService/Models/InfoResponse.cs similarity index 100% rename from src/BuiltInTools/AspireService/Models/InfoResponse.cs rename to src/Dotnet.Watch/AspireService/Models/InfoResponse.cs diff --git a/src/BuiltInTools/AspireService/Models/RunSessionRequest.cs b/src/Dotnet.Watch/AspireService/Models/RunSessionRequest.cs similarity index 100% rename from src/BuiltInTools/AspireService/Models/RunSessionRequest.cs rename to src/Dotnet.Watch/AspireService/Models/RunSessionRequest.cs diff --git a/src/BuiltInTools/AspireService/Models/SessionChangeNotification.cs b/src/Dotnet.Watch/AspireService/Models/SessionChangeNotification.cs similarity index 100% rename from src/BuiltInTools/AspireService/Models/SessionChangeNotification.cs rename to src/Dotnet.Watch/AspireService/Models/SessionChangeNotification.cs diff --git a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/Dotnet.Watch/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj similarity index 100% rename from src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj rename to src/Dotnet.Watch/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj diff --git a/src/BuiltInTools/BrowserRefresh/Properties/AssemblyInfo.cs b/src/Dotnet.Watch/BrowserRefresh/Properties/AssemblyInfo.cs similarity index 100% rename from src/BuiltInTools/BrowserRefresh/Properties/AssemblyInfo.cs rename to src/Dotnet.Watch/BrowserRefresh/Properties/AssemblyInfo.cs diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/Dotnet.Watch/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj similarity index 100% rename from src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj rename to src/Dotnet.Watch/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj diff --git a/src/BuiltInTools/DotNetDeltaApplier/Properties/AssemblyInfo.cs b/src/Dotnet.Watch/DotNetDeltaApplier/Properties/AssemblyInfo.cs similarity index 100% rename from src/BuiltInTools/DotNetDeltaApplier/Properties/AssemblyInfo.cs rename to src/Dotnet.Watch/DotNetDeltaApplier/Properties/AssemblyInfo.cs diff --git a/src/BuiltInTools/DotNetWatchTasks/DotNetWatchTasks.csproj b/src/Dotnet.Watch/DotNetWatchTasks/DotNetWatchTasks.csproj similarity index 100% rename from src/BuiltInTools/DotNetWatchTasks/DotNetWatchTasks.csproj rename to src/Dotnet.Watch/DotNetWatchTasks/DotNetWatchTasks.csproj diff --git a/src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs b/src/Dotnet.Watch/DotNetWatchTasks/FileSetSerializer.cs similarity index 100% rename from src/BuiltInTools/DotNetWatchTasks/FileSetSerializer.cs rename to src/Dotnet.Watch/DotNetWatchTasks/FileSetSerializer.cs diff --git a/src/BuiltInTools/DotNetWatchTasks/Utilities/CompilerFeatureRequiredAttribute.cs b/src/Dotnet.Watch/DotNetWatchTasks/Utilities/CompilerFeatureRequiredAttribute.cs similarity index 100% rename from src/BuiltInTools/DotNetWatchTasks/Utilities/CompilerFeatureRequiredAttribute.cs rename to src/Dotnet.Watch/DotNetWatchTasks/Utilities/CompilerFeatureRequiredAttribute.cs diff --git a/src/BuiltInTools/DotNetWatchTasks/Utilities/IsExternalInit.cs b/src/Dotnet.Watch/DotNetWatchTasks/Utilities/IsExternalInit.cs similarity index 100% rename from src/BuiltInTools/DotNetWatchTasks/Utilities/IsExternalInit.cs rename to src/Dotnet.Watch/DotNetWatchTasks/Utilities/IsExternalInit.cs diff --git a/src/BuiltInTools/DotNetWatchTasks/Utilities/RequiredMemberAttribute.cs b/src/Dotnet.Watch/DotNetWatchTasks/Utilities/RequiredMemberAttribute.cs similarity index 100% rename from src/BuiltInTools/DotNetWatchTasks/Utilities/RequiredMemberAttribute.cs rename to src/Dotnet.Watch/DotNetWatchTasks/Utilities/RequiredMemberAttribute.cs diff --git a/src/BuiltInTools/HotReloadAgent.Data/.editorconfig b/src/Dotnet.Watch/HotReloadAgent.Data/.editorconfig similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/.editorconfig rename to src/Dotnet.Watch/HotReloadAgent.Data/.editorconfig diff --git a/src/BuiltInTools/HotReloadAgent.Data/AgentEnvironmentVariables.cs b/src/Dotnet.Watch/HotReloadAgent.Data/AgentEnvironmentVariables.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/AgentEnvironmentVariables.cs rename to src/Dotnet.Watch/HotReloadAgent.Data/AgentEnvironmentVariables.cs diff --git a/src/BuiltInTools/HotReloadAgent.Data/AgentMessageSeverity.cs b/src/Dotnet.Watch/HotReloadAgent.Data/AgentMessageSeverity.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/AgentMessageSeverity.cs rename to src/Dotnet.Watch/HotReloadAgent.Data/AgentMessageSeverity.cs diff --git a/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj b/src/Dotnet.Watch/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj rename to src/Dotnet.Watch/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj diff --git a/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems b/src/Dotnet.Watch/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems rename to src/Dotnet.Watch/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems diff --git a/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj b/src/Dotnet.Watch/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj rename to src/Dotnet.Watch/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj diff --git a/src/BuiltInTools/HotReloadAgent.Data/ResponseLoggingLevel.cs b/src/Dotnet.Watch/HotReloadAgent.Data/ResponseLoggingLevel.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/ResponseLoggingLevel.cs rename to src/Dotnet.Watch/HotReloadAgent.Data/ResponseLoggingLevel.cs diff --git a/src/BuiltInTools/HotReloadAgent.Data/RuntimeManagedCodeUpdate.cs b/src/Dotnet.Watch/HotReloadAgent.Data/RuntimeManagedCodeUpdate.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/RuntimeManagedCodeUpdate.cs rename to src/Dotnet.Watch/HotReloadAgent.Data/RuntimeManagedCodeUpdate.cs diff --git a/src/BuiltInTools/HotReloadAgent.Data/RuntimeStaticAssetUpdate.cs b/src/Dotnet.Watch/HotReloadAgent.Data/RuntimeStaticAssetUpdate.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Data/RuntimeStaticAssetUpdate.cs rename to src/Dotnet.Watch/HotReloadAgent.Data/RuntimeStaticAssetUpdate.cs diff --git a/src/BuiltInTools/HotReloadAgent.Host/.editorconfig b/src/Dotnet.Watch/HotReloadAgent.Host/.editorconfig similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/.editorconfig rename to src/Dotnet.Watch/HotReloadAgent.Host/.editorconfig diff --git a/src/BuiltInTools/HotReloadAgent.Host/Listener.cs b/src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/Listener.cs rename to src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs diff --git a/src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj b/src/Dotnet.Watch/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj rename to src/Dotnet.Watch/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj diff --git a/src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.projitems b/src/Dotnet.Watch/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.projitems similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.projitems rename to src/Dotnet.Watch/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.projitems diff --git a/src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj b/src/Dotnet.Watch/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj rename to src/Dotnet.Watch/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj diff --git a/src/BuiltInTools/HotReloadAgent.Host/NamedPipeTransport.cs b/src/Dotnet.Watch/HotReloadAgent.Host/NamedPipeTransport.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/NamedPipeTransport.cs rename to src/Dotnet.Watch/HotReloadAgent.Host/NamedPipeTransport.cs diff --git a/src/BuiltInTools/HotReloadAgent.Host/StartupHook.cs b/src/Dotnet.Watch/HotReloadAgent.Host/StartupHook.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/StartupHook.cs rename to src/Dotnet.Watch/HotReloadAgent.Host/StartupHook.cs diff --git a/src/BuiltInTools/HotReloadAgent.Host/Transport.cs b/src/Dotnet.Watch/HotReloadAgent.Host/Transport.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/Transport.cs rename to src/Dotnet.Watch/HotReloadAgent.Host/Transport.cs diff --git a/src/BuiltInTools/HotReloadAgent.Host/WebSocketTransport.cs b/src/Dotnet.Watch/HotReloadAgent.Host/WebSocketTransport.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.Host/WebSocketTransport.cs rename to src/Dotnet.Watch/HotReloadAgent.Host/WebSocketTransport.cs diff --git a/src/BuiltInTools/HotReloadAgent.PipeRpc/.editorconfig b/src/Dotnet.Watch/HotReloadAgent.PipeRpc/.editorconfig similarity index 100% rename from src/BuiltInTools/HotReloadAgent.PipeRpc/.editorconfig rename to src/Dotnet.Watch/HotReloadAgent.PipeRpc/.editorconfig diff --git a/src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj b/src/Dotnet.Watch/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj rename to src/Dotnet.Watch/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj diff --git a/src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems b/src/Dotnet.Watch/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems similarity index 100% rename from src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems rename to src/Dotnet.Watch/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems diff --git a/src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj b/src/Dotnet.Watch/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj rename to src/Dotnet.Watch/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj diff --git a/src/BuiltInTools/HotReloadAgent.PipeRpc/NamedPipeContract.cs b/src/Dotnet.Watch/HotReloadAgent.PipeRpc/NamedPipeContract.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.PipeRpc/NamedPipeContract.cs rename to src/Dotnet.Watch/HotReloadAgent.PipeRpc/NamedPipeContract.cs diff --git a/src/BuiltInTools/HotReloadAgent.PipeRpc/StreamExtensions.cs b/src/Dotnet.Watch/HotReloadAgent.PipeRpc/StreamExtensions.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.PipeRpc/StreamExtensions.cs rename to src/Dotnet.Watch/HotReloadAgent.PipeRpc/StreamExtensions.cs diff --git a/src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj b/src/Dotnet.Watch/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj rename to src/Dotnet.Watch/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj diff --git a/src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/WebAssemblyHotReload.cs b/src/Dotnet.Watch/HotReloadAgent.WebAssembly.Browser/WebAssemblyHotReload.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/WebAssemblyHotReload.cs rename to src/Dotnet.Watch/HotReloadAgent.WebAssembly.Browser/WebAssemblyHotReload.cs diff --git a/src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/wwwroot/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js b/src/Dotnet.Watch/HotReloadAgent.WebAssembly.Browser/wwwroot/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js similarity index 100% rename from src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/wwwroot/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js rename to src/Dotnet.Watch/HotReloadAgent.WebAssembly.Browser/wwwroot/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js diff --git a/src/BuiltInTools/HotReloadAgent/.editorconfig b/src/Dotnet.Watch/HotReloadAgent/.editorconfig similarity index 100% rename from src/BuiltInTools/HotReloadAgent/.editorconfig rename to src/Dotnet.Watch/HotReloadAgent/.editorconfig diff --git a/src/BuiltInTools/HotReloadAgent/AgentReporter.cs b/src/Dotnet.Watch/HotReloadAgent/AgentReporter.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/AgentReporter.cs rename to src/Dotnet.Watch/HotReloadAgent/AgentReporter.cs diff --git a/src/BuiltInTools/HotReloadAgent/HotReloadAgent.cs b/src/Dotnet.Watch/HotReloadAgent/HotReloadAgent.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/HotReloadAgent.cs rename to src/Dotnet.Watch/HotReloadAgent/HotReloadAgent.cs diff --git a/src/BuiltInTools/HotReloadAgent/IHotReloadAgent.cs b/src/Dotnet.Watch/HotReloadAgent/IHotReloadAgent.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/IHotReloadAgent.cs rename to src/Dotnet.Watch/HotReloadAgent/IHotReloadAgent.cs diff --git a/src/BuiltInTools/HotReloadAgent/MetadataUpdateHandlerInvoker.cs b/src/Dotnet.Watch/HotReloadAgent/MetadataUpdateHandlerInvoker.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/MetadataUpdateHandlerInvoker.cs rename to src/Dotnet.Watch/HotReloadAgent/MetadataUpdateHandlerInvoker.cs diff --git a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj b/src/Dotnet.Watch/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj rename to src/Dotnet.Watch/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj diff --git a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems b/src/Dotnet.Watch/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems similarity index 100% rename from src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems rename to src/Dotnet.Watch/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.projitems diff --git a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj b/src/Dotnet.Watch/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj similarity index 100% rename from src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj rename to src/Dotnet.Watch/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj diff --git a/src/BuiltInTools/HotReloadClient/.editorconfig b/src/Dotnet.Watch/HotReloadClient/.editorconfig similarity index 100% rename from src/BuiltInTools/HotReloadClient/.editorconfig rename to src/Dotnet.Watch/HotReloadClient/.editorconfig diff --git a/src/BuiltInTools/HotReloadClient/ClientTransport.cs b/src/Dotnet.Watch/HotReloadClient/ClientTransport.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/ClientTransport.cs rename to src/Dotnet.Watch/HotReloadClient/ClientTransport.cs diff --git a/src/BuiltInTools/HotReloadClient/ClientTransportResponse.cs b/src/Dotnet.Watch/HotReloadClient/ClientTransportResponse.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/ClientTransportResponse.cs rename to src/Dotnet.Watch/HotReloadClient/ClientTransportResponse.cs diff --git a/src/BuiltInTools/HotReloadClient/DefaultHotReloadClient.cs b/src/Dotnet.Watch/HotReloadClient/DefaultHotReloadClient.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/DefaultHotReloadClient.cs rename to src/Dotnet.Watch/HotReloadClient/DefaultHotReloadClient.cs diff --git a/src/BuiltInTools/HotReloadClient/HotReloadClient.cs b/src/Dotnet.Watch/HotReloadClient/HotReloadClient.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/HotReloadClient.cs rename to src/Dotnet.Watch/HotReloadClient/HotReloadClient.cs diff --git a/src/BuiltInTools/HotReloadClient/HotReloadClients.cs b/src/Dotnet.Watch/HotReloadClient/HotReloadClients.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/HotReloadClients.cs rename to src/Dotnet.Watch/HotReloadClient/HotReloadClients.cs diff --git a/src/BuiltInTools/HotReloadClient/HotReloadManagedCodeUpdate.cs b/src/Dotnet.Watch/HotReloadClient/HotReloadManagedCodeUpdate.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/HotReloadManagedCodeUpdate.cs rename to src/Dotnet.Watch/HotReloadClient/HotReloadManagedCodeUpdate.cs diff --git a/src/BuiltInTools/HotReloadClient/HotReloadStaticAssetUpdate.cs b/src/Dotnet.Watch/HotReloadClient/HotReloadStaticAssetUpdate.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/HotReloadStaticAssetUpdate.cs rename to src/Dotnet.Watch/HotReloadClient/HotReloadStaticAssetUpdate.cs diff --git a/src/BuiltInTools/HotReloadClient/Logging/LogEvents.cs b/src/Dotnet.Watch/HotReloadClient/Logging/LogEvents.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Logging/LogEvents.cs rename to src/Dotnet.Watch/HotReloadClient/Logging/LogEvents.cs diff --git a/src/BuiltInTools/HotReloadClient/Logging/LoggingUtilities.cs b/src/Dotnet.Watch/HotReloadClient/Logging/LoggingUtilities.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Logging/LoggingUtilities.cs rename to src/Dotnet.Watch/HotReloadClient/Logging/LoggingUtilities.cs diff --git a/src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj b/src/Dotnet.Watch/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj similarity index 100% rename from src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj rename to src/Dotnet.Watch/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj diff --git a/src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.projitems b/src/Dotnet.Watch/HotReloadClient/Microsoft.DotNet.HotReload.Client.projitems similarity index 100% rename from src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.projitems rename to src/Dotnet.Watch/HotReloadClient/Microsoft.DotNet.HotReload.Client.projitems diff --git a/src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj b/src/Dotnet.Watch/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj similarity index 100% rename from src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj rename to src/Dotnet.Watch/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj diff --git a/src/BuiltInTools/HotReloadClient/NamedPipeClientTransport.cs b/src/Dotnet.Watch/HotReloadClient/NamedPipeClientTransport.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/NamedPipeClientTransport.cs rename to src/Dotnet.Watch/HotReloadClient/NamedPipeClientTransport.cs diff --git a/src/BuiltInTools/HotReloadClient/StaticAsset.cs b/src/Dotnet.Watch/HotReloadClient/StaticAsset.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/StaticAsset.cs rename to src/Dotnet.Watch/HotReloadClient/StaticAsset.cs diff --git a/src/BuiltInTools/HotReloadClient/Utilities/ArrayBufferWriter.cs b/src/Dotnet.Watch/HotReloadClient/Utilities/ArrayBufferWriter.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Utilities/ArrayBufferWriter.cs rename to src/Dotnet.Watch/HotReloadClient/Utilities/ArrayBufferWriter.cs diff --git a/src/BuiltInTools/HotReloadClient/Utilities/EnvironmentUtilities.cs b/src/Dotnet.Watch/HotReloadClient/Utilities/EnvironmentUtilities.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Utilities/EnvironmentUtilities.cs rename to src/Dotnet.Watch/HotReloadClient/Utilities/EnvironmentUtilities.cs diff --git a/src/BuiltInTools/HotReloadClient/Utilities/None.cs b/src/Dotnet.Watch/HotReloadClient/Utilities/None.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Utilities/None.cs rename to src/Dotnet.Watch/HotReloadClient/Utilities/None.cs diff --git a/src/BuiltInTools/HotReloadClient/Utilities/PathExtensions.cs b/src/Dotnet.Watch/HotReloadClient/Utilities/PathExtensions.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Utilities/PathExtensions.cs rename to src/Dotnet.Watch/HotReloadClient/Utilities/PathExtensions.cs diff --git a/src/BuiltInTools/HotReloadClient/Utilities/ResponseFunc.cs b/src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Utilities/ResponseFunc.cs rename to src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/AbstractBrowserRefreshServer.cs b/src/Dotnet.Watch/HotReloadClient/Web/AbstractBrowserRefreshServer.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/AbstractBrowserRefreshServer.cs rename to src/Dotnet.Watch/HotReloadClient/Web/AbstractBrowserRefreshServer.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/BrowserConnection.cs b/src/Dotnet.Watch/HotReloadClient/Web/BrowserConnection.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/BrowserConnection.cs rename to src/Dotnet.Watch/HotReloadClient/Web/BrowserConnection.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/BrowserRefreshServer.cs b/src/Dotnet.Watch/HotReloadClient/Web/BrowserRefreshServer.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/BrowserRefreshServer.cs rename to src/Dotnet.Watch/HotReloadClient/Web/BrowserRefreshServer.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/KestrelWebSocketServer.cs b/src/Dotnet.Watch/HotReloadClient/Web/KestrelWebSocketServer.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/KestrelWebSocketServer.cs rename to src/Dotnet.Watch/HotReloadClient/Web/KestrelWebSocketServer.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/MiddlewareEnvironmentVariables.cs b/src/Dotnet.Watch/HotReloadClient/Web/MiddlewareEnvironmentVariables.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/MiddlewareEnvironmentVariables.cs rename to src/Dotnet.Watch/HotReloadClient/Web/MiddlewareEnvironmentVariables.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/SharedSecretProvider.cs b/src/Dotnet.Watch/HotReloadClient/Web/SharedSecretProvider.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/SharedSecretProvider.cs rename to src/Dotnet.Watch/HotReloadClient/Web/SharedSecretProvider.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/StaticWebAsset.cs b/src/Dotnet.Watch/HotReloadClient/Web/StaticWebAsset.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/StaticWebAsset.cs rename to src/Dotnet.Watch/HotReloadClient/Web/StaticWebAsset.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/StaticWebAssetPattern.cs b/src/Dotnet.Watch/HotReloadClient/Web/StaticWebAssetPattern.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/StaticWebAssetPattern.cs rename to src/Dotnet.Watch/HotReloadClient/Web/StaticWebAssetPattern.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/StaticWebAssetsManifest.cs b/src/Dotnet.Watch/HotReloadClient/Web/StaticWebAssetsManifest.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/StaticWebAssetsManifest.cs rename to src/Dotnet.Watch/HotReloadClient/Web/StaticWebAssetsManifest.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/WebAssemblyHotReloadClient.cs b/src/Dotnet.Watch/HotReloadClient/Web/WebAssemblyHotReloadClient.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/WebAssemblyHotReloadClient.cs rename to src/Dotnet.Watch/HotReloadClient/Web/WebAssemblyHotReloadClient.cs diff --git a/src/BuiltInTools/HotReloadClient/Web/WebServerHost.cs b/src/Dotnet.Watch/HotReloadClient/Web/WebServerHost.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/Web/WebServerHost.cs rename to src/Dotnet.Watch/HotReloadClient/Web/WebServerHost.cs diff --git a/src/BuiltInTools/HotReloadClient/WebSocketClientTransport.cs b/src/Dotnet.Watch/HotReloadClient/WebSocketClientTransport.cs similarity index 100% rename from src/BuiltInTools/HotReloadClient/WebSocketClientTransport.cs rename to src/Dotnet.Watch/HotReloadClient/WebSocketClientTransport.cs diff --git a/src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs b/src/Dotnet.Watch/Watch.Aspire/DotNetWatchLauncher.cs similarity index 100% rename from src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs rename to src/Dotnet.Watch/Watch.Aspire/DotNetWatchLauncher.cs diff --git a/src/BuiltInTools/Watch.Aspire/DotNetWatchOptions.cs b/src/Dotnet.Watch/Watch.Aspire/DotNetWatchOptions.cs similarity index 100% rename from src/BuiltInTools/Watch.Aspire/DotNetWatchOptions.cs rename to src/Dotnet.Watch/Watch.Aspire/DotNetWatchOptions.cs diff --git a/src/BuiltInTools/Watch.Aspire/Microsoft.DotNet.HotReload.Watch.Aspire.csproj b/src/Dotnet.Watch/Watch.Aspire/Microsoft.DotNet.HotReload.Watch.Aspire.csproj similarity index 100% rename from src/BuiltInTools/Watch.Aspire/Microsoft.DotNet.HotReload.Watch.Aspire.csproj rename to src/Dotnet.Watch/Watch.Aspire/Microsoft.DotNet.HotReload.Watch.Aspire.csproj diff --git a/src/BuiltInTools/Watch.Aspire/Program.cs b/src/Dotnet.Watch/Watch.Aspire/Program.cs similarity index 100% rename from src/BuiltInTools/Watch.Aspire/Program.cs rename to src/Dotnet.Watch/Watch.Aspire/Program.cs diff --git a/src/BuiltInTools/Watch.Aspire/Properties/AssemblyInfo.cs b/src/Dotnet.Watch/Watch.Aspire/Properties/AssemblyInfo.cs similarity index 100% rename from src/BuiltInTools/Watch.Aspire/Properties/AssemblyInfo.cs rename to src/Dotnet.Watch/Watch.Aspire/Properties/AssemblyInfo.cs diff --git a/src/BuiltInTools/Watch/AppModels/BlazorWebAssemblyAppModel.cs b/src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs similarity index 100% rename from src/BuiltInTools/Watch/AppModels/BlazorWebAssemblyAppModel.cs rename to src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs diff --git a/src/BuiltInTools/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs b/src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs similarity index 100% rename from src/BuiltInTools/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs rename to src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs diff --git a/src/BuiltInTools/Watch/AppModels/DefaultAppModel.cs b/src/Dotnet.Watch/Watch/AppModels/DefaultAppModel.cs similarity index 100% rename from src/BuiltInTools/Watch/AppModels/DefaultAppModel.cs rename to src/Dotnet.Watch/Watch/AppModels/DefaultAppModel.cs diff --git a/src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs b/src/Dotnet.Watch/Watch/AppModels/HotReloadAppModel.cs similarity index 100% rename from src/BuiltInTools/Watch/AppModels/HotReloadAppModel.cs rename to src/Dotnet.Watch/Watch/AppModels/HotReloadAppModel.cs diff --git a/src/BuiltInTools/Watch/AppModels/MobileAppModel.cs b/src/Dotnet.Watch/Watch/AppModels/MobileAppModel.cs similarity index 100% rename from src/BuiltInTools/Watch/AppModels/MobileAppModel.cs rename to src/Dotnet.Watch/Watch/AppModels/MobileAppModel.cs diff --git a/src/BuiltInTools/Watch/AppModels/WebApplicationAppModel.cs b/src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs similarity index 100% rename from src/BuiltInTools/Watch/AppModels/WebApplicationAppModel.cs rename to src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs diff --git a/src/BuiltInTools/Watch/AppModels/WebServerAppModel.cs b/src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs similarity index 100% rename from src/BuiltInTools/Watch/AppModels/WebServerAppModel.cs rename to src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs diff --git a/src/BuiltInTools/Watch/Aspire/AspireServiceFactory.cs b/src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs similarity index 100% rename from src/BuiltInTools/Watch/Aspire/AspireServiceFactory.cs rename to src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs diff --git a/src/BuiltInTools/Watch/Browser/BrowserLauncher.cs b/src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs similarity index 100% rename from src/BuiltInTools/Watch/Browser/BrowserLauncher.cs rename to src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs diff --git a/src/BuiltInTools/Watch/Browser/BrowserRefreshServerFactory.cs b/src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs similarity index 100% rename from src/BuiltInTools/Watch/Browser/BrowserRefreshServerFactory.cs rename to src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs diff --git a/src/BuiltInTools/Watch/Build/BuildNames.cs b/src/Dotnet.Watch/Watch/Build/BuildNames.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/BuildNames.cs rename to src/Dotnet.Watch/Watch/Build/BuildNames.cs diff --git a/src/BuiltInTools/Watch/Build/BuildReporter.cs b/src/Dotnet.Watch/Watch/Build/BuildReporter.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/BuildReporter.cs rename to src/Dotnet.Watch/Watch/Build/BuildReporter.cs diff --git a/src/BuiltInTools/Watch/Build/BuildRequest.cs b/src/Dotnet.Watch/Watch/Build/BuildRequest.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/BuildRequest.cs rename to src/Dotnet.Watch/Watch/Build/BuildRequest.cs diff --git a/src/BuiltInTools/Watch/Build/BuildResult.cs b/src/Dotnet.Watch/Watch/Build/BuildResult.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/BuildResult.cs rename to src/Dotnet.Watch/Watch/Build/BuildResult.cs diff --git a/src/BuiltInTools/Watch/Build/BuildUtilities.cs b/src/Dotnet.Watch/Watch/Build/BuildUtilities.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/BuildUtilities.cs rename to src/Dotnet.Watch/Watch/Build/BuildUtilities.cs diff --git a/src/BuiltInTools/Watch/Build/EvaluationResult.cs b/src/Dotnet.Watch/Watch/Build/EvaluationResult.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/EvaluationResult.cs rename to src/Dotnet.Watch/Watch/Build/EvaluationResult.cs diff --git a/src/BuiltInTools/Watch/Build/FileItem.cs b/src/Dotnet.Watch/Watch/Build/FileItem.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/FileItem.cs rename to src/Dotnet.Watch/Watch/Build/FileItem.cs diff --git a/src/BuiltInTools/Watch/Build/FilePathExclusions.cs b/src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/FilePathExclusions.cs rename to src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs diff --git a/src/BuiltInTools/Watch/Build/LoadedProjectGraph.cs b/src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/LoadedProjectGraph.cs rename to src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs diff --git a/src/BuiltInTools/Watch/Build/ProjectBuildManager.cs b/src/Dotnet.Watch/Watch/Build/ProjectBuildManager.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/ProjectBuildManager.cs rename to src/Dotnet.Watch/Watch/Build/ProjectBuildManager.cs diff --git a/src/BuiltInTools/Watch/Build/ProjectGraphFactory.cs b/src/Dotnet.Watch/Watch/Build/ProjectGraphFactory.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/ProjectGraphFactory.cs rename to src/Dotnet.Watch/Watch/Build/ProjectGraphFactory.cs diff --git a/src/BuiltInTools/Watch/Build/ProjectGraphUtilities.cs b/src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/ProjectGraphUtilities.cs rename to src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs diff --git a/src/BuiltInTools/Watch/Build/ProjectInstanceId.cs b/src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/ProjectInstanceId.cs rename to src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs diff --git a/src/BuiltInTools/Watch/Build/ProjectRepresentation.cs b/src/Dotnet.Watch/Watch/Build/ProjectRepresentation.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/ProjectRepresentation.cs rename to src/Dotnet.Watch/Watch/Build/ProjectRepresentation.cs diff --git a/src/BuiltInTools/Watch/Build/StaticWebAssetPattern.MSBuild.cs b/src/Dotnet.Watch/Watch/Build/StaticWebAssetPattern.MSBuild.cs similarity index 100% rename from src/BuiltInTools/Watch/Build/StaticWebAssetPattern.MSBuild.cs rename to src/Dotnet.Watch/Watch/Build/StaticWebAssetPattern.MSBuild.cs diff --git a/src/BuiltInTools/Watch/Context/DotNetWatchContext.cs b/src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs similarity index 100% rename from src/BuiltInTools/Watch/Context/DotNetWatchContext.cs rename to src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs diff --git a/src/BuiltInTools/Watch/Context/EnvironmentOptions.cs b/src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs similarity index 100% rename from src/BuiltInTools/Watch/Context/EnvironmentOptions.cs rename to src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs diff --git a/src/BuiltInTools/Watch/Context/EnvironmentVariables.cs b/src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs similarity index 100% rename from src/BuiltInTools/Watch/Context/EnvironmentVariables.cs rename to src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs diff --git a/src/BuiltInTools/Watch/Context/GlobalOptions.cs b/src/Dotnet.Watch/Watch/Context/GlobalOptions.cs similarity index 100% rename from src/BuiltInTools/Watch/Context/GlobalOptions.cs rename to src/Dotnet.Watch/Watch/Context/GlobalOptions.cs diff --git a/src/BuiltInTools/Watch/Context/ProjectOptions.cs b/src/Dotnet.Watch/Watch/Context/ProjectOptions.cs similarity index 100% rename from src/BuiltInTools/Watch/Context/ProjectOptions.cs rename to src/Dotnet.Watch/Watch/Context/ProjectOptions.cs diff --git a/src/BuiltInTools/Watch/FileWatcher/ChangeKind.cs b/src/Dotnet.Watch/Watch/FileWatcher/ChangeKind.cs similarity index 100% rename from src/BuiltInTools/Watch/FileWatcher/ChangeKind.cs rename to src/Dotnet.Watch/Watch/FileWatcher/ChangeKind.cs diff --git a/src/BuiltInTools/Watch/FileWatcher/DirectoryWatcher.cs b/src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs similarity index 100% rename from src/BuiltInTools/Watch/FileWatcher/DirectoryWatcher.cs rename to src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs diff --git a/src/BuiltInTools/Watch/FileWatcher/EventBasedDirectoryWatcher.cs b/src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs similarity index 100% rename from src/BuiltInTools/Watch/FileWatcher/EventBasedDirectoryWatcher.cs rename to src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs diff --git a/src/BuiltInTools/Watch/FileWatcher/FileWatcher.cs b/src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs similarity index 100% rename from src/BuiltInTools/Watch/FileWatcher/FileWatcher.cs rename to src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs diff --git a/src/BuiltInTools/Watch/FileWatcher/PollingDirectoryWatcher.cs b/src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs similarity index 100% rename from src/BuiltInTools/Watch/FileWatcher/PollingDirectoryWatcher.cs rename to src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs diff --git a/src/BuiltInTools/Watch/HotReload/CompilationHandler.cs b/src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs similarity index 100% rename from src/BuiltInTools/Watch/HotReload/CompilationHandler.cs rename to src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs diff --git a/src/BuiltInTools/Watch/HotReload/HotReloadDotNetWatcher.cs b/src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs similarity index 100% rename from src/BuiltInTools/Watch/HotReload/HotReloadDotNetWatcher.cs rename to src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs diff --git a/src/BuiltInTools/Watch/HotReload/HotReloadProjectUpdatesBuilder.cs b/src/Dotnet.Watch/Watch/HotReload/HotReloadProjectUpdatesBuilder.cs similarity index 100% rename from src/BuiltInTools/Watch/HotReload/HotReloadProjectUpdatesBuilder.cs rename to src/Dotnet.Watch/Watch/HotReload/HotReloadProjectUpdatesBuilder.cs diff --git a/src/BuiltInTools/Watch/Microsoft.DotNet.HotReload.Watch.csproj b/src/Dotnet.Watch/Watch/Microsoft.DotNet.HotReload.Watch.csproj similarity index 100% rename from src/BuiltInTools/Watch/Microsoft.DotNet.HotReload.Watch.csproj rename to src/Dotnet.Watch/Watch/Microsoft.DotNet.HotReload.Watch.csproj diff --git a/src/BuiltInTools/Watch/Process/IRuntimeProcessLauncher.cs b/src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/IRuntimeProcessLauncher.cs rename to src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs diff --git a/src/BuiltInTools/Watch/Process/IRuntimeProcessLauncherFactory.cs b/src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/IRuntimeProcessLauncherFactory.cs rename to src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs diff --git a/src/BuiltInTools/Watch/Process/LaunchSettingsProfile.cs b/src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/LaunchSettingsProfile.cs rename to src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs diff --git a/src/BuiltInTools/Watch/Process/ProcessLaunchResult.cs b/src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/ProcessLaunchResult.cs rename to src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs diff --git a/src/BuiltInTools/Watch/Process/ProcessRunner.cs b/src/Dotnet.Watch/Watch/Process/ProcessRunner.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/ProcessRunner.cs rename to src/Dotnet.Watch/Watch/Process/ProcessRunner.cs diff --git a/src/BuiltInTools/Watch/Process/ProcessSpec.cs b/src/Dotnet.Watch/Watch/Process/ProcessSpec.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/ProcessSpec.cs rename to src/Dotnet.Watch/Watch/Process/ProcessSpec.cs diff --git a/src/BuiltInTools/Watch/Process/ProjectLauncher.cs b/src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/ProjectLauncher.cs rename to src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs diff --git a/src/BuiltInTools/Watch/Process/RunningProcess.cs b/src/Dotnet.Watch/Watch/Process/RunningProcess.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/RunningProcess.cs rename to src/Dotnet.Watch/Watch/Process/RunningProcess.cs diff --git a/src/BuiltInTools/Watch/Process/RunningProject.cs b/src/Dotnet.Watch/Watch/Process/RunningProject.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/RunningProject.cs rename to src/Dotnet.Watch/Watch/Process/RunningProject.cs diff --git a/src/BuiltInTools/Watch/Process/WebServerProcessStateObserver.cs b/src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs similarity index 100% rename from src/BuiltInTools/Watch/Process/WebServerProcessStateObserver.cs rename to src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs diff --git a/src/BuiltInTools/Watch/Properties/AssemblyInfo.cs b/src/Dotnet.Watch/Watch/Properties/AssemblyInfo.cs similarity index 100% rename from src/BuiltInTools/Watch/Properties/AssemblyInfo.cs rename to src/Dotnet.Watch/Watch/Properties/AssemblyInfo.cs diff --git a/src/BuiltInTools/Watch/RuntimeDependencies.props b/src/Dotnet.Watch/Watch/RuntimeDependencies.props similarity index 100% rename from src/BuiltInTools/Watch/RuntimeDependencies.props rename to src/Dotnet.Watch/Watch/RuntimeDependencies.props diff --git a/src/BuiltInTools/Watch/UI/BuildOutput.cs b/src/Dotnet.Watch/Watch/UI/BuildOutput.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/BuildOutput.cs rename to src/Dotnet.Watch/Watch/UI/BuildOutput.cs diff --git a/src/BuiltInTools/Watch/UI/ConsoleInputReader.cs b/src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/ConsoleInputReader.cs rename to src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs diff --git a/src/BuiltInTools/Watch/UI/ConsoleReporter.cs b/src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/ConsoleReporter.cs rename to src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs diff --git a/src/BuiltInTools/Watch/UI/IConsole.cs b/src/Dotnet.Watch/Watch/UI/IConsole.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/IConsole.cs rename to src/Dotnet.Watch/Watch/UI/IConsole.cs diff --git a/src/BuiltInTools/Watch/UI/IReporter.cs b/src/Dotnet.Watch/Watch/UI/IReporter.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/IReporter.cs rename to src/Dotnet.Watch/Watch/UI/IReporter.cs diff --git a/src/BuiltInTools/Watch/UI/OutputLine.cs b/src/Dotnet.Watch/Watch/UI/OutputLine.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/OutputLine.cs rename to src/Dotnet.Watch/Watch/UI/OutputLine.cs diff --git a/src/BuiltInTools/Watch/UI/PhysicalConsole.cs b/src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/PhysicalConsole.cs rename to src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs diff --git a/src/BuiltInTools/Watch/UI/RestartPrompt.cs b/src/Dotnet.Watch/Watch/UI/RestartPrompt.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/RestartPrompt.cs rename to src/Dotnet.Watch/Watch/UI/RestartPrompt.cs diff --git a/src/BuiltInTools/Watch/UI/ShutdownHandler.cs b/src/Dotnet.Watch/Watch/UI/ShutdownHandler.cs similarity index 100% rename from src/BuiltInTools/Watch/UI/ShutdownHandler.cs rename to src/Dotnet.Watch/Watch/UI/ShutdownHandler.cs diff --git a/src/BuiltInTools/Watch/Utilities/CommandLineUtilities.cs b/src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs similarity index 100% rename from src/BuiltInTools/Watch/Utilities/CommandLineUtilities.cs rename to src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs diff --git a/src/BuiltInTools/Watch/Utilities/Disposables.cs b/src/Dotnet.Watch/Watch/Utilities/Disposables.cs similarity index 100% rename from src/BuiltInTools/Watch/Utilities/Disposables.cs rename to src/Dotnet.Watch/Watch/Utilities/Disposables.cs diff --git a/src/BuiltInTools/Watch/Utilities/Option.cs b/src/Dotnet.Watch/Watch/Utilities/Option.cs similarity index 100% rename from src/BuiltInTools/Watch/Utilities/Option.cs rename to src/Dotnet.Watch/Watch/Utilities/Option.cs diff --git a/src/BuiltInTools/Watch/Utilities/PathUtilities.cs b/src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs similarity index 100% rename from src/BuiltInTools/Watch/Utilities/PathUtilities.cs rename to src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs diff --git a/src/BuiltInTools/Watch/Utilities/ProcessUtilities.cs b/src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs similarity index 100% rename from src/BuiltInTools/Watch/Utilities/ProcessUtilities.cs rename to src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs diff --git a/src/BuiltInTools/Watch/Utilities/Versions.cs b/src/Dotnet.Watch/Watch/Utilities/Versions.cs similarity index 100% rename from src/BuiltInTools/Watch/Utilities/Versions.cs rename to src/Dotnet.Watch/Watch/Utilities/Versions.cs diff --git a/src/BuiltInTools/Web.Middleware/.editorconfig b/src/Dotnet.Watch/Web.Middleware/.editorconfig similarity index 100% rename from src/BuiltInTools/Web.Middleware/.editorconfig rename to src/Dotnet.Watch/Web.Middleware/.editorconfig diff --git a/src/BuiltInTools/Web.Middleware/ApplicationPaths.cs b/src/Dotnet.Watch/Web.Middleware/ApplicationPaths.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/ApplicationPaths.cs rename to src/Dotnet.Watch/Web.Middleware/ApplicationPaths.cs diff --git a/src/BuiltInTools/Web.Middleware/BlazorHotReload.js b/src/Dotnet.Watch/Web.Middleware/BlazorHotReload.js similarity index 100% rename from src/BuiltInTools/Web.Middleware/BlazorHotReload.js rename to src/Dotnet.Watch/Web.Middleware/BlazorHotReload.js diff --git a/src/BuiltInTools/Web.Middleware/BlazorWasmHotReloadMiddleware.cs b/src/Dotnet.Watch/Web.Middleware/BlazorWasmHotReloadMiddleware.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/BlazorWasmHotReloadMiddleware.cs rename to src/Dotnet.Watch/Web.Middleware/BlazorWasmHotReloadMiddleware.cs diff --git a/src/BuiltInTools/Web.Middleware/BrowserRefreshMiddleware.cs b/src/Dotnet.Watch/Web.Middleware/BrowserRefreshMiddleware.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/BrowserRefreshMiddleware.cs rename to src/Dotnet.Watch/Web.Middleware/BrowserRefreshMiddleware.cs diff --git a/src/BuiltInTools/Web.Middleware/BrowserScriptMiddleware.cs b/src/Dotnet.Watch/Web.Middleware/BrowserScriptMiddleware.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/BrowserScriptMiddleware.cs rename to src/Dotnet.Watch/Web.Middleware/BrowserScriptMiddleware.cs diff --git a/src/BuiltInTools/Web.Middleware/HostingStartup.cs b/src/Dotnet.Watch/Web.Middleware/HostingStartup.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/HostingStartup.cs rename to src/Dotnet.Watch/Web.Middleware/HostingStartup.cs diff --git a/src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj b/src/Dotnet.Watch/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj similarity index 100% rename from src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj rename to src/Dotnet.Watch/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj diff --git a/src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.projitems b/src/Dotnet.Watch/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.projitems similarity index 100% rename from src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.projitems rename to src/Dotnet.Watch/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.projitems diff --git a/src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj b/src/Dotnet.Watch/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj similarity index 100% rename from src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj rename to src/Dotnet.Watch/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj diff --git a/src/BuiltInTools/Web.Middleware/ResponseStreamWrapper.cs b/src/Dotnet.Watch/Web.Middleware/ResponseStreamWrapper.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/ResponseStreamWrapper.cs rename to src/Dotnet.Watch/Web.Middleware/ResponseStreamWrapper.cs diff --git a/src/BuiltInTools/Web.Middleware/ScriptInjectingStream.cs b/src/Dotnet.Watch/Web.Middleware/ScriptInjectingStream.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/ScriptInjectingStream.cs rename to src/Dotnet.Watch/Web.Middleware/ScriptInjectingStream.cs diff --git a/src/BuiltInTools/Web.Middleware/StartupHook.cs b/src/Dotnet.Watch/Web.Middleware/StartupHook.cs similarity index 100% rename from src/BuiltInTools/Web.Middleware/StartupHook.cs rename to src/Dotnet.Watch/Web.Middleware/StartupHook.cs diff --git a/src/BuiltInTools/Web.Middleware/WebSocketScriptInjection.js b/src/Dotnet.Watch/Web.Middleware/WebSocketScriptInjection.js similarity index 100% rename from src/BuiltInTools/Web.Middleware/WebSocketScriptInjection.js rename to src/Dotnet.Watch/Web.Middleware/WebSocketScriptInjection.js diff --git a/src/BuiltInTools/dotnet-watch.slnf b/src/Dotnet.Watch/dotnet-watch.slnf similarity index 57% rename from src/BuiltInTools/dotnet-watch.slnf rename to src/Dotnet.Watch/dotnet-watch.slnf index 51bc310af91d..48e156d1458e 100644 --- a/src/BuiltInTools/dotnet-watch.slnf +++ b/src/Dotnet.Watch/dotnet-watch.slnf @@ -2,27 +2,27 @@ "solution": { "path": "..\\..\\sdk.slnx", "projects": [ - "src\\BuiltInTools\\AspireService\\Microsoft.WebTools.AspireService.Package.csproj", - "src\\BuiltInTools\\AspireService\\Microsoft.WebTools.AspireService.shproj", - "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", - "src\\BuiltInTools\\DotNetDeltaApplier\\Microsoft.Extensions.DotNetDeltaApplier.csproj", - "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj", - "src\\BuiltInTools\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.Package.csproj", - "src\\BuiltInTools\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.shproj", - "src\\BuiltInTools\\HotReloadAgent.Host\\Microsoft.DotNet.HotReload.Agent.Host.Package.csproj", - "src\\BuiltInTools\\HotReloadAgent.Host\\Microsoft.DotNet.HotReload.Agent.Host.shproj", - "src\\BuiltInTools\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj", - "src\\BuiltInTools\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj", - "src\\BuiltInTools\\HotReloadAgent.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj", - "src\\BuiltInTools\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.Package.csproj", - "src\\BuiltInTools\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.shproj", - "src\\BuiltInTools\\HotReloadClient\\Microsoft.DotNet.HotReload.Client.Package.csproj", - "src\\BuiltInTools\\HotReloadClient\\Microsoft.DotNet.HotReload.Client.shproj", - "src\\BuiltInTools\\Web.Middleware\\Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj", - "src\\BuiltInTools\\Web.Middleware\\Microsoft.DotNet.HotReload.Web.Middleware.shproj", - "src\\BuiltInTools\\Watch.Aspire\\Microsoft.DotNet.HotReload.Watch.Aspire.csproj", - "src\\BuiltInTools\\Watch\\Microsoft.DotNet.HotReload.Watch.csproj", - "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", + "src\\Dotnet.Watch\\AspireService\\Microsoft.WebTools.AspireService.Package.csproj", + "src\\Dotnet.Watch\\AspireService\\Microsoft.WebTools.AspireService.shproj", + "src\\Dotnet.Watch\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", + "src\\Dotnet.Watch\\DotNetDeltaApplier\\Microsoft.Extensions.DotNetDeltaApplier.csproj", + "src\\Dotnet.Watch\\DotNetWatchTasks\\DotNetWatchTasks.csproj", + "src\\Dotnet.Watch\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.Package.csproj", + "src\\Dotnet.Watch\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.shproj", + "src\\Dotnet.Watch\\HotReloadAgent.Host\\Microsoft.DotNet.HotReload.Agent.Host.Package.csproj", + "src\\Dotnet.Watch\\HotReloadAgent.Host\\Microsoft.DotNet.HotReload.Agent.Host.shproj", + "src\\Dotnet.Watch\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj", + "src\\Dotnet.Watch\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj", + "src\\Dotnet.Watch\\HotReloadAgent.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj", + "src\\Dotnet.Watch\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.Package.csproj", + "src\\Dotnet.Watch\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.shproj", + "src\\Dotnet.Watch\\HotReloadClient\\Microsoft.DotNet.HotReload.Client.Package.csproj", + "src\\Dotnet.Watch\\HotReloadClient\\Microsoft.DotNet.HotReload.Client.shproj", + "src\\Dotnet.Watch\\Web.Middleware\\Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj", + "src\\Dotnet.Watch\\Web.Middleware\\Microsoft.DotNet.HotReload.Web.Middleware.shproj", + "src\\Dotnet.Watch\\Watch.Aspire\\Microsoft.DotNet.HotReload.Watch.Aspire.csproj", + "src\\Dotnet.Watch\\Watch\\Microsoft.DotNet.HotReload.Watch.csproj", + "src\\Dotnet.Watch\\dotnet-watch\\dotnet-watch.csproj", "src\\Cli\\Microsoft.DotNet.Cli.Definitions\\Microsoft.DotNet.Cli.Definitions.csproj", "src\\Microsoft.DotNet.ProjectTools\\Microsoft.DotNet.ProjectTools.csproj", "test\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj", @@ -37,4 +37,4 @@ "test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj" ] } -} \ No newline at end of file +} diff --git a/src/BuiltInTools/dotnet-watch/CommandLine/CommandLineOptions.cs b/src/Dotnet.Watch/dotnet-watch/CommandLine/CommandLineOptions.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/CommandLine/CommandLineOptions.cs rename to src/Dotnet.Watch/dotnet-watch/CommandLine/CommandLineOptions.cs diff --git a/src/BuiltInTools/dotnet-watch/CommandLine/DotnetWatchCommandDefinition.cs b/src/Dotnet.Watch/dotnet-watch/CommandLine/DotnetWatchCommandDefinition.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/CommandLine/DotnetWatchCommandDefinition.cs rename to src/Dotnet.Watch/dotnet-watch/CommandLine/DotnetWatchCommandDefinition.cs diff --git a/src/BuiltInTools/dotnet-watch/DotnetToolSettings.xml b/src/Dotnet.Watch/dotnet-watch/DotnetToolSettings.xml similarity index 100% rename from src/BuiltInTools/dotnet-watch/DotnetToolSettings.xml rename to src/Dotnet.Watch/dotnet-watch/DotnetToolSettings.xml diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/Dotnet.Watch/dotnet-watch/Program.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/Program.cs rename to src/Dotnet.Watch/dotnet-watch/Program.cs diff --git a/src/BuiltInTools/dotnet-watch/Properties/AssemblyInfo.cs b/src/Dotnet.Watch/dotnet-watch/Properties/AssemblyInfo.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/Properties/AssemblyInfo.cs rename to src/Dotnet.Watch/dotnet-watch/Properties/AssemblyInfo.cs diff --git a/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json b/src/Dotnet.Watch/dotnet-watch/Properties/launchSettings.json similarity index 100% rename from src/BuiltInTools/dotnet-watch/Properties/launchSettings.json rename to src/Dotnet.Watch/dotnet-watch/Properties/launchSettings.json diff --git a/src/BuiltInTools/dotnet-watch/README.md b/src/Dotnet.Watch/dotnet-watch/README.md similarity index 100% rename from src/BuiltInTools/dotnet-watch/README.md rename to src/Dotnet.Watch/dotnet-watch/README.md diff --git a/src/BuiltInTools/dotnet-watch/Resources.resx b/src/Dotnet.Watch/dotnet-watch/Resources.resx similarity index 100% rename from src/BuiltInTools/dotnet-watch/Resources.resx rename to src/Dotnet.Watch/dotnet-watch/Resources.resx diff --git a/src/BuiltInTools/dotnet-watch/Watch/BuildEvaluator.cs b/src/Dotnet.Watch/dotnet-watch/Watch/BuildEvaluator.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/Watch/BuildEvaluator.cs rename to src/Dotnet.Watch/dotnet-watch/Watch/BuildEvaluator.cs diff --git a/src/BuiltInTools/dotnet-watch/Watch/DotNetWatch.targets b/src/Dotnet.Watch/dotnet-watch/Watch/DotNetWatch.targets similarity index 100% rename from src/BuiltInTools/dotnet-watch/Watch/DotNetWatch.targets rename to src/Dotnet.Watch/dotnet-watch/Watch/DotNetWatch.targets diff --git a/src/BuiltInTools/dotnet-watch/Watch/DotNetWatcher.cs b/src/Dotnet.Watch/dotnet-watch/Watch/DotNetWatcher.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/Watch/DotNetWatcher.cs rename to src/Dotnet.Watch/dotnet-watch/Watch/DotNetWatcher.cs diff --git a/src/BuiltInTools/dotnet-watch/Watch/MSBuildFileSetResult.cs b/src/Dotnet.Watch/dotnet-watch/Watch/MSBuildFileSetResult.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/Watch/MSBuildFileSetResult.cs rename to src/Dotnet.Watch/dotnet-watch/Watch/MSBuildFileSetResult.cs diff --git a/src/BuiltInTools/dotnet-watch/Watch/MsBuildFileSetFactory.cs b/src/Dotnet.Watch/dotnet-watch/Watch/MsBuildFileSetFactory.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/Watch/MsBuildFileSetFactory.cs rename to src/Dotnet.Watch/dotnet-watch/Watch/MsBuildFileSetFactory.cs diff --git a/src/BuiltInTools/dotnet-watch/Watch/StaticFileHandler.cs b/src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs similarity index 100% rename from src/BuiltInTools/dotnet-watch/Watch/StaticFileHandler.cs rename to src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/Dotnet.Watch/dotnet-watch/dotnet-watch.csproj similarity index 100% rename from src/BuiltInTools/dotnet-watch/dotnet-watch.csproj rename to src/Dotnet.Watch/dotnet-watch/dotnet-watch.csproj diff --git a/src/BuiltInTools/dotnet-watch/runtimeconfig.template.json b/src/Dotnet.Watch/dotnet-watch/runtimeconfig.template.json similarity index 100% rename from src/BuiltInTools/dotnet-watch/runtimeconfig.template.json rename to src/Dotnet.Watch/dotnet-watch/runtimeconfig.template.json diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.cs.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.cs.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.cs.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.cs.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.de.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.de.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.de.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.de.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.es.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.es.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.es.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.es.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.fr.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.fr.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.fr.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.fr.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.it.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.it.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.it.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.it.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.ja.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ja.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.ja.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.ja.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.ko.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ko.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.ko.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.ko.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.pl.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.pl.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.pl.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.pl.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.pt-BR.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.pt-BR.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.pt-BR.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.pt-BR.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.ru.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ru.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.ru.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.ru.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.tr.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.tr.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.tr.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.tr.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.zh-Hans.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hans.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.zh-Hans.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hans.xlf diff --git a/src/BuiltInTools/dotnet-watch/xlf/Resources.zh-Hant.xlf b/src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hant.xlf similarity index 100% rename from src/BuiltInTools/dotnet-watch/xlf/Resources.zh-Hant.xlf rename to src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hant.xlf diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index 80aea476d46c..f2362f96ee80 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -66,7 +66,7 @@ - + diff --git a/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj b/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj index afb60e54d774..839de0121c45 100644 --- a/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj +++ b/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj @@ -40,7 +40,7 @@ - + true false TargetFramework;TargetFrameworks diff --git a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj index 03b46badbae2..a9b32a2352b2 100644 --- a/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj +++ b/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/test/Microsoft.DotNet.HotReload.Client.Tests/Microsoft.DotNet.HotReload.Client.Tests.csproj b/test/Microsoft.DotNet.HotReload.Client.Tests/Microsoft.DotNet.HotReload.Client.Tests.csproj index 1253990897ce..ea1d50fa89d0 100644 --- a/test/Microsoft.DotNet.HotReload.Client.Tests/Microsoft.DotNet.HotReload.Client.Tests.csproj +++ b/test/Microsoft.DotNet.HotReload.Client.Tests/Microsoft.DotNet.HotReload.Client.Tests.csproj @@ -36,7 +36,7 @@ - - - + + + diff --git a/test/Microsoft.DotNet.HotReload.Test.Utilities/Microsoft.DotNet.HotReload.Test.Utilities.csproj b/test/Microsoft.DotNet.HotReload.Test.Utilities/Microsoft.DotNet.HotReload.Test.Utilities.csproj index c27c0c1d9a25..f267d2070886 100644 --- a/test/Microsoft.DotNet.HotReload.Test.Utilities/Microsoft.DotNet.HotReload.Test.Utilities.csproj +++ b/test/Microsoft.DotNet.HotReload.Test.Utilities/Microsoft.DotNet.HotReload.Test.Utilities.csproj @@ -8,7 +8,7 @@ - + diff --git a/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj b/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj index 361b5e101143..728c13a54f9b 100644 --- a/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj +++ b/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj @@ -8,8 +8,8 @@ - + - + diff --git a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj index c86f821366d9..d6b9a4167851 100644 --- a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj +++ b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj @@ -14,11 +14,11 @@ - + - + diff --git a/test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj b/test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj index 3effab61b6ce..4fe189842af0 100644 --- a/test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj +++ b/test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj @@ -16,6 +16,6 @@ - + diff --git a/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj b/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj index 9b1afe3702b4..0b9bf77c0747 100644 --- a/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj +++ b/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj @@ -14,8 +14,8 @@ Setting ExcludeAssets and Private ensures that no assemblies that have public types that are or depend on msbuild types are present in the output directory of the project. See TestUtilities/ModuleInitializer.cs. --> - - + + @@ -37,5 +37,5 @@ - +