diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 5877027dfd2064d4507476f52eacd40141096c98..1a5b5d456c6afd20eea12d0ff19f4c7d223fe573 100644
--- a/eng/Dependencies.props
+++ b/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)" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index aac035cf461c7d68bcbb5100d98bf1b578a87ca6..b3e543ce6271cd1ace6638ff803ce43ff7c9af26 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,9 +9,9 @@
-->
<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-preview2.20118.1">
<Uri>https://github.com/dotnet/blazor</Uri>
- <Sha>63c3aa1e27e3a34cb78e8bce381af6d24198c104</Sha>
+ <Sha>d7c7fef6d1633f4afa10e5bdf47b164ffa6d4fd5</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.2">
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index fd967b7c4fce8eedcb0e8d330e9074d0bf7db8b0..2589f539d5ca341beccc7e9a3e1e48d3614f3d97 100644
--- a/eng/Versions.props
+++ b/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-preview2.20118.1</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
<!-- Packages from aspnet/Extensions -->
<InternalAspNetCoreAnalyzersPackageVersion>3.1.2-servicing.20067.6</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.2-servicing.20067.6</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
diff --git a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.csproj b/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.csproj
index c673a7827f781b54a2bd6ca0fc2002a0c160e6af..c6cb9aaf7a564b8734606e0232c5bba3618eaa4e 100644
--- a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.csproj
+++ b/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="MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion=$(MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion)" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec b/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
index a3e099dee67e6b419085ba0949c18dda70f6ac29..65f6ddb98f6b66ecd5bad0a600c07b501a1a5ada 100644
--- a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
+++ b/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="$MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion$" include="all" />
</dependencies>
</metadata>
<files>
diff --git a/src/Components/WebAssembly/Build/src/ReferenceFromSource.props b/src/Components/WebAssembly/Build/src/ReferenceFromSource.props
index 863be5f143e2f748fc88bc34d0111ec9f67ffedb..afa2a5ada1877892d90b504fa55c590eb7947983 100644
--- a/src/Components/WebAssembly/Build/src/ReferenceFromSource.props
+++ b/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">
diff --git a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
index 9bb368d27deb009028d816625bf38c405d13e8e8..aa5fc890febebce43f23d8308d81962e6025d503 100644
--- a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
+++ b/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="PrepareBlazorOutputs"
DependsOnTargets="_ResolveBlazorInputs;_ResolveBlazorOutputs;_GenerateBlazorBootJson">
@@ -47,9 +31,9 @@
<ItemGroup>
<_WebAssemblyBCLFolder Include="
- $(DotNetWebAssemblyBCLPath);
- $(DotNetWebAssemblyBCLFacadesPath);
- $(DotNetWebAssemblyFrameworkPath)" />
+ $(ComponentsWebAssemblyBaseClassLibraryPath);
+ $(ComponentsWebAssemblyBaseClassLibraryFacadesPath);
+ $(ComponentsWebAssemblyFrameworkPath)" />
<_WebAssemblyBCLAssembly Include="%(_WebAssemblyBCLFolder.Identity)*.dll" />
</ItemGroup>
@@ -134,7 +118,7 @@
</ItemGroup>
<ItemGroup>
- <MonoWasmFile Include="$(DotNetWebAssemblyRuntimePath)*" />
+ <MonoWasmFile Include="$(ComponentsWebAssemblyRuntimePath)*" />
<BlazorJSFile Include="$(BlazorJSPath)" />
<BlazorJSFile Include="$(BlazorJSMapPath)" Condition="Exists('$(BlazorJSMapPath)')" />
@@ -254,7 +238,7 @@
</PropertyGroup>
<BlazorILLink
- ILLinkPath="$(MonoLinkerPath)"
+ ILLinkPath="$(ComponentsWebAssemblyLinkerPath)"
AssemblyPaths="@(_BlazorAssemblyToLink)"
RootAssemblyNames="@(_BlazorLinkerRoot)"
RootDescriptorFiles="@(BlazorLinkerDescriptor)"
diff --git a/src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj b/src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj
index d42c9753b654a581b7ed804059ec3c8e9f78ca8e..09c376442d05ef5bd33e126484cf423359dd547e 100644
--- a/src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj
+++ b/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" />
diff --git a/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj b/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj
index dd3d8a22744ea88cfa7510eb1d27d74153491981..a78073237ffa41932293d7db98ce17cfaa6378b5 100644
--- a/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj
+++ b/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>