From 3e5381c17ed17bb1c7ddb2c5215bf762e673854c Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 27 Feb 2018 11:54:43 +0000
Subject: [PATCH] Rename .DevHost project to .Cli, and make it work as a
 DotNetCliTool

---
 Blazor.sln                                    | 16 +++++++-------
 samples/StandaloneApp/StandaloneApp.csproj    |  2 +-
 .../Cli/Commands/ServeDevHost.cs              | 22 -------------------
 .../Cli/Program.cs                            |  3 +--
 .../Microsoft.AspNetCore.Blazor.Build.csproj  |  2 --
 .../targets/All.targets                       |  2 +-
 .../Microsoft.AspNetCore.Blazor.Cli.csproj}   |  4 +++-
 .../Program.cs                                |  2 +-
 .../Properties/AssemblyInfo.cs                |  0
 .../Server/Program.cs                         |  6 ++---
 .../Server/Startup.cs                         | 10 ++++-----
 .../Properties/AssemblyInfo.cs                |  2 +-
 src/anglesharp/AngleSharpBuilder/Program.cs   |  2 +-
 ...rosoft.AspNetCore.Blazor.Build.Test.csproj |  3 +++
 .../ServerFixtures/DevHostServerFixture.cs    |  2 +-
 ...Microsoft.AspNetCore.Blazor.E2ETest.csproj |  2 +-
 .../testapps/BasicTestApp/BasicTestApp.csproj |  2 +-
 17 files changed, 31 insertions(+), 51 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/ServeDevHost.cs
 rename src/{Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj => Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj} (69%)
 rename src/{Microsoft.AspNetCore.Blazor.DevHost => Microsoft.AspNetCore.Blazor.Cli}/Program.cs (95%)
 rename src/{Microsoft.AspNetCore.Blazor.DevHost => Microsoft.AspNetCore.Blazor.Cli}/Properties/AssemblyInfo.cs (100%)
 rename src/{Microsoft.AspNetCore.Blazor.DevHost => Microsoft.AspNetCore.Blazor.Cli}/Server/Program.cs (78%)
 rename src/{Microsoft.AspNetCore.Blazor.DevHost => Microsoft.AspNetCore.Blazor.Cli}/Server/Startup.cs (98%)

