From 42511e8652802423f2afef77dae559f0a3e82b87 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 4 Apr 2019 09:47:56 +0100 Subject: [PATCH] Replace Blazor CLI tool with new DevServer package (#9028) --- build/CodeSign.props | 2 +- .../ResolveRuntimeDependenciesCommand.cs | 2 +- .../src/Cli/Commands/WriteBootJsonCommand.cs | 2 +- .../Blazor/Build/src/Cli/Program.cs | 2 +- .../Build/src/ReferenceFromSource.props | 6 +-- .../Microsoft.AspNetCore.Blazor.Cli.csproj | 47 ----------------- .../Cli/src/temporaryruntimeconfig.json | 9 ---- .../src/Commands/ServeCommand.cs | 2 +- ...crosoft.AspNetCore.Blazor.DevServer.csproj | 50 +++++++++++++++++++ ...rosoft.AspNetCore.Blazor.DevServer.nuspec} | 15 ++---- .../Blazor/{Cli => DevServer}/src/Program.cs | 6 +-- .../{Cli => DevServer}/src/Server/Program.cs | 2 +- .../{Cli => DevServer}/src/Server/Startup.cs | 2 +- ...icrosoft.AspNetCore.Blazor.DevServer.props | 7 +++ .../BlazorApplicationBuilderExtensions.cs | 2 +- .../BlazorStandalone-CSharp.csproj | 5 +- src/Components/Components.sln | 2 +- src/Components/NuGetPackageVerifier.json | 10 ---- src/Components/README.md | 2 +- .../Server/src/Properties/AssemblyInfo.cs | 2 +- .../ServerFixtures/DevHostServerFixture.cs | 2 +- ...soft.AspNetCore.Components.E2ETests.csproj | 2 +- 22 files changed, 81 insertions(+), 100 deletions(-) delete mode 100644 src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj delete mode 100644 src/Components/Blazor/Cli/src/temporaryruntimeconfig.json rename src/Components/Blazor/{Cli => DevServer}/src/Commands/ServeCommand.cs (94%) create mode 100644 src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj rename src/Components/Blazor/{Cli/src/Microsoft.AspNetCore.Blazor.Cli.nuspec => DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec} (56%) rename src/Components/Blazor/{Cli => DevServer}/src/Program.cs (86%) rename src/Components/Blazor/{Cli => DevServer}/src/Server/Program.cs (94%) rename src/Components/Blazor/{Cli => DevServer}/src/Server/Startup.cs (98%) create mode 100644 src/Components/Blazor/DevServer/src/build/Microsoft.AspNetCore.Blazor.DevServer.props diff --git a/build/CodeSign.props b/build/CodeSign.props index 7f5d4a527d..cd1865921a 100644 --- a/build/CodeSign.props +++ b/build/CodeSign.props @@ -23,7 +23,7 @@ - + diff --git a/src/Components/Blazor/Build/src/Cli/Commands/ResolveRuntimeDependenciesCommand.cs b/src/Components/Blazor/Build/src/Cli/Commands/ResolveRuntimeDependenciesCommand.cs index e749713c42..d5d37bb833 100644 --- a/src/Components/Blazor/Build/src/Cli/Commands/ResolveRuntimeDependenciesCommand.cs +++ b/src/Components/Blazor/Build/src/Cli/Commands/ResolveRuntimeDependenciesCommand.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.Build.DevServer.Commands { class ResolveRuntimeDependenciesCommand { diff --git a/src/Components/Blazor/Build/src/Cli/Commands/WriteBootJsonCommand.cs b/src/Components/Blazor/Build/src/Cli/Commands/WriteBootJsonCommand.cs index 275f4e7575..dea217958c 100644 --- a/src/Components/Blazor/Build/src/Cli/Commands/WriteBootJsonCommand.cs +++ b/src/Components/Blazor/Build/src/Cli/Commands/WriteBootJsonCommand.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.CommandLineUtils; using System; using System.IO; -namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.Build.DevServer.Commands { internal class WriteBootJsonCommand { diff --git a/src/Components/Blazor/Build/src/Cli/Program.cs b/src/Components/Blazor/Build/src/Cli/Program.cs index 1eac086fc7..3bd530453f 100644 --- a/src/Components/Blazor/Build/src/Cli/Program.cs +++ b/src/Components/Blazor/Build/src/Cli/Program.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Build.Cli.Commands; +using Microsoft.AspNetCore.Blazor.Build.DevServer.Commands; using Microsoft.Extensions.CommandLineUtils; namespace Microsoft.AspNetCore.Blazor.Build diff --git a/src/Components/Blazor/Build/src/ReferenceFromSource.props b/src/Components/Blazor/Build/src/ReferenceFromSource.props index b178e32392..fdbe689421 100644 --- a/src/Components/Blazor/Build/src/ReferenceFromSource.props +++ b/src/Components/Blazor/Build/src/ReferenceFromSource.props @@ -18,16 +18,16 @@ dotnet - <_BlazorCliLocation>$(MSBuildThisFileDirectory)../../Cli/src/bin/$(Configuration)/netcoreapp3.0/dotnet-blazor.dll + <_BlazorCliLocation>$(MSBuildThisFileDirectory)../../DevServer/src/bin/$(Configuration)/netcoreapp3.0/blazor-devserver.dll exec "$(_BlazorCliLocation)" serve $(AdditionalRunArguments) diff --git a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj b/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj deleted file mode 100644 index 5a85cbf615..0000000000 --- a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.csproj +++ /dev/null @@ -1,47 +0,0 @@ - - - - netcoreapp3.0 - Exe - dotnet-blazor - Microsoft.AspNetCore.Blazor.Cli - true - Microsoft.AspNetCore.Blazor.Cli.Program - Development server for use when building Blazor applications. - - false - - - - - - - - - - - - - - Microsoft.AspNetCore.Blazor.Cli.nuspec - - outdir=$(OutDir); - componentsrootdir=..\..\..\; - blazorversion=$(PackageVersion); - aspnetcoreversion=$(ComponentsPackageVersion); - sharedfxversion=$(SharedFxVersion); - repositorycommit=$(SourceRevisionId); - - - - - - diff --git a/src/Components/Blazor/Cli/src/temporaryruntimeconfig.json b/src/Components/Blazor/Cli/src/temporaryruntimeconfig.json deleted file mode 100644 index ab764021e6..0000000000 --- a/src/Components/Blazor/Cli/src/temporaryruntimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "netcoreapp3.0", - "framework": { - "name": "Microsoft.AspNetCore.App", - "version": "${sharedfxversion}" - } - } -} diff --git a/src/Components/Blazor/Cli/src/Commands/ServeCommand.cs b/src/Components/Blazor/DevServer/src/Commands/ServeCommand.cs similarity index 94% rename from src/Components/Blazor/Cli/src/Commands/ServeCommand.cs rename to src/Components/Blazor/DevServer/src/Commands/ServeCommand.cs index ae7a4d671a..2608306786 100644 --- a/src/Components/Blazor/Cli/src/Commands/ServeCommand.cs +++ b/src/Components/Blazor/DevServer/src/Commands/ServeCommand.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Blazor.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.DevServer.Commands { internal class ServeCommand : CommandLineApplication { diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj new file mode 100644 index 0000000000..47023e0d9b --- /dev/null +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj @@ -0,0 +1,50 @@ + + + + netcoreapp3.0 + Exe + true + blazor-devserver + Microsoft.AspNetCore.Blazor.DevServer + true + false + Microsoft.AspNetCore.Blazor.DevServer.Program + Development server for use when building Blazor applications. + + false + + + + + + + + + + + + + true + obj\publish\ + $(IntermediatePackDir)$(TargetFramework)\ + Microsoft.AspNetCore.Blazor.DevServer.nuspec + + + + + + false + + packageId=$(PackageId); + description=$(Description); + publishDir=$([MSBuild]::NormalizeDirectory($(PublishDir))); + componentsrootdir=..\..\..\; + blazorversion=$(PackageVersion); + repositorycommit=$(SourceRevisionId); + + + <_TargetFramework Include="$(TargetFramework)" /> + + + + diff --git a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.nuspec b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec similarity index 56% rename from src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.nuspec rename to src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec index cfbc5f966f..41f4080270 100644 --- a/src/Components/Blazor/Cli/src/Microsoft.AspNetCore.Blazor.Cli.nuspec +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec @@ -1,7 +1,7 @@  - Microsoft.AspNetCore.Blazor.Cli + $packageId$ $blazorversion$ Microsoft Microsoft @@ -9,24 +9,17 @@ https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt https://asp.net/ https://go.microsoft.com/fwlink/?LinkID=288859 - Development server for use when building Blazor applications. + $description$ This package was built from the source code at https://github.com/aspnet/AspNetCore/tree/$repositorycommit$ © Microsoft Corporation. All rights reserved. aspnetcore components true - - - - - - - - - + + diff --git a/src/Components/Blazor/Cli/src/Program.cs b/src/Components/Blazor/DevServer/src/Program.cs similarity index 86% rename from src/Components/Blazor/Cli/src/Program.cs rename to src/Components/Blazor/DevServer/src/Program.cs index dcc71099b1..30eb3927f0 100644 --- a/src/Components/Blazor/Cli/src/Program.cs +++ b/src/Components/Blazor/DevServer/src/Program.cs @@ -1,10 +1,10 @@ // 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 Microsoft.AspNetCore.Blazor.Cli.Commands; +using Microsoft.AspNetCore.Blazor.DevServer.Commands; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Blazor.Cli +namespace Microsoft.AspNetCore.Blazor.DevServer { internal class Program { @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Blazor.Cli { var app = new CommandLineApplication(throwOnUnexpectedArg: false) { - Name = "blazor-cli" + Name = "blazor-devserver" }; app.HelpOption("-?|-h|--help"); diff --git a/src/Components/Blazor/Cli/src/Server/Program.cs b/src/Components/Blazor/DevServer/src/Server/Program.cs similarity index 94% rename from src/Components/Blazor/Cli/src/Server/Program.cs rename to src/Components/Blazor/DevServer/src/Server/Program.cs index 4d5360d207..55876f5959 100644 --- a/src/Components/Blazor/Cli/src/Server/Program.cs +++ b/src/Components/Blazor/DevServer/src/Server/Program.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; -namespace Microsoft.AspNetCore.Blazor.Cli.Server +namespace Microsoft.AspNetCore.Blazor.DevServer.Server { // 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 diff --git a/src/Components/Blazor/Cli/src/Server/Startup.cs b/src/Components/Blazor/DevServer/src/Server/Startup.cs similarity index 98% rename from src/Components/Blazor/Cli/src/Server/Startup.cs rename to src/Components/Blazor/DevServer/src/Server/Startup.cs index 6e148f8b20..d5de91abb8 100644 --- a/src/Components/Blazor/Cli/src/Server/Startup.cs +++ b/src/Components/Blazor/DevServer/src/Server/Startup.cs @@ -13,7 +13,7 @@ using System.IO; using System.Linq; using System.Net.Mime; -namespace Microsoft.AspNetCore.Blazor.Cli.Server +namespace Microsoft.AspNetCore.Blazor.DevServer.Server { internal class Startup { diff --git a/src/Components/Blazor/DevServer/src/build/Microsoft.AspNetCore.Blazor.DevServer.props b/src/Components/Blazor/DevServer/src/build/Microsoft.AspNetCore.Blazor.DevServer.props new file mode 100644 index 0000000000..e9d59a35ff --- /dev/null +++ b/src/Components/Blazor/DevServer/src/build/Microsoft.AspNetCore.Blazor.DevServer.props @@ -0,0 +1,7 @@ + + + <_BlazorDevServerDll>$(MSBuildThisFileDirectory)../tools/blazor-devserver.dll + dotnet + $(_BlazorDevServerDll) serve + + diff --git a/src/Components/Blazor/Server/src/Builder/BlazorApplicationBuilderExtensions.cs b/src/Components/Blazor/Server/src/Builder/BlazorApplicationBuilderExtensions.cs index e8b7444cdb..42e0ee2bb8 100644 --- a/src/Components/Blazor/Server/src/Builder/BlazorApplicationBuilderExtensions.cs +++ b/src/Components/Blazor/Server/src/Builder/BlazorApplicationBuilderExtensions.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Builder /// public static class BlazorApplicationBuilderExtensions { - const string DevServerApplicationName = "dotnet-blazor"; + const string DevServerApplicationName = "blazor-devserver"; /// /// Configures the middleware pipeline to work with Blazor. diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj index c15dd8d0cc..8c8690af82 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj @@ -2,8 +2,6 @@ netstandard2.0 - dotnet - blazor serve https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; @@ -14,8 +12,7 @@ - - + diff --git a/src/Components/Components.sln b/src/Components/Components.sln index 956d991aff..7337bf9f00 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Build.Tests", "Blazor\Build\test\Microsoft.AspNetCore.Blazor.Build.Tests.csproj", "{E38FDBB0-08C1-444E-A449-69C8A59D721B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Cli", "Blazor\Cli\src\Microsoft.AspNetCore.Blazor.Cli.csproj", "{A6C8050D-7C18-4585-ADCF-833AC1765847}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.DevServer", "Blazor\DevServer\src\Microsoft.AspNetCore.Blazor.DevServer.csproj", "{A6C8050D-7C18-4585-ADCF-833AC1765847}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.E2EPerformance", "Blazor\testassets\Microsoft.AspNetCore.Blazor.E2EPerformance\Microsoft.AspNetCore.Blazor.E2EPerformance.csproj", "{08773DD6-6FED-4BF2-BD9F-C19D2CF919BB}" EndProject diff --git a/src/Components/NuGetPackageVerifier.json b/src/Components/NuGetPackageVerifier.json index 13c842a076..1a19662a8d 100644 --- a/src/Components/NuGetPackageVerifier.json +++ b/src/Components/NuGetPackageVerifier.json @@ -131,16 +131,6 @@ } } }, - "Microsoft.AspNetCore.Blazor.Cli": { - "Exclusions": { - "SIGN_STRONGNAME": { - "lib/netcoreapp3.0/dotnet-blazor.dll": "See comments in Microsoft.AspNetCore.Blazor.Cli.csproj" - }, - "WRONG_PUBLICKEYTOKEN": { - "lib/netcoreapp3.0/dotnet-blazor.dll": "See comments in Microsoft.AspNetCore.Blazor.Cli.csproj" - } - } - }, "Microsoft.AspNetCore.Blazor.Templates": { "Exclusions": { "PACKAGE_MISSING_REPO_COMMIT": { diff --git a/src/Components/README.md b/src/Components/README.md index f81dd4e674..5a8e4b05be 100644 --- a/src/Components/README.md +++ b/src/Components/README.md @@ -79,7 +79,7 @@ You can browse https://dotnet.myget.org/gallery/blazor-dev to find the current v - + ``` diff --git a/src/Components/Server/src/Properties/AssemblyInfo.cs b/src/Components/Server/src/Properties/AssemblyInfo.cs index 29d50b9636..e509761c2c 100644 --- a/src/Components/Server/src/Properties/AssemblyInfo.cs +++ b/src/Components/Server/src/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Cli, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.DevServer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Server.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/src/Components/test/E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs b/src/Components/test/E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs index cd47e47fdb..0526e940ae 100644 --- a/src/Components/test/E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs +++ b/src/Components/test/E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Hosting; using System.Collections.Generic; -using DevHostServerProgram = Microsoft.AspNetCore.Blazor.Cli.Server.Program; +using DevHostServerProgram = Microsoft.AspNetCore.Blazor.DevServer.Server.Program; namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index d7c8e2e767..24ebd8ebf2 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -32,7 +32,7 @@ - +