Merge a8ee8b2 into 2bfc3c2

Author: michaelDCurran

appveyor.yml

@@ -2,7 +2,7 @@
 # Many more options available, see docs:
 # https://www.appveyor.com/docs/appveyor-yml/
 
-os: Visual Studio 2019
+os: Visual Studio 2022
 version: "{branch}-{build}"
 
 branches:

nvdaHelper/microsoft-ui-uiautomation/sconscript

@@ -41,6 +41,12 @@ env = env.Clone()
 # otherwise the build fails with Visual Studio 2022
 env['ENV']['windir'] = os.environ['windir']
 
+
+# We must ensure that msbuild uses the same platform toolset as the rest of NVDA.
+# Thus we must fetch this info from the MSVC_VERSION SCons variable,
+# Formatting it as vMajorMinor (e.g. v143 for 14.3). 
+platformToolset = "v" + "".join(env.get('MSVC_VERSION').split('.')[:2])
+
 MSUIA_sourceDir = Dir('#include/microsoft-ui-uiautomation/src/uiAutomation')
 MSUIA_lib_outDir = Dir('lib')
 MSUIA_include_outDir = Dir('include')
@@ -66,11 +72,14 @@ MSUIA_wrapper_libs = env.Command(
 	],
 	action = [
 		# Fetch any required NuGet packages
-		f"msbuild {MSUIA_solutionFile} /t:Restore /p:RestorePackagesConfig=true,Configuration=Release,Platform=x86",
+		f"msbuild {MSUIA_solutionFile} /t:Restore /p:RestorePackagesConfig=true,Configuration=Release,Platform=x86,PlatformToolset={platformToolset}",
 		# Remove any old generated files
 		Delete(MSUIA_sourceDir.Dir('microsoft.ui.uiautomation/Generated Files')),
 		# Do the actual build
-		"msbuild /t:Build /p:Configuration=Release,Platform=x86,OutDir={outDir}/ $SOURCE".format(outDir=MSUIA_lib_outDir.abspath)
+		"msbuild /t:Build /p:Configuration=Release,Platform=x86,PlatformToolset={platformToolset},OutDir={outDir}/ $SOURCE".format(
+			outDir=MSUIA_lib_outDir.abspath,
+			platformToolset=platformToolset
+		)
 	],
 )
 env.Ignore(MSUIA_wrapper_libs,MSUIA_sourceDir.File('microsoft.ui.uiautomation/Microsoft.UI.UIAutomation_h.h'))
@@ -88,7 +97,10 @@ MSUIA_abstraction_libs = env.Command(
 		glob.glob(os.path.join(MSUIA_sourceDir.abspath, 'UiaOperationAbstraction', '*.h')),
 	],
 	action = [
-		"msbuild /t:Build /p:Configuration=Release,Platform=x86,OutDir={outDir}/ $SOURCE".format(outDir=MSUIA_lib_outDir.abspath),
+		"msbuild /t:Build /p:Configuration=Release,Platform=x86,PlatformToolset={platformToolset},OutDir={outDir}/ $SOURCE".format(
+			outDir=MSUIA_lib_outDir.abspath,
+			platformToolset=platformToolset
+		),
 	]
 )
 

readme.md

@@ -60,25 +60,24 @@ The following dependencies need to be installed on your system:
 
 * [Python](https://www.python.org/), version 3.7, 32 bit
 	* Use latest minor version if possible.
-* Microsoft Visual Studio 2019 or 2022:
-	* To replicate the production build environment, use the [version of Visual Studio 2019 that AppVeyor is using](https://www.appveyor.com/docs/windows-images-software/#visual-studio-2019). 
-		* When you do not use the Visual Studio IDE itself, you can download the [build tools](https://aka.ms/vs/16/release/vs_BuildTools.exe)
-		* When you are intending to use the Visual Studio IDE (not required for NVDA development), you can download [the community version](https://aka.ms/vs/16/release/vs_Community.exe), which is also used by appveyor
+* Microsoft Visual Studio 2022:
+	* To replicate the production build environment, use the [version of Visual Studio 2022 that AppVeyor is using](https://www.appveyor.com/docs/windows-images-software/#visual-studio-2022). 
+		* When you do not use the Visual Studio IDE itself, you can download the [build tools](https://aka.ms/vs/17/release/vs_BuildTools.exe)
+		* When you are intending to use the Visual Studio IDE (not required for NVDA development), you can download [the community version](https://aka.ms/vs/17/release/vs_Community.exe), which is also used by appveyor
 		* The Professional and Enterprise versions are also supported
 		* Preview versions are *not* supported
-		* Building with Visual Studio 2022 explicitly requires the MSVC v142 - VS 2019 C++ build tools to be installed (see below)
 	* When installing Visual Studio, you need to enable the following:
 		* In the list  on the Workloads tab
 			* in the Windows grouping:
 				* Desktop development with C++
 			* Then in the Installation details tree view, under Desktop for C++, Optional, ensure the following are selected:
-				* MSVC v142 - VS 2019 C++ x64/x86 build tools
-				* Windows 11 SDK (10.0.22000.0)
-				* C++ ATL for v142 build tools (x86 & x64)
+				* MSVC v143 - VS 2022 C++ x64/x86 build tools
+				* Windows 11 SDK (10.0.22621.0)
+				* C++ ATL for v143 build tools (x86 & x64)
 				* C++ Clang tools for Windows
 		* On the Individual components tab, ensure the following items are selected:
-			* MSVC v142 - VS 2019 C++ ARM64 build tools
-			* C++ ATL for v142 build tools (ARM64)
+			* MSVC v143 - VS 2022 C++ ARM64 build tools
+			* C++ ATL for v143 build tools (ARM64)
 
 
 ### Git Submodules