diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6e4ca20cc5222..2afbfac3563bd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,6 +12,10 @@
https://github.com/dotnet/wcf
7f504aabb1988e9a093c1e74d8040bd52feb2f01
+
+ https://github.com/dotnet/emsdk
+ eabee1e79eec67b4459f20ca6b56deee60c8b45b
+
https://github.com/dotnet/llvm-project
4db411bed3b4f48dfb4ed59629a0dc1d23e724e6
diff --git a/eng/Versions.props b/eng/Versions.props
index eb6e8b731041a..b296c37904948 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -232,6 +232,7 @@
-->
9.0.0-alpha.1.23564.1
$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)
+ 9.0.0-alpha.1.23565.1
1.1.87-gba258badda
1.0.0-v3.14.0.5722
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index 1ea372410ec5f..427e8ec5ea407 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -407,6 +407,7 @@ extends:
platforms:
- android_x64
- browser_wasm
+ - wasi_wasm
- tvos_arm64
- ios_arm64
- maccatalyst_x64
@@ -428,15 +429,17 @@ extends:
- linux_musl_arm64
jobParameters:
buildArgs: -s mono+packs -c $(_BuildConfig)
- /p:MonoCrossAOTTargetOS=android+browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
+ /p:MonoCrossAOTTargetOS=android+browser+wasi /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
nameSuffix: CrossAOT_Mono
runtimeVariant: crossaot
dependsOn:
- mono_android_offsets
- mono_browser_offsets
+ - mono_wasi_offsets
monoCrossAOTTargetOS:
- android
- browser
+ - wasi
isOfficialBuild: ${{ variables.isOfficialBuild }}
postBuildSteps:
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
@@ -453,15 +456,17 @@ extends:
- windows_x64
jobParameters:
buildArgs: -s mono+packs -c $(_BuildConfig)
- /p:MonoCrossAOTTargetOS=android+browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
+ /p:MonoCrossAOTTargetOS=android+browser+wasi /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
nameSuffix: CrossAOT_Mono
runtimeVariant: crossaot
dependsOn:
- mono_android_offsets
- mono_browser_offsets
+ - mono_wasi_offsets
monoCrossAOTTargetOS:
- android
- browser
+ - wasi
isOfficialBuild: ${{ variables.isOfficialBuild }}
postBuildSteps:
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
@@ -478,18 +483,20 @@ extends:
- osx_arm64
jobParameters:
buildArgs: -s mono+packs -c $(_BuildConfig)
- /p:MonoCrossAOTTargetOS=android+browser+tvos+ios+maccatalyst /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
+ /p:MonoCrossAOTTargetOS=android+browser+wasi+tvos+ios+maccatalyst /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
nameSuffix: CrossAOT_Mono
runtimeVariant: crossaot
dependsOn:
- mono_android_offsets
- mono_browser_offsets
+ - mono_wasi_offsets
- mono_tvos_offsets
- mono_ios_offsets
- mono_maccatalyst_offsets
monoCrossAOTTargetOS:
- android
- browser
+ - wasi
- tvos
- ios
- maccatalyst
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 21568cd53c8ab..206b51f1f02ee 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -441,6 +441,7 @@ extends:
platforms:
- android_x64
- browser_wasm
+ - wasi_wasm
- tvos_arm64
- ios_arm64
- maccatalyst_x64
@@ -930,9 +931,11 @@ extends:
dependsOn:
- mono_android_offsets
- mono_browser_offsets
+ - mono_wasi_offsets
monoCrossAOTTargetOS:
- android
- browser
+ - wasi
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
@@ -952,12 +955,14 @@ extends:
dependsOn:
- mono_android_offsets
- mono_browser_offsets
+ - mono_wasi_offsets
- mono_tvos_offsets
- mono_ios_offsets
- mono_maccatalyst_offsets
monoCrossAOTTargetOS:
- android
- browser
+ - wasi
- tvos
- ios
- maccatalyst
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj
index a5bd806e21ec6..08da76561f220 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj
@@ -7,6 +7,7 @@
$(MonoAotTargets);tvossimulator-x64;tvossimulator-arm64;tvos-arm64
$(MonoAotTargets);iossimulator-x64;iossimulator-arm64;ios-arm64
$(MonoAotTargets);maccatalyst-x64;maccatalyst-arm64
+ $(MonoAotTargets);wasi-wasm
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index c9d324467f0dc..5bb0e3c883817 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -41,7 +41,7 @@
true
true
true
- true
+ true
$([MSBuild]::NormalizeDirectory('$(MonoObjDir)', 'cross'))
$([MSBuild]::NormalizePath('$(MonoObjCrossDir)', 'config.h'))
true
@@ -85,8 +85,21 @@
+
+
+
+ $([MSBuild]::NormalizePath('$(PkgMicrosoft_NET_Runtime_Emscripten_3_1_34_Python_win-x64)', 'tools', 'python'))
+
+
<_MonoCMakeArgs Include="-DENABLE_WERROR=1"/>
@@ -815,8 +828,8 @@
-
-
+
+