diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f31f55af6..7f8dd06d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,7 +41,7 @@ extends: enabled: true pool: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2019 + image: 1es-windows-2022 os: windows stages: - stage: build diff --git a/build.cmd b/build.cmd index 5802269fe..674b6f656 100644 --- a/build.cmd +++ b/build.cmd @@ -6,7 +6,7 @@ mkdir bin :Build -REM Require VS2019 (v16.0) on the system. Use `vswhere` for the search because it can find all VS installations. +REM Require VS2022 (v17.0) on the system. Use `vswhere` for the search because it can find all VS installations. set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" if not exist %vswhere% ( set vswhere="%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" @@ -23,7 +23,7 @@ if not exist %vswhere% ( ) set InstallDir= -for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -products * ^ +for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17 -latest -prerelease -products * ^ -requires Microsoft.Net.Component.4.5.TargetingPack ^ -requires Microsoft.Net.Component.4.5.2.TargetingPack ^ -requires Microsoft.Net.Component.4.6.2.TargetingPack ^ diff --git a/eng/templates/default-build.yml b/eng/templates/default-build.yml index 7000a4dad..c6586915b 100644 --- a/eng/templates/default-build.yml +++ b/eng/templates/default-build.yml @@ -8,7 +8,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 30 strategy: diff --git a/global.json b/global.json index 0f75e8a6f..fa8b53441 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.405", + "version": "8.0.413", "rollForward": "major" } }