From 81fe5ff8524ab016dd73e75cb7d8c2f2846c44dc Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 9 Jun 2026 09:55:27 +0100
Subject: [PATCH] Fix Xbox One UWP build

https://github.com/actions/runner-images/issues/14101
---
 Packaging/xbox-one/build.bat    | 7 +++----
 docs/building.md                | 8 ++++----
 uwp-project/devilutionx.vcxproj | 4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Packaging/xbox-one/build.bat b/Packaging/xbox-one/build.bat
index e0a11dd98..e830849d7 100644
--- a/Packaging/xbox-one/build.bat
+++ b/Packaging/xbox-one/build.bat
@@ -5,11 +5,10 @@ cd ..\..\build
 
 git clone --branch SDL2 https://github.com/libsdl-org/SDL.git
 git -C SDL reset --hard 10135b2d7bbed6ea0cba24410ebc12887d92968d
-msbuild /p:PlatformToolset=v143;TargetPlatformVersion=10.0.26100.0;TargetPlatformMinVersion=10.0.14393.0;ConfigurationType=StaticLibrary;Configuration=Release;Platform=x64 SDL\VisualC-WinRT\SDL-UWP.vcxproj
+msbuild /p:PlatformToolset=v145;TargetPlatformVersion=10.0.26100.0;TargetPlatformMinVersion=10.0.14393.0;ConfigurationType=StaticLibrary;Configuration=Release;Platform=x64 SDL\VisualC-WinRT\SDL-UWP.vcxproj
 
-cmake -DUWP_LIB=1 -DUWP_SDL2_DIR="%CD%/SDL" -DCMAKE_BUILD_TYPE=x64-Release ..
-
-msbuild /p:Configuration=Release;Platform=x64 /m DevilutionX.sln
+cmake -DUWP_LIB=1 -DUWP_SDL2_DIR="%CD%/SDL" -A x64 ..
+cmake --build . --config Release -j
 
 powershell "Get-Content ..\uwp-project\Package.appxmanifest.template | %% {$_ -replace '__PROJECT_VERSION__',$(Select-String -Path ..\VERSION -Pattern \d+\.\d+\.\d+).Matches[0].Value} | Out-File -FilePath ..\uwp-project\Package.appxmanifest -encoding ASCII"
 
diff --git a/docs/building.md b/docs/building.md
index 5ca57cb0c..6c8192aa3 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -546,13 +546,13 @@ emrun index.html
 
 ### Dependencies
 
-* Windows 10
+* Windows 10+
 * CMake
 * Git
-* Visual Studio 2022 with the following packages installed:
-    * C++ (v143) Universal Windows Platform tools
+* Visual Studio 2026 with the following packages installed:
+    * C++ (v145) Universal Windows Platform tools
     * Windows 11 SDK (10.0.26100.0)
-    * MSVC v143 - VS 2022 C++ x64/x86 build tools
+    * MSVC v145 - VS 2026 C++ x64/x86 build tools
 
 _Note: Visual Studio Community Edition can be used._
 
diff --git a/uwp-project/devilutionx.vcxproj b/uwp-project/devilutionx.vcxproj
index 40a48f4c9..d3ff80297 100644
--- a/uwp-project/devilutionx.vcxproj
+++ b/uwp-project/devilutionx.vcxproj
@@ -29,13 +29,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">