diff --git a/Blazor.sln b/Blazor.sln
index ce8883d29c..7558ea8c5e 100644
--- a/Blazor.sln
+++ b/Blazor.sln
@@ -26,8 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanityClient", "samples\MonoSanityClient\MonoSanityClient.csproj", "{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.DevHost", "src\Microsoft.AspNetCore.Blazor.DevHost\Microsoft.AspNetCore.Blazor.DevHost.csproj", "{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.BuildTools", "src\Microsoft.AspNetCore.Blazor.BuildTools\Microsoft.AspNetCore.Blazor.BuildTools.csproj", "{BB34336F-E68E-4411-9805-CAAA919F5EA1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostedInAspNet", "HostedInAspNet", "{4D367450-96E9-4C8C-8B56-EED8ADE3A20D}"
@@ -68,7 +66,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Browser.Test", "test\Microsoft.AspNetCore.Blazor.Browser.Test\Microsoft.AspNetCore.Blazor.Browser.Test.csproj", "{EC2A38BF-6E77-4A8E-A731-15929544F29C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "test\testapps\TestServer\TestServer.csproj", "{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServer", "test\testapps\TestServer\TestServer.csproj", "{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Cli", "src\Microsoft.AspNetCore.Blazor.Cli\Microsoft.AspNetCore.Blazor.Cli.csproj", "{AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -100,10 +100,6 @@ Global
 		{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -172,6 +168,10 @@ Global
 		{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -184,7 +184,6 @@ Global
 		{118484D3-3993-45CE-97C1-6F28A517529B} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}
 		{5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}
 		{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990} = {2A076721-6081-4517-8329-B9E5110D6DAC}
-		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
 		{4D367450-96E9-4C8C-8B56-EED8ADE3A20D} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA}
 		{B4335F7C-4E86-4559-821F-F1B1C75F5FAE} = {4D367450-96E9-4C8C-8B56-EED8ADE3A20D}
@@ -206,6 +205,7 @@ Global
 		{D652A019-B765-4922-B7B8-3AB1C58338D7} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
 		{EC2A38BF-6E77-4A8E-A731-15929544F29C} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}
 		{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45} = {4AE0D35B-D97A-44D0-8392-C9240377DCCE}
+		{AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {504DA352-6788-4DC0-8705-82167E72A4D3}
diff --git a/samples/StandaloneApp/StandaloneApp.csproj b/samples/StandaloneApp/StandaloneApp.csproj
index 558911261e..253651db56 100644
--- a/samples/StandaloneApp/StandaloneApp.csproj
+++ b/samples/StandaloneApp/StandaloneApp.csproj
@@ -5,7 +5,7 @@
 
     <!-- Local alternative to <RunArguments>blazor serve</RunArguments> -->
     <RunCommand>dotnet</RunCommand>
-    <RunArguments>run --project ../../src/Microsoft.AspNetCore.Blazor.DevHost serve</RunArguments>
+    <RunArguments>run --project ../../src/Microsoft.AspNetCore.Blazor.Cli serve</RunArguments>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/ServeDevHost.cs b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/ServeDevHost.cs
deleted file mode 100644
index 793134bde1..0000000000
--- a/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/ServeDevHost.cs
+++ /dev/null
@@ -1,22 +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.Linq;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.CommandLineUtils;
-
-namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands
-{
-    internal class ServeDevHost
-    {
-        public static void Command(CommandLineApplication command, string[] args)
-        {
-            command.OnExecute(() =>
-            {
-                var remainingArgs = args.Skip(1).ToArray();
-                DevHost.Server.Program.BuildWebHost(remainingArgs).Run();
-                return 0;
-            });
-        }
-    }
-}
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs
index 23de20af48..071d152ca5 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs
@@ -12,13 +12,12 @@ namespace Microsoft.AspNetCore.Blazor.Build
         {
             var app = new CommandLineApplication
             {
-                Name = "dotnet-blazor"
+                Name = "Microsoft.AspNetCore.Blazor.Build"
             };
             app.HelpOption("-?|-h|--help");
             
             app.Command("build", BuildCommand.Command);
             app.Command("buildrazor", BuildRazorCommand.Command);
-            app.Command("serve", command => ServeDevHost.Command(command, args));
 
             if (args.Length > 0)
             {
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
index 970321f4bd..9548254768 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
@@ -4,7 +4,6 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <OutDir>tools</OutDir>
-    <AssemblyName>dotnet-blazor</AssemblyName>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
@@ -22,7 +21,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Blazor.Browser.JS\Microsoft.AspNetCore.Blazor.Browser.JS.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Blazor.DevHost\Microsoft.AspNetCore.Blazor.DevHost.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Blazor.Mono\Microsoft.AspNetCore.Blazor.Mono.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Blazor.Razor.Extensions\Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Blazor\Microsoft.AspNetCore.Blazor.csproj" />
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets
index 658bc9fb29..71a1e527cc 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets
+++ b/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <BlazorBuildExe>dotnet &quot;$(MSBuildThisFileDirectory)../tools/dotnet-blazor.dll&quot;</BlazorBuildExe>
+    <BlazorBuildExe>dotnet &quot;$(MSBuildThisFileDirectory)../tools/Microsoft.AspNetCore.Blazor.Build.dll&quot;</BlazorBuildExe>
   
     <!-- The Blazor build code can only find your referenced assemblies if they are in the output directory -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/src/Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj b/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj
similarity index 69%
rename from src/Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj
rename to src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj
index 6ae0578988..a9f73f253d 100644
--- a/src/Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj
@@ -3,7 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <StartupObject>Microsoft.AspNetCore.Blazor.DevHost.Program</StartupObject>
+    <AssemblyName>dotnet-blazor</AssemblyName>
+    <PackageId>Microsoft.AspNetCore.Blazor.Cli</PackageId>
+    <StartupObject>Microsoft.AspNetCore.Blazor.Cli.Program</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Blazor.DevHost/Program.cs b/src/Microsoft.AspNetCore.Blazor.Cli/Program.cs
similarity index 95%
rename from src/Microsoft.AspNetCore.Blazor.DevHost/Program.cs
rename to src/Microsoft.AspNetCore.Blazor.Cli/Program.cs
index bb8b83299b..e8cf351a7a 100644
--- a/src/Microsoft.AspNetCore.Blazor.DevHost/Program.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Cli/Program.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting;
 using System;
 using System.Linq;
 
-namespace Microsoft.AspNetCore.Blazor.DevHost
+namespace Microsoft.AspNetCore.Blazor.Cli
 {
     internal class Program
     {
diff --git a/src/Microsoft.AspNetCore.Blazor.DevHost/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Blazor.Cli/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Blazor.DevHost/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Blazor.Cli/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Program.cs b/src/Microsoft.AspNetCore.Blazor.Cli/Server/Program.cs
similarity index 78%
rename from src/Microsoft.AspNetCore.Blazor.DevHost/Server/Program.cs
rename to src/Microsoft.AspNetCore.Blazor.Cli/Server/Program.cs
index e90d9341e4..29f05fc9b7 100644
--- a/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Program.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Cli/Server/Program.cs
@@ -4,11 +4,11 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 
-namespace Microsoft.AspNetCore.Blazor.DevHost.Server
+namespace Microsoft.AspNetCore.Blazor.Cli.Server
 {
-    public class Program
+    internal class Program
     {
-        public static IWebHost BuildWebHost(string[] args) =>
+        internal static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseConfiguration(new ConfigurationBuilder()
                     .AddCommandLine(args)
diff --git a/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs b/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs
rename to src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs
index cefc3218ae..fb09c2ce7d 100644
--- a/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs
@@ -1,15 +1,15 @@
 // 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;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System.IO;
-using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.IO;
 
-namespace Microsoft.AspNetCore.Blazor.DevHost.Server
+namespace Microsoft.AspNetCore.Blazor.Cli.Server
 {
     internal class Startup
     {
diff --git a/src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs
index 77561bc49e..1f2a6fd156 100644
--- a/src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs
@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.DevHost")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Cli")]
diff --git a/src/anglesharp/AngleSharpBuilder/Program.cs b/src/anglesharp/AngleSharpBuilder/Program.cs
index ae2fb3eb20..2e2261030e 100644
--- a/src/anglesharp/AngleSharpBuilder/Program.cs
+++ b/src/anglesharp/AngleSharpBuilder/Program.cs
@@ -40,7 +40,7 @@ namespace AngleSharpBuilder
             var assemblyLocation = assembly.Location;
             var moduleDefinition = ModuleDefinition.ReadModule(assemblyLocation);
 
-            AddInternalsVisibleTo(moduleDefinition, "dotnet-blazor");
+            AddInternalsVisibleTo(moduleDefinition, "Microsoft.AspNetCore.Blazor.Build");
             AddInternalsVisibleTo(moduleDefinition, "Microsoft.AspNetCore.Blazor.Razor.Extensions");
             RemoveStrongName(moduleDefinition);
             SetAssemblyName(moduleDefinition, "Microsoft.AspNetCore.Blazor.AngleSharp");
diff --git a/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj b/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj
index b83f4d7e36..c2c440f4de 100644
--- a/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj
+++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,6 +24,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\anglesharp\AngleSharpBuilder\AngleSharpBuilder.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Blazor.Mono\Microsoft.AspNetCore.Blazor.Mono.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Blazor.Razor.Extensions\Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj" />
     <Reference Include="Microsoft.AspNetCore.Blazor.AngleSharp" HintPath="..\..\src\anglesharp\AngleSharpBuilder\dist\Microsoft.AspNetCore.Blazor.AngleSharp.dll" />
   </ItemGroup>
 
diff --git a/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs
index 26904f2ad9..676808f331 100644
--- a/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs
+++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Hosting;
-using DevHostServerProgram = Microsoft.AspNetCore.Blazor.DevHost.Server.Program;
+using DevHostServerProgram = Microsoft.AspNetCore.Blazor.Cli.Server.Program;
 
 namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures
 {
diff --git a/test/Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj b/test/Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj
index 8b44cc3d52..7045e97bc6 100644
--- a/test/Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj
+++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj
@@ -22,7 +22,7 @@
     <ProjectReference Include="..\..\samples\MonoSanityClient\MonoSanityClient.csproj" />
     <ProjectReference Include="..\..\samples\MonoSanity\MonoSanity.csproj" />
     <ProjectReference Include="..\..\samples\StandaloneApp\StandaloneApp.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Blazor.DevHost\Microsoft.AspNetCore.Blazor.DevHost.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Blazor.Cli\Microsoft.AspNetCore.Blazor.Cli.csproj" />
     <ProjectReference Include="..\testapps\BasicTestApp\BasicTestApp.csproj" />
     <ProjectReference Include="..\testapps\TestServer\TestServer.csproj" />
   </ItemGroup>
diff --git a/test/testapps/BasicTestApp/BasicTestApp.csproj b/test/testapps/BasicTestApp/BasicTestApp.csproj
index 040158b78a..29f3ca09f8 100644
--- a/test/testapps/BasicTestApp/BasicTestApp.csproj
+++ b/test/testapps/BasicTestApp/BasicTestApp.csproj
@@ -5,7 +5,7 @@
 
     <!-- Local alternative to <RunArguments>blazor serve</RunArguments> -->
     <RunCommand>dotnet</RunCommand>
-    <RunArguments>run --project ..\..\..\src\Microsoft.AspNetCore.Blazor.DevHost serve --pathbase /subdir</RunArguments>
+    <RunArguments>run --project ..\..\..\src\Microsoft.AspNetCore.Blazor.Cli serve --pathbase /subdir</RunArguments>
   </PropertyGroup>
 
   <!-- Local alternative to <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" /> -->