Skip to content

Fix vpack clobbering and update to newer Windows container image #1480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 3, 2025
Merged

Fix vpack clobbering and update to newer Windows container image #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0ca5ad
Update to newer Windows container image
DefaultRyan Mar 1, 2025
1b36250
Pass newer host version to templates
DefaultRyan Mar 3, 2025
cd0e578
Stop clobbering compiler vpack contents
DefaultRyan Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .pipelines/OneBranch.Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ extends:
platform:
name: 'windows_undocked'
product: 'build_tools'

featureFlags:
WindowsHostVersion:
Version: 2022

cloudvault:
enabled: false
Expand Down Expand Up @@ -117,8 +121,6 @@ extends:
inputs:
script: |
set TargetDir=$(ob_outputDirectory)
rd /s /q %TargetDir% >nul 2>&1
md %TargetDir%
cd %TargetDir%

copy $(Build.SourcesDirectory)\vsix\Microsoft.Cpp.CppWinRT.props
Expand Down
4 changes: 4 additions & 0 deletions .pipelines/OneBranch.PullRequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ extends:
name: 'windows_undocked'
product: 'build_tools'

featureFlags:
WindowsHostVersion:
Version: 2022

globalSdl:
isNativeCode: true
tsa:
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/variables/OneBranchVariables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variables:
NUGET_XMLDOC_MODE: none

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

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