[release/9.0-staging][wasm] Workaround incorrect mono restore when bu…

…ilding WBT (#110590) * Workaround incorrect mono restore when building WBT * Rollback the workload sdk version
dotnet · Dec 20, 2024 · 8af4dec · 8af4dec
1 parent 4d2ecdc
commit 8af4dec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -262,7 +262,8 @@
     <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
     <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
     <!-- sdk version, for testing workloads -->
-    <SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
+    <!--<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>-->
+    <SdkVersionForWorkloadTesting>9.0.101</SdkVersionForWorkloadTesting>
     <runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
     <EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
     <NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

diff --git a/src/mono/wasi/Wasi.Build.Tests/Directory.Build.props b/src/mono/wasi/Wasi.Build.Tests/Directory.Build.props
@@ -20,5 +20,7 @@
     <RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishTrimmed>true</PublishTrimmed>
+    <!-- TODO: this is necessary to workaround restoring Mono desktop runtime packs, check whether this project really should be self-contained -->
+    <UseMonoRuntime>false</UseMonoRuntime>
   </PropertyGroup>
 </Project>
diff --git a/src/mono/wasm/Wasm.Build.Tests/Directory.Build.props b/src/mono/wasm/Wasm.Build.Tests/Directory.Build.props
@@ -19,5 +19,7 @@
   <PropertyGroup>
     <RuntimeIdentifier>$(OutputRID)</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
+    <!-- TODO: this is necessary to workaround restoring Mono desktop runtime packs, check whether this project really should be self-contained -->
+    <UseMonoRuntime>false</UseMonoRuntime>
   </PropertyGroup>
 </Project>