Rename Blazor.Mono -> Components.WebAssembly.Runtime

Author: pranavkm

eng/Dependencies.props

@@ -118,7 +118,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.1" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion)" />
     <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.2.2" Version="$(MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion)" />
     <LatestPackageReference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
-    <LatestPackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="$(MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion)" />
     <LatestPackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />

eng/Version.Details.xml

@@ -9,7 +9,7 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.2.0-preview1.20113.1">
+    <Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="3.2.0-preview1.20113.1">
       <Uri>https://github.com/dotnet/blazor</Uri>
       <Sha>63c3aa1e27e3a34cb78e8bce381af6d24198c104</Sha>
     </Dependency>

eng/Versions.props

@@ -98,7 +98,7 @@
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsPackageVersion>3.1.0</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from aspnet/Blazor -->
-    <MicrosoftAspNetCoreBlazorMonoPackageVersion>3.2.0-preview1.20113.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0-preview1.20113.1</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
     <!-- Packages from aspnet/Extensions -->
     <InternalAspNetCoreAnalyzersPackageVersion>3.1.2-servicing.20067.6</InternalAspNetCoreAnalyzersPackageVersion>
     <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.2-servicing.20067.6</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>

src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.csproj

@@ -21,9 +21,7 @@
   <ItemGroup>
     <NuspecProperty Include="configuration=$(Configuration)" />
     <NuspecProperty Include="taskskDir=$(OutputPath)tools" />
-    <NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
-    <NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
-    <NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
+    <NuspecProperty Include="MicrosoftAspNetCoreComponentsWebAssemblyRuntime=$(MicrosoftAspNetCoreComponentsWebAssemblyRuntime)" />
   </ItemGroup>
 
   <ItemGroup>

src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
+      <dependency id="Microsoft.AspNetCore.Components.WebAssembly.Runtime" version="$MicrosoftAspNetCoreComponentsWebAssemblyRuntime$" include="all" />
     </dependencies>
   </metadata>
   <files>

src/Components/WebAssembly/Build/src/ReferenceFromSource.props

@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore.Blazor.Mono" />
+    <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
   </ItemGroup>
 
   <Target Name="_BuildBlazorBuildProject" BeforeTargets="ResolveProjectReferences">

src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets

@@ -3,22 +3,6 @@
     <BlazorLinkOnBuild Condition="$(BlazorLinkOnBuild) == ''">true</BlazorLinkOnBuild>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Stop-gap until we can migrate Blazor.Mono package to use better naming convention -->
-    <DotNetWebAssemblyBCLPath Condition="'$(DotNetWebAssemblyBCLPath)' == '' AND '$(MonoBaseClassLibraryPath)' != ''">$(MonoBaseClassLibraryPath)</DotNetWebAssemblyBCLPath>
-    <DotNetWebAssemblyBCLFacadesPath Condition="'$(DotNetWebAssemblyBCLFacadesPath)' == '' AND '$(MonoBaseClassLibraryFacadesPath)' != ''">$(MonoBaseClassLibraryFacadesPath)</DotNetWebAssemblyBCLFacadesPath>
-    <DotNetWebAssemblyRuntimePath Condition="'$(DotNetWebAssemblyRuntimePath)' == '' AND '$(MonoWasmRuntimePath)' != ''">$(MonoWasmRuntimePath)</DotNetWebAssemblyRuntimePath>
-    <DotNetWebAssemblyFrameworkPath Condition="'$(DotNetWebAssemblyFrameworkPath)' == '' AND '$(MonoWasmFrameworkPath)' != ''">$(MonoWasmFrameworkPath)</DotNetWebAssemblyFrameworkPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(DotNetWebAssemblyArtifactsRoot)' != ''">
-    <!-- Compute paths given a path to DotNet WASM artifacts. This is meant to make it easy to test WASM builds -->
-    <DotNetWebAssemblyBCLPath>$(DotNetWebAssemblyArtifactsRoot)\wasm-bcl\wasm\</DotNetWebAssemblyBCLPath>
-    <DotNetWebAssemblyBCLFacadesPath>$(DotNetWebAssemblyBCLPath)\Facades\</DotNetWebAssemblyBCLFacadesPath>
-    <DotNetWebAssemblyRuntimePath>$(DotNetWebAssemblyArtifactsRoot)\builds\debug\</DotNetWebAssemblyRuntimePath>
-    <DotNetWebAssemblyFrameworkPath>$(DotNetWebAssemblyArtifactsRoot)\framework\</DotNetWebAssemblyFrameworkPath>
-  </PropertyGroup>
-
   <Target
     Name="_BlazorCopyFilesToOutputDirectory"
     DependsOnTargets="PrepareBlazorOutputs;$(_BlazorCopyFilesToOutputDirectoryDependsOn)"
