Skip to content

[Blazor] Avoid defining webassembly.js as a framework asset #59965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 22, 2025
Merged

[Blazor] Avoid defining webassembly.js as a framework asset #59965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c7ec32
[Blazor] Avoid defining webassembly.js as a framework asset
javiercn Jan 20, 2025
abd232a
[Infrastructure] Add binary log to local build
javiercn Jan 21, 2025
6abf378
Include Blazor assets only when building nodejs
javiercn Jan 21, 2025
d1dad38
Fix Helix
javiercn Jan 21, 2025
292b88c
Remove binary log flag
javiercn Jan 21, 2025
dd20321
Fix unclosed tag in Assets.targets file
javiercn Jan 21, 2025
30c9f80
Fix build
javiercn Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 16 additions & 41 deletions src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,21 @@

<Target Name="_AddBlazorFrameworkStaticWebAssets" Condition="'$(OutputType)' == 'Exe'">
<ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js" />
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js" />
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js">
<RelativePath>_framework/blazor.web.js</RelativePath>
</_FrameworkStaticWebAssetCandidate>
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js">
<RelativePath>_framework/blazor.server.js</RelativePath>
</_FrameworkStaticWebAssetCandidate>
</ItemGroup>

<ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(UseBlazorFrameworkDebugAssets)' == 'true'">
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js.map" />
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js.map" />
</ItemGroup>

<PropertyGroup>
<_IncludeAssetsInBlazorWebAssemblyProject Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' AND '$(StaticWebAssetProjectMode)' != 'Default'">true</_IncludeAssetsInBlazorWebAssemblyProject>
</PropertyGroup>

<ItemGroup Condition="'$(_IncludeAssetsInBlazorWebAssemblyProject)' == 'true'">
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.webassembly.js" />
</ItemGroup>

<ItemGroup Condition="'$(_IncludeAssetsInBlazorWebAssemblyProject)' == 'true' AND '$(UseBlazorFrameworkDebugAssets)' == 'true'">
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.webassembly.js.map" />
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js.map">
<RelativePath>_framework/blazor.web.js.map</RelativePath>
</_FrameworkStaticWebAssetCandidate>
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js.map">
<RelativePath>_framework/blazor.server.js.map</RelativePath>
</_FrameworkStaticWebAssetCandidate>
</ItemGroup>

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

<PropertyGroup>
<_FrameworkAssetsPath>$(IntermediateOutputPath)frameworkassets</_FrameworkAssetsPath>
</PropertyGroup>

<MakeDir
Directories="$(_FrameworkAssetsPath)"
Condition="!EXISTS('$(_FrameworkAssetsPath)')" />

<Copy
SourceFiles="@(_FrameworkStaticWebAssetCandidate)"
DestinationFolder="$(_FrameworkAssetsPath)"
SkipUnchangedFiles="true">
<Output TaskParameter="CopiedFiles" ItemName="_CopiedFrameworkStaticWebAssetCandidate" />
</Copy>

<ItemGroup>
<_CopiedFrameworkStaticWebAssetCandidate>
<RelativePath>_framework\%(FileName)%(Extension)</RelativePath>
<ContentRoot>$(_FrameworkAssetsPath)</ContentRoot>
</_CopiedFrameworkStaticWebAssetCandidate>
</ItemGroup>

<DefineStaticWebAssets
Condition="'@(_CopiedFrameworkStaticWebAssetCandidate->Count())' != '0'"
CandidateAssets="@(_CopiedFrameworkStaticWebAssetCandidate)"
Condition="'@(_FrameworkStaticWebAssetCandidate->Count())' != '0'"
CandidateAssets="@(_FrameworkStaticWebAssetCandidate)"
ContentRoot="$(BlazorFrameworkStaticWebAssetRoot)"
SourceId="$(PackageId)"
SourceType="Discovered"
AssetKind="All"
AssetMode="All"
AssetMode="CurrentProject"
AssetRole="Primary"
FingerprintCandidates="true"
BasePath="$(StaticWebAssetBasePath)">
Expand Down
8 changes: 8 additions & 0 deletions src/Components/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<Project>
<PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(BuildNodeJS)' != 'false'">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BuildNodeJs is `` in some cases, so this check needs to explicitly check against false

<BlazorWebAssemblyJSPath
Condition=" '$(Configuration)' == 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Debug\blazor.webassembly.js</BlazorWebAssemblyJSPath>
<BlazorWebAssemblyJSPath
Condition=" '$(Configuration)' != 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Release\blazor.webassembly.js</BlazorWebAssemblyJSPath>
<BlazorWebAssemblyJSMapPath>$(BlazorWebAssemblyJSPath).map</BlazorWebAssemblyJSMapPath>
</PropertyGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
</Project>
6 changes: 6 additions & 0 deletions ...Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,13 @@
<InternalsVisibleTo Include="BasicTestApp" />
</ItemGroup>

<PropertyGroup>
<BlazorWebAssemblyJSFile Condition=" '$(Configuration)' == 'Debug' ">..\..\..\Web.JS\dist\Debug\blazor.webassembly.js</BlazorWebAssemblyJSFile>
<BlazorWebAssemblyJSFile Condition=" '$(Configuration)' != 'Debug' ">..\..\..\Web.JS\dist\Release\blazor.webassembly.js</BlazorWebAssemblyJSFile>
</PropertyGroup>

<ItemGroup>
<Content Include="$(BlazorWebAssemblyJSFile)" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" LinkBase="build\$(DefaultNetCoreTargetFramework)\" />
<Content Include="targets\*.props" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions ...nts/WebAssembly/WebAssembly/src/targets/Microsoft.AspNetCore.Components.WebAssembly.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project>
<PropertyGroup>
<BlazorWebAssemblyJSPath>$(MSBuildThisFileDirectory)blazor.webassembly.js</BlazorWebAssemblyJSPath>
<BlazorRoutingEnableRegexConstraint Condition="'$(BlazorRoutingEnableRegexConstraint)' == ''">false</BlazorRoutingEnableRegexConstraint>
</PropertyGroup>

Expand Down
Loading