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..11bd1c170 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,8 +23,7 @@ if not exist %vswhere% ( ) set InstallDir= -for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -products * ^ - -requires Microsoft.Net.Component.4.5.TargetingPack ^ +for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17 -latest -prerelease -products * ^ -requires Microsoft.Net.Component.4.5.2.TargetingPack ^ -requires Microsoft.Net.Component.4.6.2.TargetingPack ^ -property installationPath`) do ( @@ -32,7 +31,7 @@ for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -p ) if not DEFINED InstallDir ( - echo "Could not find a VS2019 installation with the necessary components (targeting packs for v4.5, v4.5.2, and v4.6.2)." + echo "Could not find a VS2019 installation with the necessary components (targeting packs for v4.5.2 and v4.6.2)." echo Please install VS2019 or the missing components. goto BuildFail ) 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" } } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6785fd164..b3a0401cc 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -4,6 +4,6 @@ true false - v4.5 + v4.5.2 diff --git a/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj b/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj index bf2cf46b1..62d1ea802 100644 --- a/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj +++ b/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj @@ -11,7 +11,7 @@ $(CodeAnalysis) ..\Strict.ruleset $(DefineConstants);ASPNETHTTPFORMATTING - Client + Client 1591 diff --git a/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj b/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj index 1b14044ab..2e99ae7f3 100644 --- a/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj +++ b/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj @@ -46,6 +46,11 @@ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll True + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + False + diff --git a/test/System.Web.Helpers.Test/packages.config b/test/System.Web.Helpers.Test/packages.config index cafc6212c..e319680cf 100644 --- a/test/System.Web.Helpers.Test/packages.config +++ b/test/System.Web.Helpers.Test/packages.config @@ -10,4 +10,5 @@ + \ No newline at end of file diff --git a/test/System.Web.Mvc.Test/System.Web.Mvc.Test.csproj b/test/System.Web.Mvc.Test/System.Web.Mvc.Test.csproj index 3c4243bc5..6763d4444 100644 --- a/test/System.Web.Mvc.Test/System.Web.Mvc.Test.csproj +++ b/test/System.Web.Mvc.Test/System.Web.Mvc.Test.csproj @@ -56,6 +56,11 @@ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll True + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + False + diff --git a/test/System.Web.Mvc.Test/packages.config b/test/System.Web.Mvc.Test/packages.config index 72e333be0..58feb0e73 100644 --- a/test/System.Web.Mvc.Test/packages.config +++ b/test/System.Web.Mvc.Test/packages.config @@ -11,4 +11,5 @@ + \ No newline at end of file diff --git a/test/System.Web.WebPages.Test/System.Web.WebPages.Test.csproj b/test/System.Web.WebPages.Test/System.Web.WebPages.Test.csproj index fca409a32..320b079d7 100644 --- a/test/System.Web.WebPages.Test/System.Web.WebPages.Test.csproj +++ b/test/System.Web.WebPages.Test/System.Web.WebPages.Test.csproj @@ -46,6 +46,11 @@ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll True + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + False + False + diff --git a/test/System.Web.WebPages.Test/packages.config b/test/System.Web.WebPages.Test/packages.config index cafc6212c..e319680cf 100644 --- a/test/System.Web.WebPages.Test/packages.config +++ b/test/System.Web.WebPages.Test/packages.config @@ -10,4 +10,5 @@ + \ No newline at end of file