From 51e70cbe57b55a898c93040b6f9c33b9fe0b6cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Mon, 4 Mar 2024 11:30:05 +0100
Subject: [PATCH] [mono] Bump _WIN32_WINNT to align with coreclr (#99160)

The only code that is affected and enabled now is: https://github.com/dotnet/runtime/blob/50d6e5d5ffd05dd4034cffd222ea610baedcc326/src/mono/mono/utils/mono-threads-windows.c#L476-L497

Also removed setting _WIN32_IE since this makes no sense anymore.
---
 src/mono/cmake/config.h.in |  6 +++---
 src/mono/mono.proj         | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/mono/cmake/config.h.in b/src/mono/cmake/config.h.in
index e484a802aed9b..5efec6ebe932d 100644
--- a/src/mono/cmake/config.h.in
+++ b/src/mono/cmake/config.h.in
@@ -5,9 +5,9 @@
 
 #include <SDKDDKVer.h>
 
-#if _WIN32_WINNT < 0x0601
-#error "Mono requires Windows 7 or later."
-#endif /* _WIN32_WINNT < 0x0601 */
+#if _WIN32_WINNT < 0x0602
+#error "Mono requires Windows 8 or later."
+#endif /* _WIN32_WINNT < 0x0602 */
 
 #ifndef HAVE_WINAPI_FAMILY_SUPPORT
 
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 3b0ade6bd89cc..f2933a7744bfe 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -385,9 +385,8 @@
       <_MonoCPPFLAGS Include="-D_CRT_NONSTDC_NO_DEPRECATE" />
       <!--<_MonoCPPFLAGS Include="-DGC_NOT_DLL" />--> <!-- only used for Boehm -->
       <_MonoCPPFLAGS Include="-DWIN32_THREADS" />
-      <_MonoCPPFLAGS Include="-DWINVER=0x0601" />
-      <_MonoCPPFLAGS Include="-D_WIN32_WINNT=0x0601" />
-      <_MonoCPPFLAGS Include="-D_WIN32_IE=0x0501" />
+      <_MonoCPPFLAGS Include="-DWINVER=0x0602" />
+      <_MonoCPPFLAGS Include="-D_WIN32_WINNT=0x0602" />
       <_MonoCPPFLAGS Include="-D_UNICODE" />
       <_MonoCPPFLAGS Include="-DUNICODE" />
       <_MonoCPPFLAGS Include="-DFD_SETSIZE=1024" />
@@ -765,9 +764,8 @@
       <_MonoAOTCPPFLAGS Include="-D_CRT_NONSTDC_NO_DEPRECATE" />
       <!--<_MonoAOTCPPFLAGS Include="-DGC_NOT_DLL" />--> <!-- only used for Boehm -->
       <_MonoAOTCPPFLAGS Include="-DWIN32_THREADS" />
-      <_MonoAOTCPPFLAGS Include="-DWINVER=0x0601" />
-      <_MonoAOTCPPFLAGS Include="-D_WIN32_WINNT=0x0601" />
-      <_MonoAOTCPPFLAGS Include="-D_WIN32_IE=0x0501" />
+      <_MonoAOTCPPFLAGS Include="-DWINVER=0x0602" />
+      <_MonoAOTCPPFLAGS Include="-D_WIN32_WINNT=0x0602" />
       <_MonoAOTCPPFLAGS Include="-D_UNICODE" />
       <_MonoAOTCPPFLAGS Include="-DUNICODE" />
       <_MonoAOTCPPFLAGS Include="-DFD_SETSIZE=1024" />