diff --git a/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets b/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets index 30970d18aa4eb9..485860bf2f68ae 100644 --- a/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets +++ b/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets @@ -291,7 +291,9 @@ Copyright (c) .NET Foundation. All rights reserved. - + + <_WasmNativeAssetFileNames>;@(WasmNativeAsset->'%(FileName)%(Extension)');@(WasmAssembliesFinal->'%(FileName)%(Extension)'); <_WasmIntermediateAssemblyFileNames Condition="@(WasmAssembliesFinal->Count()) != 0">;@(IntermediateAssembly->'%(FileName)%(Extension)'); @@ -355,10 +357,69 @@ Copyright (c) .NET Foundation. All rights reserved. <_WasmBuildTmpWebcilPath>$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath), 'tmp-webcil')) - - + + + <_WasmDllBuildCandidates Include="@(_BuildAssetsCandidates)" Condition="'%(Extension)' == '.dll'" /> + <_WasmDllBuildCandidatesNonCulture Include="@(_WasmDllBuildCandidates)" Condition="'%(AssetTraitName)' != 'Culture'" /> + <_WasmDllBuildCandidatesCulture Include="@(_WasmDllBuildCandidates)" Condition="'%(AssetTraitName)' == 'Culture'" /> + <_WasmExpectedWebcilOutputs Include="@(_WasmDllBuildCandidatesNonCulture->'$(_WasmBuildWebcilPath)%(FileName).wasm')" /> + <_WasmExpectedWebcilOutputs Include="@(_WasmDllBuildCandidatesCulture->'$(_WasmBuildWebcilPath)%(AssetTraitValue)/%(FileName).wasm')" /> + + + + + + + + + + + + + + + <_WasmWebcilConvertedNonCulture Include="@(_WasmDllBuildCandidatesNonCulture->'$(_WasmBuildWebcilPath)%(FileName).wasm')"> + $([System.IO.Path]::ChangeExtension(%(RelativePath), '.wasm')) + $(_WasmBuildWebcilPath)%(FileName).wasm + + <_WasmWebcilConvertedCulture Include="@(_WasmDllBuildCandidatesCulture->'$(_WasmBuildWebcilPath)%(AssetTraitValue)/%(FileName).wasm')"> + $([System.IO.Path]::ChangeExtension(%(RelativePath), '.wasm')) + $(_WasmBuildWebcilPath)%(AssetTraitValue)/%(FileName).wasm + $([System.IO.Path]::ChangeExtension(%(RelatedAsset), '.wasm')) + + + + <_WebcilAssetsCandidates Include="@(_BuildAssetsCandidates)" Condition="'%(Extension)' != '.dll'" /> + <_WebcilAssetsCandidates Include="@(_WasmWebcilConvertedNonCulture)" /> + <_WebcilAssetsCandidates Include="@(_WasmWebcilConvertedCulture)" /> + + + + + + + + <_WebcilAssetsCandidates Include="@(_BuildAssetsCandidates)" /> + @@ -429,7 +490,9 @@ Copyright (c) .NET Foundation. All rights reserved. - + + <_WasmBuildBootJsonPath>$(IntermediateOutputPath)$(_WasmBootConfigFileName) <_WasmBuildApplicationEnvironmentName>$(WasmApplicationEnvironmentName) @@ -483,6 +546,15 @@ Copyright (c) .NET Foundation. All rights reserved. > + + + + + + + + <_WasmBuildBootConfigCandidate @@ -873,7 +950,8 @@ Copyright (c) .NET Foundation. All rights reserved. - + + <_WasmPublishApplicationEnvironmentName>$(WasmApplicationEnvironmentName) @@ -906,6 +984,14 @@ Copyright (c) .NET Foundation. All rights reserved. > + + + +