diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index ce7f6d432b..9b1af1b35f 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -1,8 +1,3 @@
-
-
-
-
-
diff --git a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj b/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj
index 65a79b17a2..5b49f24fba 100644
--- a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj
+++ b/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj
@@ -7,11 +7,6 @@
Microsoft.AspNetCore.Blazor.Cli
true
Microsoft.AspNetCore.Blazor.Cli.Program
-
- false
Development server for use when building Blazor applications.
false
diff --git a/src/Components/Blazor/Cli/src/Properties/AssemblyInfo.cs b/src/Components/Blazor/Cli/src/Properties/AssemblyInfo.cs
deleted file mode 100644
index 551eab20b9..0000000000
--- a/src/Components/Blazor/Cli/src/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.E2ETests")]
diff --git a/src/Components/Blazor/Cli/src/Server/Program.cs b/src/Components/Blazor/Cli/src/Server/Program.cs
index 29f05fc9b7..4d5360d207 100644
--- a/src/Components/Blazor/Cli/src/Server/Program.cs
+++ b/src/Components/Blazor/Cli/src/Server/Program.cs
@@ -6,9 +6,19 @@ using Microsoft.Extensions.Configuration;
namespace Microsoft.AspNetCore.Blazor.Cli.Server
{
- internal class Program
+ // This project is a CLI tool, so we don't expect anyone to reference it
+ // as a runtime library. As such we consider it reasonable to mark the
+ // following method as public purely so the E2E tests project can invoke it.
+
+ ///
+ /// Intended for framework test use only.
+ ///
+ public class Program
{
- internal static IWebHost BuildWebHost(string[] args) =>
+ ///
+ /// Intended for framework test use only.
+ ///
+ public static IWebHost BuildWebHost(string[] args) =>
WebHost.CreateDefaultBuilder(args)
.UseConfiguration(new ConfigurationBuilder()
.AddCommandLine(args)