diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 5877027dfd..1a5b5d456c 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -118,7 +118,7 @@ and are generated based on the last package release. - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aac035cf46..9349a0cde3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,7 +9,7 @@ --> - + https://github.com/dotnet/blazor 63c3aa1e27e3a34cb78e8bce381af6d24198c104 diff --git a/eng/Versions.props b/eng/Versions.props index fd967b7c4f..4dd2de8c13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 3.1.0 - 3.2.0-preview1.20113.1 + 3.2.0-preview1.20113.1 3.1.2-servicing.20067.6 3.1.2-servicing.20067.6 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 c673a7827f..db897c6261 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 @@ - - - + 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 a3e099dee6..fdd4c53649 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 @@ $CommonMetadataElements$ - + diff --git a/src/Components/WebAssembly/Build/src/ReferenceFromSource.props b/src/Components/WebAssembly/Build/src/ReferenceFromSource.props index 863be5f143..afa2a5ada1 100644 --- a/src/Components/WebAssembly/Build/src/ReferenceFromSource.props +++ b/src/Components/WebAssembly/Build/src/ReferenceFromSource.props @@ -17,7 +17,7 @@ - + diff --git a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets index a2914519bb..579a94d53d 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 @@ true - - - $(MonoBaseClassLibraryPath) - $(MonoBaseClassLibraryFacadesPath) - $(MonoWasmRuntimePath) - $(MonoWasmFrameworkPath) - - - - - $(DotNetWebAssemblyArtifactsRoot)\wasm-bcl\wasm\ - $(DotNetWebAssemblyBCLPath)\Facades\ - $(DotNetWebAssemblyArtifactsRoot)\builds\debug\ - $(DotNetWebAssemblyArtifactsRoot)\framework\ - - <_WebAssemblyBCLFolder Include=" - $(DotNetWebAssemblyBCLPath); - $(DotNetWebAssemblyBCLFacadesPath); - $(DotNetWebAssemblyFrameworkPath)" /> + $(ComponentsWebAssemblyBaseClassLibraryPath); + $(ComponentsWebAssemblyBaseClassLibraryFacadesPath); + $(ComponentsWebAssemblyFrameworkPath)" /> <_WebAssemblyBCLAssembly Include="%(_WebAssemblyBCLFolder.Identity)*.dll" /> @@ -131,7 +115,7 @@ true $(BlazorRuntimeBinOutputPath)%(FileName)%(Extension) %(FileName)%(Extension) - + - <_BclDirectory Include="$(MonoBaseClassLibraryPath)" /> - <_BclDirectory Include="$(MonoBaseClassLibraryFacadesPath)" /> - <_BclDirectory Include="$(MonoWasmFrameworkPath)" /> + <_BclDirectory Include="$(ComponentsWebAssemblyBaseClassLibraryPath)" /> + <_BclDirectory Include="$(ComponentsWebAssemblyBaseClassLibraryFacadesPath)" /> + <_BclDirectory Include="$(ComponentsWebAssemblyFrameworkPath)" /> diff --git a/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj b/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj index 1b13eb3d53..66e37f151a 100644 --- a/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj +++ b/src/Components/WebAssembly/Build/testassets/standalone/standalone.csproj @@ -10,7 +10,7 @@ - +