diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index db4806915..052254897 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -21,7 +21,7 @@ jobs: matrix: bits: [32, 64] - runs-on: windows-2019 + runs-on: windows-2025 env: BITS: '${{ matrix.bits }}' diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1 index 46fc1213a..09ba714b9 100644 --- a/doc/win-dev.ps1 +++ b/doc/win-dev.ps1 @@ -11,8 +11,8 @@ function ThrowOnNativeFailure { } -$VsVersion = 2019 -$MsvcVersion = '14.2' +$VsVersion = 2022 +$MsvcVersion = '14.3' $BoostVersion = @(1, 88, 0) $OpensslVersion = '3_0_16' @@ -74,7 +74,6 @@ try { if (-not $Env:GITHUB_ACTIONS) { choco install -y ` "visualstudio${VsVersion}community" ` - "visualstudio${VsVersion}-workload-netcoretools" ` "visualstudio${VsVersion}-workload-vctools" ` "visualstudio${VsVersion}-workload-manageddesktop" ` "visualstudio${VsVersion}-workload-nativedesktop" ` @@ -83,6 +82,7 @@ if (-not $Env:GITHUB_ACTIONS) { git ` cmake ` winflexbison3 ` + netfx-4.6-devpack ` windows-sdk-8.1 ` wixtoolset ThrowOnNativeFailure diff --git a/tools/win32/configure-dev.ps1 b/tools/win32/configure-dev.ps1 index a82560d25..311804fa3 100644 --- a/tools/win32/configure-dev.ps1 +++ b/tools/win32/configure-dev.ps1 @@ -1,6 +1,6 @@ Set-PsDebug -Trace 1 -# Specify default targets for VS 2019 for developers. +# Specify default targets for VS 2022 for developers. if (-not (Test-Path env:ICINGA2_BUILDPATH)) { $env:ICINGA2_BUILDPATH = '.\debug' @@ -22,7 +22,7 @@ if (-not ($env:PATH -contains $env:CMAKE_PATH)) { $env:PATH = $env:CMAKE_PATH + ';' + $env:PATH } if (-not (Test-Path env:CMAKE_GENERATOR)) { - $env:CMAKE_GENERATOR = 'Visual Studio 16 2019' + $env:CMAKE_GENERATOR = 'Visual Studio 17 2022' } if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) { $env:CMAKE_GENERATOR_PLATFORM = 'x64' @@ -37,7 +37,7 @@ if (-not (Test-Path env:BOOST_ROOT)) { $env:BOOST_ROOT = 'c:\local\boost_1_88_0' } if (-not (Test-Path env:BOOST_LIBRARYDIR)) { - $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_88_0\lib64-msvc-14.2' + $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_88_0\lib64-msvc-14.3' } if (-not (Test-Path env:FLEX_BINARY)) { $env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe' diff --git a/tools/win32/configure.ps1 b/tools/win32/configure.ps1 index db961a2e5..1cc8dfb3d 100644 --- a/tools/win32/configure.ps1 +++ b/tools/win32/configure.ps1 @@ -17,7 +17,7 @@ if (-not ($env:PATH -contains $env:CMAKE_PATH)) { $env:PATH = $env:CMAKE_PATH + ';' + $env:PATH } if (-not (Test-Path env:CMAKE_GENERATOR)) { - $env:CMAKE_GENERATOR = 'Visual Studio 16 2019' + $env:CMAKE_GENERATOR = 'Visual Studio 17 2022' } if (-not (Test-Path env:BITS)) { $env:BITS = 64 @@ -39,7 +39,7 @@ if (-not (Test-Path env:BOOST_ROOT)) { $env:BOOST_ROOT = "c:\local\boost_1_88_0-Win${env:BITS}" } if (-not (Test-Path env:BOOST_LIBRARYDIR)) { - $env:BOOST_LIBRARYDIR = "c:\local\boost_1_88_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2" + $env:BOOST_LIBRARYDIR = "c:\local\boost_1_88_0-Win${env:BITS}\lib${env:BITS}-msvc-14.3" } if (-not (Test-Path env:FLEX_BINARY)) { $env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe' diff --git a/tools/win32/load-vsenv.ps1 b/tools/win32/load-vsenv.ps1 index c5323dc2a..a876c6148 100644 --- a/tools/win32/load-vsenv.ps1 +++ b/tools/win32/load-vsenv.ps1 @@ -18,7 +18,7 @@ if (-not (Test-Path $BUILD)) { if (Test-Path env:VS_INSTALL_PATH) { $VSBASE = $env:VS_INSTALL_PATH } else { - $VSBASE = "C:\Program Files (x86)\Microsoft Visual Studio\2019" + $VSBASE = "C:\Program Files\Microsoft Visual Studio\2022" } if (Test-Path env:BITS) {