Skip to content

Use Framework SourceType for WASM pass-through assets in multi-client solutions #125329

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
lewing merged 10 commits into from
Mar 25, 2026
Merged

Use Framework SourceType for WASM pass-through assets in multi-client solutions #125329

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c6e5b6
Use Framework SourceType for WASM pass-through assets in multi-client…
lewing Mar 8, 2026
91040a0
Merge branch 'main' into fix-wasm-framework-sourcetype
lewing Mar 14, 2026
2965259
Merge branch 'main' into fix-wasm-framework-sourcetype
lewing Mar 17, 2026
fa33973
Use ConvertDllsToWebcil PassThroughCandidates output and fix AssetMode
lewing Mar 17, 2026
69c5452
Temporarily bump the sdk for testing
lewing Mar 19, 2026
7f518a5
Merge branch 'main' into fix-wasm-framework-sourcetype
lewing Mar 22, 2026
2c63e09
Merge branch 'main' into fix-wasm-framework-sourcetype
lewing Mar 23, 2026
0d9edce
Fix PassThroughCandidates XML doc to match IsEnabled=false behavior
lewing Mar 23, 2026
d92ebd8
Fix IsEnabled=false PassThroughCandidates and materialized asset Copy…
lewing Mar 24, 2026
7847a96
Add multi-client hosted build test for Framework materialization
lewing Mar 24, 2026
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
43 changes: 43 additions & 0 deletions ...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,16 +360,28 @@ Copyright (c) .NET Foundation. All rights reserved.
<Output TaskParameter="FileWrites" ItemName="FileWrites" />
</ConvertDllsToWebcil>
Comment thread
lewing marked this conversation as resolved.

<!-- Separate pass-through files (JS, maps, ICU, native wasm, and when WebCil is disabled,
Comment thread
lewing marked this conversation as resolved.
Outdated
DLLs) from webcil-converted files. Pass-throughs still point to shared locations (e.g.
NuGet cache) and will be materialized per-project by UpdatePackageStaticWebAssets.
Webcil-converted files already live in per-project obj/webcil/ and are fine as-is. -->
<ItemGroup>
<_WasmFrameworkCandidates Include="@(_WebcilAssetsCandidates)"
Comment thread
lewing marked this conversation as resolved.
Outdated
Condition="!$([System.String]::new('%(Identity)').StartsWith($(_WasmBuildWebcilPath)))" />
<_WebcilAssetsCandidates Remove="@(_WasmFrameworkCandidates)" />
</ItemGroup>

<ItemGroup>
<!-- Set per-item ContentRoot so each asset's Identity matches its actual file on disk -->
<_WebcilAssetsCandidates Update="@(_WebcilAssetsCandidates)" ContentRoot="%(RootDir)%(Directory)" />
<_WasmFrameworkCandidates Update="@(_WasmFrameworkCandidates)" ContentRoot="%(RootDir)%(Directory)" />
<_WasmFingerprintPatterns Include="WasmFiles" Pattern="*.wasm" Expression="#[.{fingerprint}]!" />
<_WasmFingerprintPatterns Include="DllFiles" Pattern="*.dll" Expression="#[.{fingerprint}]!" />
<_WasmFingerprintPatterns Include="DatFiles" Pattern="*.dat" Expression="#[.{fingerprint}]!" />
<_WasmFingerprintPatterns Include="Pdb" Pattern="*.pdb" Expression="#[.{fingerprint}]!" />
<_WasmFingerprintPatterns Include="Symbols" Pattern="*.js.symbols" Expression="#[.{fingerprint}]!" />
</ItemGroup>

<!-- Webcil-converted assets are per-project (Computed) — no materialization needed. -->
<DefineStaticWebAssets
CandidateAssets="@(_WebcilAssetsCandidates)"
SourceId="$(PackageId)"
Expand All @@ -385,6 +397,37 @@ Copyright (c) .NET Foundation. All rights reserved.
<Output TaskParameter="Assets" ItemName="WasmStaticWebAsset" />
</DefineStaticWebAssets>

<!-- Pass-through files are Framework assets: they originate from the runtime pack but
need to be adopted by each consuming project. DefineStaticWebAssets registers them
with SourceType="Framework", then UpdatePackageStaticWebAssets materializes them to
a per-project obj/fx/{SourceId}/ directory, giving each project a unique Identity. -->
<DefineStaticWebAssets
CandidateAssets="@(_WasmFrameworkCandidates)"
SourceId="$(PackageId)"
SourceType="Framework"
AssetKind="Build"
AssetRole="Primary"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="Never"
FingerprintCandidates="$(_WasmFingerprintAssets)"
FingerprintPatterns="@(FingerprintPatterns);@(_WasmFingerprintPatterns)"
BasePath="$(StaticWebAssetBasePath)"
>
<Output TaskParameter="Assets" ItemName="_WasmFrameworkAssets" />
</DefineStaticWebAssets>

<!-- Let the SDK task handle materialization: copies to obj/fx/{SourceId}/, transforms
metadata (SourceType→Discovered, SourceId→PackageId, AssetMode→CurrentProject),
and remaps any existing endpoints to the new materialized paths. -->
Comment thread
lewing marked this conversation as resolved.
Outdated
<UpdatePackageStaticWebAssets
Assets="@(_WasmFrameworkAssets)"
IntermediateOutputPath="$(IntermediateOutputPath)"
ProjectPackageId="$(PackageId)"
ProjectBasePath="$(StaticWebAssetBasePath)"
>
<Output TaskParameter="UpdatedAssets" ItemName="WasmStaticWebAsset" />
</UpdatePackageStaticWebAssets>
Comment thread
lewing marked this conversation as resolved.

<DefineStaticWebAssets
CandidateAssets="@(_WasmDiscoveredFileCandidates)"
AssetTraitName="WasmResource"
Expand Down
Loading