Skip to content

Commit 785437f

Browse files
javiercnjaviercn
authored
[Blazor] Avoid defining webassembly.js as a framework asset (#59965)
1 parent 4adfd0e commit 785437f

File tree

4 files changed

+31
-41
lines changed

4 files changed

+31
-41
lines changed

Diff for: ‎src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets

+16-41
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,21 @@
1212

1313
<Target Name="_AddBlazorFrameworkStaticWebAssets" Condition="'$(OutputType)' == 'Exe'">
1414
<ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">
15-
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js" />
16-
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js" />
15+
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js">
16+
<RelativePath>_framework/blazor.web.js</RelativePath>
17+
</_FrameworkStaticWebAssetCandidate>
18+
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js">
19+
<RelativePath>_framework/blazor.server.js</RelativePath>
20+
</_FrameworkStaticWebAssetCandidate>
1721
</ItemGroup>
1822

1923
<ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(UseBlazorFrameworkDebugAssets)' == 'true'">
20-
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js.map" />
21-
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js.map" />
22-
</ItemGroup>
23-
24-
<PropertyGroup>
25-
<_IncludeAssetsInBlazorWebAssemblyProject Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' AND '$(StaticWebAssetProjectMode)' != 'Default'">true</_IncludeAssetsInBlazorWebAssemblyProject>
26-
</PropertyGroup>
27-
28-
<ItemGroup Condition="'$(_IncludeAssetsInBlazorWebAssemblyProject)' == 'true'">
29-
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.webassembly.js" />
30-
</ItemGroup>
31-
32-
<ItemGroup Condition="'$(_IncludeAssetsInBlazorWebAssemblyProject)' == 'true' AND '$(UseBlazorFrameworkDebugAssets)' == 'true'">
33-
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.webassembly.js.map" />
24+
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js.map">
25+
<RelativePath>_framework/blazor.web.js.map</RelativePath>
26+
</_FrameworkStaticWebAssetCandidate>
27+
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js.map">
28+
<RelativePath>_framework/blazor.server.js.map</RelativePath>
29+
</_FrameworkStaticWebAssetCandidate>
3430
</ItemGroup>
3531

3632
<ItemGroup>
@@ -45,35 +41,14 @@
4541
Condition="'@(_MissingFrameworkStaticWebAssetCandidate->Count())' != '0'"
4642
Text="Framework asset '%(_MissingFrameworkStaticWebAssetCandidate.Identity)' could not be found and won't be included in the project." />
4743

48-
<PropertyGroup>
49-
<_FrameworkAssetsPath>$(IntermediateOutputPath)frameworkassets</_FrameworkAssetsPath>
50-
</PropertyGroup>
51-
52-
<MakeDir
53-
Directories="$(_FrameworkAssetsPath)"
54-
Condition="!EXISTS('$(_FrameworkAssetsPath)')" />
55-
56-
<Copy
57-
SourceFiles="@(_FrameworkStaticWebAssetCandidate)"
58-
DestinationFolder="$(_FrameworkAssetsPath)"
59-
SkipUnchangedFiles="true">
60-
<Output TaskParameter="CopiedFiles" ItemName="_CopiedFrameworkStaticWebAssetCandidate" />
61-
</Copy>
62-
63-
<ItemGroup>
64-
<_CopiedFrameworkStaticWebAssetCandidate>
65-
<RelativePath>_framework\%(FileName)%(Extension)</RelativePath>
66-
<ContentRoot>$(_FrameworkAssetsPath)</ContentRoot>
67-
</_CopiedFrameworkStaticWebAssetCandidate>
68-
</ItemGroup>
69-
7044
<DefineStaticWebAssets
71-
Condition="'@(_CopiedFrameworkStaticWebAssetCandidate->Count())' != '0'"
72-
CandidateAssets="@(_CopiedFrameworkStaticWebAssetCandidate)"
45+
Condition="'@(_FrameworkStaticWebAssetCandidate->Count())' != '0'"
46+
CandidateAssets="@(_FrameworkStaticWebAssetCandidate)"
47+
ContentRoot="$(BlazorFrameworkStaticWebAssetRoot)"
7348
SourceId="$(PackageId)"
7449
SourceType="Discovered"
7550
AssetKind="All"
76-
AssetMode="All"
51+
AssetMode="CurrentProject"
7752
AssetRole="Primary"
7853
FingerprintCandidates="true"
7954
BasePath="$(StaticWebAssetBasePath)">

Diff for: ‎src/Components/Directory.Build.targets

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
<Project>
2+
<PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(BuildNodeJS)' != 'false'">
3+
<BlazorWebAssemblyJSPath
4+
Condition=" '$(Configuration)' == 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Debug\blazor.webassembly.js</BlazorWebAssemblyJSPath>
5+
<BlazorWebAssemblyJSPath
6+
Condition=" '$(Configuration)' != 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Release\blazor.webassembly.js</BlazorWebAssemblyJSPath>
7+
<BlazorWebAssemblyJSMapPath>$(BlazorWebAssemblyJSPath).map</BlazorWebAssemblyJSMapPath>
8+
</PropertyGroup>
9+
210
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
311
</Project>

Diff for: ‎src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@
5252
<InternalsVisibleTo Include="BasicTestApp" />
5353
</ItemGroup>
5454

55+
<PropertyGroup>
56+
<BlazorWebAssemblyJSFile Condition=" '$(Configuration)' == 'Debug' ">..\..\..\Web.JS\dist\Debug\blazor.webassembly.js</BlazorWebAssemblyJSFile>
57+
<BlazorWebAssemblyJSFile Condition=" '$(Configuration)' != 'Debug' ">..\..\..\Web.JS\dist\Release\blazor.webassembly.js</BlazorWebAssemblyJSFile>
58+
</PropertyGroup>
59+
5560
<ItemGroup>
61+
<Content Include="$(BlazorWebAssemblyJSFile)" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" LinkBase="build\$(DefaultNetCoreTargetFramework)\" />
5662
<Content Include="targets\*.props" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" />
5763
</ItemGroup>
5864

Diff for: ‎src/Components/WebAssembly/WebAssembly/src/targets/Microsoft.AspNetCore.Components.WebAssembly.props

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<PropertyGroup>
3+
<BlazorWebAssemblyJSPath>$(MSBuildThisFileDirectory)blazor.webassembly.js</BlazorWebAssemblyJSPath>
34
<BlazorRoutingEnableRegexConstraint Condition="'$(BlazorRoutingEnableRegexConstraint)' == ''">false</BlazorRoutingEnableRegexConstraint>
45
</PropertyGroup>
56

0 commit comments

Comments
 (0)