@@ -77,9 +61,9 @@
 
     <ItemGroup>
       <_WebAssemblyBCLFolder Include="
-        $(DotNetWebAssemblyBCLPath);
-        $(DotNetWebAssemblyBCLFacadesPath);
-        $(DotNetWebAssemblyFrameworkPath)" />
+        $(ComponentsWebAssemblyBaseClassLibraryPath);
+        $(ComponentsWebAssemblyBaseClassLibraryFacadesPath);
+        $(ComponentsWebAssemblyFrameworkPath)" />
 
       <_WebAssemblyBCLAssembly Include="%(_WebAssemblyBCLFolder.Identity)*.dll" />
     </ItemGroup>
@@ -131,7 +115,7 @@
         <BlazorRuntimeFile>true</BlazorRuntimeFile>
         <TargetOutputPath>$(BlazorRuntimeBinOutputPath)%(FileName)%(Extension)</TargetOutputPath>
         <RelativeOutputPath>%(FileName)%(Extension)</RelativeOutputPath>
-      </BlazorOutputWithTargetPath>      
+      </BlazorOutputWithTargetPath>
     </ItemGroup>
 
     <!--
@@ -164,7 +148,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <MonoWasmFile Include="$(DotNetWebAssemblyRuntimePath)*" />
+      <MonoWasmFile Include="$(ComponentsWebAssemblyRuntimePath)*" />
       <BlazorJSFile Include="$(BlazorJSPath)" />
       <BlazorJSFile Include="$(BlazorJSMapPath)" Condition="Exists('$(BlazorJSMapPath)')" />
 
@@ -284,7 +268,7 @@
     </PropertyGroup>
 
     <BlazorILLink
-        ILLinkPath="$(MonoLinkerPath)"
+        ILLinkPath="$(ComponentsWebAssemblyLinkerPath)"
         AssemblyPaths="@(_BlazorAssemblyToLink)"
         RootAssemblyNames="@(_BlazorLinkerRoot)"
         RootDescriptorFiles="@(BlazorLinkerDescriptor)"

src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj

@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" />
-    <Reference Include="Microsoft.AspNetCore.Blazor.Mono" />
+    <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.Core" />
     <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
@@ -59,9 +59,9 @@
   <!-- A bit of msbuild magic to support reference resolver tests -->
   <Target Name="CreateReferenceHintPathsList" AfterTargets="Build">
     <ItemGroup>
-      <_BclDirectory Include="$(MonoBaseClassLibraryPath)" />
-      <_BclDirectory Include="$(MonoBaseClassLibraryFacadesPath)" />
-      <_BclDirectory Include="$(MonoWasmFrameworkPath)" />
+      <_BclDirectory Include="$(ComponentsWebAssemblyBaseClassLibraryPath)" />
+      <_BclDirectory Include="$(ComponentsWebAssemblyBaseClassLibraryFacadesPath)" />
+      <_BclDirectory Include="$(ComponentsWebAssemblyFrameworkPath)" />
     </ItemGroup>
 
     <WriteLinesToFile Lines="@(ReferencePath)" File="$(TargetDir)referenceHints.txt" WriteOnlyWhenDifferent="true" Overwrite="true" />

src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="$(MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>