From fb718efeb217fc9f961bb2d4f33812f01dc9e8e6 Mon Sep 17 00:00:00 2001
From: Juan Sebastian Hoyos Ayala <juan@hoyosjs.com>
Date: Thu, 15 Sep 2022 10:55:49 -0700
Subject: [PATCH 1/3] Remove support for SOS win-arm .NET Framework hosting

---
 src/SOS/CMakeLists.txt             | 4 ++--
 src/SOS/Strike/CMakeLists.txt      | 4 ++--
 src/SOS/extensions/hostcoreclr.cpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SOS/CMakeLists.txt b/src/SOS/CMakeLists.txt
index 4d426880a7..ec58ca3239 100644
--- a/src/SOS/CMakeLists.txt
+++ b/src/SOS/CMakeLists.txt
@@ -13,9 +13,9 @@ if(CLR_CMAKE_HOST_WIN32)
   add_compile_options(/Zl) # omit default library name in .OBJ
 
   add_subdirectory(runcommand)
-  if(NOT CLR_CMAKE_TARGET_ARCH_ARM64)
+  if(NOT CLR_CMAKE_TARGET_ARCH_ARM64 AND NOT CLR_CMAKE_TARGET_ARCH_ARM)
     add_subdirectory(SOS.UnitTests/Debuggees/DesktopClrHost)
-  endif()
+  endif(NOT CLR_CMAKE_TARGET_ARCH_ARM64 AND NOT CLR_CMAKE_TARGET_ARCH_ARM)
 endif(CLR_CMAKE_HOST_WIN32)
 
 add_definitions(-D_SECURE_SCL=0)
diff --git a/src/SOS/Strike/CMakeLists.txt b/src/SOS/Strike/CMakeLists.txt
index e3a11abb5d..6299c27391 100644
--- a/src/SOS/Strike/CMakeLists.txt
+++ b/src/SOS/Strike/CMakeLists.txt
@@ -131,11 +131,11 @@ if(WIN32)
     ntdll.lib
   )
 
-  if(NOT CLR_CMAKE_HOST_ARCH_ARM64)
+  if(NOT CLR_CMAKE_HOST_ARCH_ARM64 AND NOT CLR_CMAKE_HOST_ARCH_ARM)
     list(APPEND 
       SOS_LIBRARY 
         mscoree.lib)
-  endif(NOT CLR_CMAKE_HOST_ARCH_ARM64)
+  endif(NOT CLR_CMAKE_HOST_ARCH_ARM64 AND NOT CLR_CMAKE_HOST_ARCH_ARM)
 
 else(WIN32)
   add_definitions(-DFEATURE_ENABLE_HARDWARE_EXCEPTIONS)
diff --git a/src/SOS/extensions/hostcoreclr.cpp b/src/SOS/extensions/hostcoreclr.cpp
index bd42a0b492..b03f1dafac 100644
--- a/src/SOS/extensions/hostcoreclr.cpp
+++ b/src/SOS/extensions/hostcoreclr.cpp
@@ -45,7 +45,7 @@
 #define DT_LNK 10
 #endif
 
-#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_)
+#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
 extern HRESULT InitializeDesktopClrHost();
 #endif
 
@@ -750,7 +750,7 @@ HRESULT InitializeHosting()
             return hr;
         }
     }
-#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_)
+#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
     hr = InitializeDesktopClrHost();
     if (SUCCEEDED(hr))
     {

From 720dc56e0fb82c99f9eed03e1de7df1e1ef5660d Mon Sep 17 00:00:00 2001
From: Juan Sebastian Hoyos Ayala <juan@hoyosjs.com>
Date: Thu, 15 Sep 2022 10:56:07 -0700
Subject: [PATCH 2/3] Revert "Roll to Windows 2019 image to fix arm cross build
 (#3376)"

This reverts commit d3a6215f659b6059fa2237427733aa6c3b04b807.
---
 eng/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/build.yml b/eng/build.yml
index 207ba6c48c..430636ea71 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -53,12 +53,12 @@ jobs:
       # Official Build Windows Pool
       ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}:
         name: NetCore1ESPool-Internal
-        demands: ImageOverride -equals Build.Windows.Amd64.VS2022
+        demands: ImageOverride -equals windows.vs2022.amd64
 
       # Public Windows Build Pool
       ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}:
         name: NetCore-Public
-        demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open
+        demands: ImageOverride -equals windows.vs2022.amd64.open
 
     ${{ if and(ne(parameters.dockerImage, ''), ne(parameters.requiresCapPtraceContainer, 'true')) }}:
       container: ${{ parameters.dockerImage }}

From cbaec6d94d936de9925d377804e739fbcbcd2319 Mon Sep 17 00:00:00 2001
From: Juan Sebastian Hoyos Ayala <juan@hoyosjs.com>
Date: Thu, 15 Sep 2022 12:08:52 -0700
Subject: [PATCH 3/3] PR Feedback

Co-authored-by: Mike McLaughlin <mikem@microsoft.com>
---
 src/SOS/extensions/CMakeLists.txt  | 4 ++--
 src/SOS/extensions/hostcoreclr.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SOS/extensions/CMakeLists.txt b/src/SOS/extensions/CMakeLists.txt
index 1ffba4df66..faff991739 100644
--- a/src/SOS/extensions/CMakeLists.txt
+++ b/src/SOS/extensions/CMakeLists.txt
@@ -15,11 +15,11 @@ set(SOURCES
     extensions.cpp
 )
 
-if(WIN32 AND NOT CLR_CMAKE_HOST_ARCH_ARM64)
+if(WIN32 AND NOT CLR_CMAKE_HOST_ARCH_ARM64 AND NOT CLR_CMAKE_HOST_ARCH_ARM)
     list(APPEND SOURCES
         hostdesktop.cpp
     )
-endif(WIN32 AND NOT CLR_CMAKE_HOST_ARCH_ARM64)
+endif(WIN32 AND NOT CLR_CMAKE_HOST_ARCH_ARM64 AND NOT CLR_CMAKE_HOST_ARCH_ARM)
 
 if(CLR_CMAKE_HOST_UNIX)
     add_definitions(-DHOST_UNIX)
diff --git a/src/SOS/extensions/hostcoreclr.cpp b/src/SOS/extensions/hostcoreclr.cpp
index b03f1dafac..2cfb5e0979 100644
--- a/src/SOS/extensions/hostcoreclr.cpp
+++ b/src/SOS/extensions/hostcoreclr.cpp
@@ -45,7 +45,7 @@
 #define DT_LNK 10
 #endif
 
-#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
+#if !defined(FEATURE_PAL) && !defined(HOST_ARM64) && !defined(HOST_ARM)
 extern HRESULT InitializeDesktopClrHost();
 #endif
 
@@ -750,7 +750,7 @@ HRESULT InitializeHosting()
             return hr;
         }
     }
-#if !defined(FEATURE_PAL) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
+#if !defined(FEATURE_PAL) && !defined(HOST_ARM64) && !defined(HOST_ARM)
     hr = InitializeDesktopClrHost();
     if (SUCCEEDED(hr))
     {