From 50300fb15db574717900c62d4db8a550c9ff7085 Mon Sep 17 00:00:00 2001
From: Smit Patel <smitpatel@users.noreply.github.com>
Date: Wed, 29 Jun 2022 13:33:08 -0700
Subject: [PATCH] Workaround for Sqlite/InMemory test failures on OSX (#28328)

---
 azure-pipelines.yml | 2 ++
 eng/helix.proj      | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5acdd6d8b81..eb8243d74f8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -132,6 +132,7 @@ stages:
               - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
                 env:
                   Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
+                  COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
                 name: Build
               - task: PublishBuildArtifacts@1
                 displayName: Upload TestResults
@@ -238,6 +239,7 @@ stages:
                   HelixAccessToken: $(_HelixAccessToken)
                   SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
                   MSSQL_SA_PASSWORD: "Password12!"
+                  COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml
diff --git a/eng/helix.proj b/eng/helix.proj
index 68d80d146d5..9bf9b4053aa 100644
--- a/eng/helix.proj
+++ b/eng/helix.proj
@@ -37,6 +37,13 @@
     </XUnitProject>
   </ItemGroup>
 
+  <!-- Work-around for https://github.com/dotnet/runtime/issues/70758 -->
+  <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
+    <XUnitProject Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj">
+      <PreCommands>$(PreCommands); export COMPlus_EnableWriteXorExecute=0</PreCommands>
+    </XUnitProject>
+  </ItemGroup>
+
   <!-- Start SqlServer instance for test projects which uses SqlServer on docker. Also remove other projects as they will be run outside of docker. -->
   <ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-18.04-helix-sqlserver-amd64`))'">
     <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>