diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 7d0e047f451dcc3b87f5b7fb9adf190589779af7..663b5abd8761c4803b9fd121d9d9e5625634f38e 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -120,11 +120,11 @@ jobs: ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals build.windows.amd64.vs2022.open + demands: ImageOverride -equals 1es-windows-2022-open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing - demands: ImageOverride -equals build.windows.amd64.vs2022 + demands: ImageOverride -equals 1es-windows-2022 ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} ${{ if ne(parameters.disableComponentGovernance, '') }}: diff --git a/global.json b/global.json index c3c99e8413a381289ee64eca7a0921efd2b622b9..3c98cec4de93eaa29d797a2bda483f612de7a51c 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "Git": "2.22.0", "jdk": "11.0.3", "vs": { - "version": "16.8", + "version": "17.2", "components": [ "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.ATL.ARM64", @@ -23,7 +23,7 @@ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64" ] }, - "xcopy-msbuild": "16.5.0-alpha" + "xcopy-msbuild": "17.1.0" }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props index 253134d4fc32eddfdb270f4b2dfa24b8ba8a06ae..081bc01fd5ab36d8a0c07a05b128a20b7eb18dc4 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props @@ -14,9 +14,6 @@ <!-- General properties --> <PropertyGroup> - <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. --> - <IisOobWinSdkVersion Condition="'$(IisOobWinSdkVersion)' == ''">10.0.18362.0</IisOobWinSdkVersion> - <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(IisOobWinSdkVersion)</WindowsTargetPlatformVersion> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 9dbd0edb016e650058755fca242ff97a74a974ec..7d397c76622714eee2e70c9207ba03d51fd6cea1 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -40,8 +40,6 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{1eac8125-1765-4e2d-8cbe-56dc98a1c8c1}</ProjectGuid> <Keyword>Win32Proj</Keyword> - <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. --> - <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion> <PlatformToolsetVersion Condition=" '$(PlatformToolsetVersion)' == '' ">v143</PlatformToolsetVersion> <ConfigurationType>Application</ConfigurationType> <PlatformToolset>$(PlatformToolsetVersion)</PlatformToolset> @@ -138,4 +136,4 @@ </ItemDefinitionGroup> -</Project> \ No newline at end of file +</Project>