Skip to content

Commit 7eca15c

Browse files
authored
[wasm] Always update SDK pack version from workload to current for down level TFM (#51269)
1 parent d423278 commit 7eca15c

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@
9191
<UsingBlazorAOTWorkloadManifest>true</UsingBlazorAOTWorkloadManifest>
9292
</PropertyGroup>
9393

94+
<ItemGroup>
95+
<KnownWebAssemblySdkPack Update="@(KnownWebAssemblySdkPack)">
96+
<WebAssemblySdkPackVersion>$(_RuntimePackInWorkloadVersionCurrent)</WebAssemblySdkPackVersion>
97+
</KnownWebAssemblySdkPack>
98+
</ItemGroup>
99+
94100
<!-- Support for "browser" target platform identifier -->
95101
<PropertyGroup Condition="'$(TargetPlatformIdentifier)' == 'browser' and $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '8.0'))">
96102
<TargetPlatformSupported>true</TargetPlatformSupported>
@@ -220,7 +226,6 @@
220226

221227
<PropertyGroup Condition="'$(TargetsCurrent)' == 'true' and '$(_MonoWorkloadTargetsMobile)' == 'true'">
222228
<_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersionCurrent)</_MonoWorkloadRuntimePackPackageVersion>
223-
<_KnownWebAssemblySdkPackVersion>$(_RuntimePackInWorkloadVersionCurrent)</_KnownWebAssemblySdkPackVersion>
224229
</PropertyGroup>
225230

226231
<ItemGroup Condition="'$(TargetsCurrent)' == 'true' and '$(_MonoWorkloadTargetsMobile)' == 'true'">
@@ -235,10 +240,6 @@
235240
<KnownFrameworkReference Update="Microsoft.NETCore.App">
236241
<TargetingPackVersion Condition="'%(KnownFrameworkReference.TargetFramework)' == '${NetVersion}.0'">$(_MonoWorkloadRuntimePackPackageVersion)</TargetingPackVersion>
237242
</KnownFrameworkReference>
238-
<KnownWebAssemblySdkPack Update="@(KnownWebAssemblySdkPack)">
239-
<WebAssemblySdkPackVersion Condition="'%(KnownWebAssemblySdkPack.TargetFramework)' == '${NetVersion}.0'">$(_KnownWebAssemblySdkPackVersion)</WebAssemblySdkPackVersion>
240-
</KnownWebAssemblySdkPack>
241243
</ItemGroup>
242244

243-
244245
</Project>

src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.targets.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272

7373
<PropertyGroup Condition="'$(TargetsNet9)' == 'true' and '$(_MonoWorkloadTargetsMobile)' == 'true'">
7474
<_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion9)</_MonoWorkloadRuntimePackPackageVersion>
75-
<_KnownWebAssemblySdkPackVersion>$(_RuntimePackInWorkloadVersion9)</_KnownWebAssemblySdkPackVersion>
7675
</PropertyGroup>
7776

7877
<ItemGroup Condition="'$(TargetsNet9)' == 'true' and '$(_MonoWorkloadTargetsMobile)' == 'true'">
@@ -87,9 +86,6 @@
8786
<KnownFrameworkReference Update="Microsoft.NETCore.App">
8887
<TargetingPackVersion Condition="'%(KnownFrameworkReference.TargetFramework)' == 'net9.0'">$(_MonoWorkloadRuntimePackPackageVersion)</TargetingPackVersion>
8988
</KnownFrameworkReference>
90-
<KnownWebAssemblySdkPack Update="@(KnownWebAssemblySdkPack)">
91-
<WebAssemblySdkPackVersion Condition="'%(KnownWebAssemblySdkPack.TargetFramework)' == 'net9.0'">$(_KnownWebAssemblySdkPackVersion)</WebAssemblySdkPackVersion>
92-
</KnownWebAssemblySdkPack>
9389
</ItemGroup>
9490

9591

0 commit comments

Comments
 (0)