Merge 3a15d76 into 42b1d2a

josephsl · web-flow · commit 426d8660fa54 · 2022-07-28T12:14:17.000+10:00
diff --git a/appx/manifest.xml.subst b/appx/manifest.xml.subst
@@ -24,7 +24,7 @@
 		<TargetDeviceFamily 
 			Name="Windows.Desktop" 
 			MinVersion="10.0.18990.0" 
-			MaxVersionTested="10.0.19044.0" 
+			MaxVersionTested="10.0.22621.0" 
 		/>
 	</Dependencies>
 	<Capabilities>
diff --git a/sconstruct b/sconstruct
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2010-2021 NV Access Limited, James Teh, Michael Curran, Peter Vágner, Joseph Lee,
+# Copyright (C) 2010-2022 NV Access Limited, James Teh, Michael Curran, Peter Vágner, Joseph Lee,
 # Reef Turner, Babbage B.V., Leonard de Ruijter, Łukasz Golonka, Accessolutions, Julien Cochuyt
 # This file may be used under the terms of the GNU General Public License, version 2 or later.
 # For more details see: https://www.gnu.org/licenses/gpl-2.0.html
@@ -322,16 +322,16 @@ def NVDADistGenerator(target, source, env, for_signature):
 	action.append(buildCmd)
 
 	# #10031: Apps written in Python 3 require Universal CRT to be installed. We cannot assume users have it on their systems.
-	# Therefore , copy required libraries from Windows 10 SDK.
+	# Therefore, copy required libraries from Windows 11 SDK.
 	try:
 		with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0', 0,winreg.KEY_READ|winreg.KEY_WOW64_32KEY) as SDKKey:
 			sdk_installationFolder = winreg.QueryValueEx(SDKKey, 'InstallationFolder')[0]
 			sdk_productVersion = winreg.QueryValueEx(SDKKey, 'ProductVersion')[0]
 	except WindowsError:
-		raise RuntimeError("Windows 10 SDK not found")
+		raise RuntimeError("Windows 11 SDK not found")
 	# The Universal CRT should be in an SDK version-specific directory
 	# But usually has a '.0' appended after the productVersion found in the registry. 
-	# E.g. 10.0.1941 might e actually 10.0.1941.0.
+	# E.g. 10.0.22000 might be actually 10.0.22000.0.
 	# Thus try both.
 	CRTDir = os.path.join(sdk_installationFolder, "Redist", sdk_productVersion+".0", "ucrt", "DLLs", "x86")
 	if not os.path.isdir(CRTDir):
diff --git a/source/winVersion.py b/source/winVersion.py
@@ -34,6 +34,7 @@
 	19044: "Windows 10 21H2",
 	20348: "Windows Server 2022",
 	22000: "Windows 11 21H2",
+	22621: "Windows 11 22H2",
 }
 
 
@@ -154,6 +155,7 @@ def __ge__(self, other):
 WIN10_21H2 = WinVersion(major=10, minor=0, build=19044)
 WINSERVER_2022 = WinVersion(major=10, minor=0, build=20348)
 WIN11 = WIN11_21H2 = WinVersion(major=10, minor=0, build=22000)
+WIN11_22H2 = WinVersion(major=10, minor=0, build=22621)
 
 
 @functools.lru_cache(maxsize=1)
