From a684372bd33243366d44cbcb6b7ee66d4e29bc08 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 28 Sep 2025 21:57:57 +0100 Subject: [PATCH] Update Xbox One build script --- .github/workflows/xbox_one.yml | 7 +++++-- Packaging/xbox-one/build.bat | 4 ++-- docs/building.md | 2 +- uwp-project/devilutionx.vcxproj | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/xbox_one.yml b/.github/workflows/xbox_one.yml index 252b60f51..c2425d267 100644 --- a/.github/workflows/xbox_one.yml +++ b/.github/workflows/xbox_one.yml @@ -6,14 +6,17 @@ on: - master paths-ignore: - '*.md' + - 'docs/**' pull_request: types: [opened, synchronize] paths-ignore: - '*.md' + - 'docs/**' release: types: [published] paths-ignore: - '*.md' + - 'docs/**' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -24,7 +27,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v5 with: fetch-depth: 0 @@ -32,7 +35,7 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.3 + uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 diff --git a/Packaging/xbox-one/build.bat b/Packaging/xbox-one/build.bat index d65f6942f..e0a11dd98 100644 --- a/Packaging/xbox-one/build.bat +++ b/Packaging/xbox-one/build.bat @@ -5,13 +5,13 @@ 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.22000.0;TargetPlatformMinVersion=10.0.14393.0;ConfigurationType=StaticLibrary;Configuration=Release;Platform=x64 SDL\VisualC-WinRT\SDL-UWP.vcxproj +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 cmake -DUWP_LIB=1 -DUWP_SDL2_DIR="%CD%/SDL" -DCMAKE_BUILD_TYPE=x64-Release .. msbuild /p:Configuration=Release;Platform=x64 /m DevilutionX.sln -powershell "Get-Content ..\uwp-project\Package.appxmanifest.template | %% {$_ -replace '__PROJECT_VERSION__',$(& {git describe --tags --abbrev=0})} | Out-File -FilePath ..\uwp-project\Package.appxmanifest -encoding ASCII" +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" msbuild /p:Configuration=Release;Platform=x64;AppxBundle=Always;AppxBundlePlatforms=x64 /m ..\uwp-project\devilutionx.sln diff --git a/docs/building.md b/docs/building.md index 07844ca3b..b8aaf378b 100644 --- a/docs/building.md +++ b/docs/building.md @@ -498,7 +498,7 @@ emrun index.html * Git * Visual Studio 2022 with the foloowing packages installed: * C++ (v143) Universal Windows Platform tools - * Windows 11 SDK (10.0.22000.0) + * Windows 11 SDK (10.0.26100.0) * Windows 10 SDK (10.0.18362.0) * MSVC v143 - VS 2022 C++ x64/x86 build tools diff --git a/uwp-project/devilutionx.vcxproj b/uwp-project/devilutionx.vcxproj index 8d0d6f43a..eeef839cf 100644 --- a/uwp-project/devilutionx.vcxproj +++ b/uwp-project/devilutionx.vcxproj @@ -21,7 +21,7 @@ 8.2 10.0.10069.0 10.0.10069.0 - 10.0.22000.0 + 10.0.26100.0 10.0.14393.0 devilutionX @@ -142,4 +142,4 @@ - \ No newline at end of file +