diff --git a/tools/find-tools.bat b/tools/find-tools.bat
index f490f10e5b..b68b285987 100644
--- a/tools/find-tools.bat
+++ b/tools/find-tools.bat
@@ -167,6 +167,8 @@ exit /b
         set NUM_VSVERSION=15
     ) else if "%ARG_VSVERSION%" == "2019" (
         set NUM_VSVERSION=16
+    ) else if "%ARG_VSVERSION%" == "2022" (
+        set NUM_VSVERSION=17
     ) else if "%ARG_VSVERSION%" == "latest" (
         call :check_latest_installed_vsversion
     ) else (
@@ -185,6 +187,8 @@ exit /b
         set CMAKE_G_PARAM=Visual Studio 15 2017
     ) else if "%NUM_VSVERSION%" == "16" (
         set CMAKE_G_PARAM=Visual Studio 16 2019
+    ) else if "%NUM_VSVERSION%" == "17" (
+        set CMAKE_G_PARAM=Visual Studio 17 2022
     ) else (
         call :set_cmake_gparam_automatically
     )
diff --git a/vcx-props/vcxcompat.props b/vcx-props/vcxcompat.props
index d83904fe00..1f8527903f 100644
--- a/vcx-props/vcxcompat.props
+++ b/vcx-props/vcxcompat.props
@@ -6,10 +6,16 @@
   <PropertyGroup Label="Globals" Condition="'$(VisualStudioVersion)' == '16.0'">
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <PropertyGroup Label="Globals" Condition="'$(VisualStudioVersion)' == '17.0'">
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '15.0'">
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '16.0'">
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '17.0'">
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
 </Project>