Skip to content
代码片段 群组 项目
未验证 提交 4adb4258 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: GitHub
浏览文件

Specify the current agent demands and VS version (#42460)

* Specify the current agent demands and VS version
- we require VS2022 to build native code these days
- Core-Eng really likes `1es-windows-2019[-open]` :grinning:

* !fixup! Remove extra `$(WindowsTargetPlatformVersion)` settings
- set in Cpp.Common.props
- was incorrect in common.props and led to requiring two Windows SDK versions
上级 a40a3fec
No related branches found
No related tags found
无相关合并请求
......@@ -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, '') }}:
......
......@@ -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",
......
......@@ -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>
......
......@@ -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>
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册