Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[release/9.0] [wasi] Disable build in .NET 9 #108877

Merged
merged 6 commits into from
Jan 21, 2025
Merged

[release/9.0] [wasi] Disable build in .NET 9 #108877

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ddf9d4
Disable wasi build
maraf Oct 15, 2024
c8ac217
Disable wasi build tests
maraf Oct 15, 2024
ae90729
Remove wasi lines
maraf Oct 15, 2024
568fa63
Update src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.M…
maraf Oct 17, 2024
60c2076
Merge branch 'release/9.0-staging' into maraf/WasiDisableBuild
maraf Nov 5, 2024
5a0a1b1
Merge branch 'release/9.0-staging' into maraf/WasiDisableBuild
maraf Jan 20, 2025
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
38 changes: 19 additions & 19 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,25 +926,25 @@ extends:

# WASI/WASM

- template: /eng/pipelines/common/templates/wasm-library-tests.yml
parameters:
platforms:
- wasi_wasm
- wasi_wasm_win
nameSuffix: '_Smoke'
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
shouldRunSmokeOnly: true
alwaysRun: ${{ variables.isRollingBuild }}
scenarios:
- WasmTestOnWasmtime

- template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
parameters:
platforms:
- wasi_wasm
- wasi_wasm_win
extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
alwaysRun: ${{ variables.isRollingBuild }}
# - template: /eng/pipelines/common/templates/wasm-library-tests.yml
# parameters:
# platforms:
# - wasi_wasm
# - wasi_wasm_win
# nameSuffix: '_Smoke'
# extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
# shouldRunSmokeOnly: true
# alwaysRun: ${{ variables.isRollingBuild }}
# scenarios:
# - WasmTestOnWasmtime

# - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml
# parameters:
# platforms:
# - wasi_wasm
# - wasi_wasm_win
# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
# alwaysRun: ${{ variables.isRollingBuild }}

#
# Android devices
Expand Down
7 changes: 0 additions & 7 deletions eng/testing/scenarios/BuildWasiAppsJobsList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +0,0 @@
Wasi.Build.Tests.InvariantTests
Wasi.Build.Tests.ILStripTests
Wasi.Build.Tests.SdkMissingTests
Wasi.Build.Tests.RuntimeConfigTests
Wasi.Build.Tests.WasiTemplateTests
Wasi.Build.Tests.PInvokeTableGeneratorTests
Wasi.Build.Tests.WasiLibraryModeTests
4 changes: 4 additions & 0 deletions ...t/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.Wasi.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<UsingWasiRuntimeWorkload Condition="'$(UsingWasiRuntimeWorkload)' == ''">$(WasiNativeWorkloadAvailable)</UsingWasiRuntimeWorkload>
</PropertyGroup>

<Target Name="FailBuild" BeforeTargets="ProcessFrameworkReferences;Restore;Build;Publish" Condition="'$(RuntimeIdentifier)' == 'wasi-wasm'">
<Error Text="The 'wasi-experimental' workload is not supported in .NET 9. Please downgrade to .NET 9 Preview 6 SDK or use .NET 10 SDK" />
</Target>
</Project>
Loading