From 69133618a86b6305310b1d2c55dce3fa2e6fa525 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 12 Nov 2021 09:28:53 +0100
Subject: Add config file for Visual Studio 2022 and add github CI action

    * ACE/ace/config-win32-msvc-143.h:
      Added.

    * .github/workflows/windows.yml:
    * ACE/ace/config-win32-msvc.h:
---
 .github/workflows/windows.yml   | 16 ++++++++++++++++
 ACE/ace/config-win32-msvc-143.h | 29 +++++++++++++++++++++++++++++
 ACE/ace/config-win32-msvc.h     |  4 +++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 ACE/ace/config-win32-msvc-143.h

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 953d2eed297..386e9fe5a3b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -101,6 +101,22 @@ jobs:
             vcpkglibdir: debug/lib
             vcpkgpackages: openssl xerces-c zlib
             OptionalMpcArgs: -value_template LanguageStandard=stdcpp20
+          - name: VS2022Debug64
+            vmimage: windows-2022
+            mpctype: vs2022
+            BuildPlatform: x64
+            BuildConfiguration: Debug
+            vcpkgarch: x64-windows
+            vcpkglibdir: debug/lib
+            vcpkgpackages: openssl xerces-c zlib
+          - name: VS2022Release64
+            vmimage: windows-2022
+            mpctype: vs2022
+            BuildPlatform: x64
+            BuildConfiguration: Release
+            vcpkgarch: x64-windows
+            vcpkglibdir: lib
+            vcpkgpackages: openssl xerces-c zlib
     runs-on: ${{ matrix.vmimage }}
     name: ${{ matrix.name }}
     env:
diff --git a/ACE/ace/config-win32-msvc-143.h b/ACE/ace/config-win32-msvc-143.h
new file mode 100644
index 00000000000..33cfae27549
--- /dev/null
+++ b/ACE/ace/config-win32-msvc-143.h
@@ -0,0 +1,29 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ *  @file   config-win32-msvc-143.h
+ *
+ *  @brief  Microsoft Visual C++ 14.3 configuration file.
+ *
+ *  This file is the ACE configuration file for Microsoft Visual C++ 14.3 (as released with Visual Studio 2022).
+ *
+ *  @note Do not include this file directly, include config-win32.h instead.
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_143_H
+#define ACE_CONFIG_WIN32_MSVC_143_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#ifndef ACE_WIN32_VC143
+#  define ACE_WIN32_VC143
+#endif
+
+#include "ace/config-win32-msvc-142.h"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_143_H */
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index ceb18c2568f..c1cdeb85277 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -38,7 +38,9 @@
 #endif /* _WIN32_WCE */
 
 //FUZZ: disable check_for_msc_ver
-#if (_MSC_VER >= 1920)
+#if (_MSC_VER >= 1930)
+# include "ace/config-win32-msvc-143.h"
+#elif (_MSC_VER >= 1920)
 # include "ace/config-win32-msvc-142.h"
 #elif (_MSC_VER >= 1910)
 # include "ace/config-win32-msvc-141.h"
-- 
cgit v1.2.1