From 9f969d4b121afbfdb80ee45205dbb7a9add30532 Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Fri, 11 Mar 2022 15:23:49 -0500
Subject: [PATCH 1/2] [mono][wasm] Bump emscripten to 3.1.4.

---
 eng/pipelines/common/platform-matrix.yml       | 2 +-
 eng/pipelines/libraries/helix-queues-setup.yml | 2 +-
 src/mono/wasm/emscripten-version.txt           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index 22fa0be43584d6..a31f595580cf57 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -303,7 +303,7 @@ jobs:
       targetRid: browser-wasm
       platform: Browser_wasm
       container:
-        image: ubuntu-18.04-webassembly-20210707133424-12f133e
+        image: ubuntu-18.04-webassembly-20220118141522-180197c
         registry: mcr
       jobParameters:
         hostedOs: Linux
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index ef1cdc9ebab0da..c532f1ab891890 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -182,6 +182,6 @@ jobs:
 
     # WebAssembly windows
     - ${{ if eq(parameters.platform, 'Browser_wasm_win') }}:
-      - (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h2.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210702131541-6837048
+      - (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h2.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly-20220118164817-dc6e6f1
 
     ${{ insert }}: ${{ parameters.jobParameters }}
diff --git a/src/mono/wasm/emscripten-version.txt b/src/mono/wasm/emscripten-version.txt
index 8fe1046e01fc8e..0aec50e6ede78c 100644
--- a/src/mono/wasm/emscripten-version.txt
+++ b/src/mono/wasm/emscripten-version.txt
@@ -1 +1 @@
-2.0.23
\ No newline at end of file
+3.1.4

From c64e1d141bc40178aa73f5df99210824784cf2d3 Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Sat, 12 Mar 2022 18:54:32 -0500
Subject: [PATCH 2/2] Fix.

---
 src/mono/wasm/build/WasmApp.Native.targets | 5 +++--
 src/mono/wasm/build/WasmApp.targets        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 5fb4c12e36fba1..67b3d53f63b65d 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -367,12 +367,13 @@
   </Target>
 
   <Target Name="_WasmWriteRspFilesForLinking">
-	<PropertyGroup>
+    <PropertyGroup>
       <_WasmEHLib Condition="'$(WasmExceptionHandling)' == 'true'">libmono-wasm-eh-wasm.a</_WasmEHLib>
       <_WasmEHLib Condition="'$(WasmExceptionHandling)' != 'true'">libmono-wasm-eh-js.a</_WasmEHLib>
       <_WasmEHLibToExclude Condition="'$(WasmExceptionHandling)' == 'true'">libmono-wasm-eh-js.a</_WasmEHLibToExclude>
       <_WasmEHLibToExclude Condition="'$(WasmExceptionHandling)' != 'true'">libmono-wasm-eh-wasm.a</_WasmEHLibToExclude>
-	</PropertyGroup>
+    </PropertyGroup>
+
     <ItemGroup>
       <!-- order matters -->
       <_WasmNativeFileForLinking Include="%(_BitcodeFile.ObjectFile)" />
diff --git a/src/mono/wasm/build/WasmApp.targets b/src/mono/wasm/build/WasmApp.targets
index 070195319d6b53..93b0745a5268df 100644
--- a/src/mono/wasm/build/WasmApp.targets
+++ b/src/mono/wasm/build/WasmApp.targets
@@ -85,7 +85,7 @@
 
   <PropertyGroup>
     <WasmDedup Condition="'$(WasmDedup)' == ''">false</WasmDedup>
-    <WasmExceptionHandling Condition="'$(WasmExceptionHandling)' == ''">false</WasmExceptionHandling>
+    <WasmExceptionHandling Condition="'$(WasmExceptionHandling)' == ''">true</WasmExceptionHandling>
 
     <!--<WasmStripAOTAssemblies Condition="'$(AOTMode)' == 'LLVMOnlyInterp'">false</WasmStripAOTAssemblies>-->
     <!--<WasmStripAOTAssemblies Condition="'$(WasmStripAOTAssemblies)' == ''">$(RunAOTCompilation)</WasmStripAOTAssemblies>-->