Skip to content

Commit 69c78cf

Browse files
authored
Fix vpack clobbering and update to newer Windows container image (#1480)
* Update to newer Windows container image * Pass newer host version to templates * Stop clobbering compiler vpack contents
1 parent 48e2f61 commit 69c78cf

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.pipelines/OneBranch.Official.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ extends:
2727
platform:
2828
name: 'windows_undocked'
2929
product: 'build_tools'
30+
31+
featureFlags:
32+
WindowsHostVersion:
33+
Version: 2022
3034

3135
cloudvault:
3236
enabled: false
@@ -117,8 +121,6 @@ extends:
117121
inputs:
118122
script: |
119123
set TargetDir=$(ob_outputDirectory)
120-
rd /s /q %TargetDir% >nul 2>&1
121-
md %TargetDir%
122124
cd %TargetDir%
123125
124126
copy $(Build.SourcesDirectory)\vsix\Microsoft.Cpp.CppWinRT.props

.pipelines/OneBranch.PullRequest.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ extends:
3131
name: 'windows_undocked'
3232
product: 'build_tools'
3333

34+
featureFlags:
35+
WindowsHostVersion:
36+
Version: 2022
37+
3438
globalSdl:
3539
isNativeCode: true
3640
tsa:

.pipelines/variables/OneBranchVariables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ variables:
1010
NUGET_XMLDOC_MODE: none
1111

1212
# Docker image which is used to build the project https://aka.ms/obpipelines/containers
13-
WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2019/vse2022:latest'
13+
WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
1414

1515
Codeql.Enabled: true # CodeQL once every 3 days on the default branch for all languages its applicable to in that pipeline.
1616
GDN_USE_DOTNET: true

0 commit comments

Comments
 (0)