Skip to content
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.

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

Fix source build when using --no-build-js #59118

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<_BlazorJSContentRoot Condition="'$(Configuration)' == 'Release'">$(RepoRoot)src\Components\Web.JS\dist\Release</_BlazorJSContentRoot>
</PropertyGroup>

<ItemGroup>
<ItemGroup Condition="'$(BuildNodeJS)' == 'true'">
<_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.web.js" />
<_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.server.js" />
<_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.webassembly.js" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,22 @@
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.webassembly.js.map" />
</ItemGroup>

<ItemGroup>
<_MissingFrameworkStaticWebAssetCandidate
Include="@(_FrameworkStaticWebAssetCandidate)"
Condition="!EXISTS('%(Identity)')" />
<_FrameworkStaticWebAssetCandidate Remove="@(_MissingFrameworkStaticWebAssetCandidate)" />
</ItemGroup>

<Message Importance="High" 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)')" />
Condition="!EXISTS('$(_FrameworkAssetsPath)')" />

<Copy
SourceFiles="@(_FrameworkStaticWebAssetCandidate)"
Expand Down
4 changes: 3 additions & 1 deletion src/Components/Web.JS/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
node_modules/
dist/
dist/Debug/
dist/Release/*
!dist/Release/blazor.webview.js
2 changes: 2 additions & 0 deletions src/Components/Web.JS/dist/Release/blazor.webview.js

Large diffs are not rendered by default.

Loading