From ae5cbcee84961c5e73bfc0a9766150445ef36b8e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 18:06:53 +0200
Subject: [PATCH] fix: Restore nosimd builds for edge enhanced security and
 safari (#2612) (#2618)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 953c5700a91c8743505fd24c8f27528f87a9e057)

Co-authored-by: Jérôme Laban <jerome.laban@nventive.com>
---
 native/wasm/build.cake             |  2 +-
 scripts/azure-templates-stages.yml | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/native/wasm/build.cake b/native/wasm/build.cake
index 37d63a2cc6..b49db0ae2e 100644
--- a/native/wasm/build.cake
+++ b/native/wasm/build.cake
@@ -116,7 +116,7 @@ Task("libHarfBuzzSharp")
     .WithCriteria(IsRunningOnLinux())
     .Does(() =>
 {
-    bool hasSimdEnabled = EMSCRIPTEN_FEATURES.Contains("simd") || EMSCRIPTEN_FEATURES.Contains("_simd");;
+    bool hasSimdEnabled = EMSCRIPTEN_FEATURES.Contains("simd") || EMSCRIPTEN_FEATURES.Contains("_simd");
     bool hasThreadingEnabled = EMSCRIPTEN_FEATURES.Contains("mt");
     bool hasWasmEH = EMSCRIPTEN_FEATURES.Contains("_wasmeh");
 
diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml
index 99590f16c4..f227576317 100644
--- a/scripts/azure-templates-stages.yml
+++ b/scripts/azure-templates-stages.yml
@@ -401,15 +401,23 @@ stages:
                 version: 3.1.12
                 features: mt,simd
 
-              # .NET 8 Preview 4
+              # .NET 8
               - 3.1.34:
                 displayName: 3.1.34
                 version: 3.1.34
-                features: _wasmeh,_simd,st
+                features: _wasmeh,st
               - 3.1.34:
                 displayName: '3.1.34_Threading'
                 version: 3.1.34
-                features: _wasmeh,_simd,mt
+                features: _wasmeh,mt
+              - 3.1.34:
+                displayName: '3.1.34_SIMD'
+                version: 3.1.34
+                features: _wasmeh,simd,st
+              - 3.1.34:
+                displayName: '3.1.34_SIMD_Threading'
+                version: 3.1.34
+                features: _wasmeh,simd,mt
 
   - ${{ if ne(parameters.buildPipelineType, 'tests') }}:
     - stage: managed