From 270d74a32435d10714a4d0a8345a8819425cb59d Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Thu, 22 Dec 2022 00:43:34 -0800
Subject: [PATCH 1/2] bump required vs version

---
 Source/PCH/pch.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h
index b935c1528b..852baa397c 100644
--- a/Source/PCH/pch.h
+++ b/Source/PCH/pch.h
@@ -6,7 +6,7 @@
 #define STRINGIFY_HELPER(x) #x
 #define STRINGIFY(x) STRINGIFY_HELPER(x)
 
-#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193231329
+#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193431937
 #pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER))
 #error Please update your build environment to the latest Visual Studio 2022!
 #endif

From 9dcae0b1c3b409381474cf0ce53a7a1dcc031f83 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Thu, 22 Dec 2022 00:44:29 -0800
Subject: [PATCH 2/2] msvc: remove workaround for arm64 sha1 compiler bug

---
 Source/Core/Common/CMakeLists.txt | 8 --------
 Source/Core/DolphinLib.props      | 7 +------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 9f2e66c982..2ae474ab64 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -138,14 +138,6 @@ add_library(common
   WorkQueueThread.h
 )
 
-if(MSVC AND _M_ARM_64)
-  # Workaround msvc arm64 optimizer bug
-  # TODO remove after updating to VS 17.4
-  set_source_files_properties(
-    Crypto/SHA1.cpp
-    PROPERTIES COMPILE_FLAGS "/d2ssa-peeps-post-color-")
-endif()
-
 if(NOT MSVC AND _M_ARM_64)
   set_source_files_properties(
     Crypto/AES.cpp
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 14b6f1b5cc..5cb82a6050 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -733,12 +733,7 @@
     <ClCompile Include="Common\Crypto\AES.cpp" />
     <ClCompile Include="Common\Crypto\bn.cpp" />
     <ClCompile Include="Common\Crypto\ec.cpp" />
-    <ClCompile Include="Common\Crypto\SHA1.cpp">
-      <!--Workaround msvc arm64 optimizer bug
-      TODO remove after updating to VS 17.4
-      -->
-      <AdditionalOptions Condition="'$(Platform)'=='ARM64'">/d2ssa-peeps-post-color- %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
+    <ClCompile Include="Common\Crypto\SHA1.cpp" />
     <ClCompile Include="Common\Debug\CodeTrace.cpp" />
     <ClCompile Include="Common\Debug\MemoryPatches.cpp" />
     <ClCompile Include="Common\Debug\Watches.cpp" />