Skip to content

Commit 8af4dec

Browse files
authored
[release/9.0-staging][wasm] Workaround incorrect mono restore when building WBT (#110590)
* Workaround incorrect mono restore when building WBT * Rollback the workload sdk version
1 parent 4d2ecdc commit 8af4dec

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

eng/Versions.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@
262262
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
263263
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
264264
<!-- sdk version, for testing workloads -->
265-
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
265+
<!--<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>-->
266+
<SdkVersionForWorkloadTesting>9.0.101</SdkVersionForWorkloadTesting>
266267
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
267268
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
268269
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

src/mono/wasi/Wasi.Build.Tests/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@
2020
<RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
2121
<SelfContained>true</SelfContained>
2222
<PublishTrimmed>true</PublishTrimmed>
23+
<!-- TODO: this is necessary to workaround restoring Mono desktop runtime packs, check whether this project really should be self-contained -->
24+
<UseMonoRuntime>false</UseMonoRuntime>
2325
</PropertyGroup>
2426
</Project>

src/mono/wasm/Wasm.Build.Tests/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@
1919
<PropertyGroup>
2020
<RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
2121
<SelfContained>true</SelfContained>
22+
<!-- TODO: this is necessary to workaround restoring Mono desktop runtime packs, check whether this project really should be self-contained -->
23+
<UseMonoRuntime>false</UseMonoRuntime>
2224
</PropertyGroup>
2325
</Project>

0 commit comments

Comments
 (0)