Skip to content

Commit 29a33b6

Browse files
authored
Update windows docker to .net 4.8 and ltsc2022 (#5801)
Update windows docker to .net 4.8 and ltsc2022
1 parent 2938ed0 commit 29a33b6

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.ci/azure-pipelines/azure-pipelines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ stages:
143143
- job: Windows
144144
displayName: Windows Build
145145
pool:
146-
vmImage: 'windows-2019'
146+
vmImage: 'windows-2022'
147147
strategy:
148148
matrix:
149149
x86:

.ci/azure-pipelines/env.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,17 @@ jobs:
107107
timeoutInMinutes: 360
108108
displayName: "Env"
109109
pool:
110-
vmImage: 'windows-2019'
110+
vmImage: 'windows-2022'
111111
strategy:
112112
matrix:
113113
Winx86:
114114
PLATFORM: x86
115-
TAG: winx86
115+
TAG: windows2022-x86
116116
GENERATOR: "'Visual Studio 16 2019' -A Win32"
117-
VCPKGCOMMIT: fd766eba2b4cf59c7123d46189be373e2cee959d
117+
VCPKGCOMMIT: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
118118
Winx64:
119119
PLATFORM: x64
120-
TAG: winx64
120+
TAG: windows2022-x64
121121
GENERATOR: "'Visual Studio 16 2019' -A x64"
122122
VCPKGCOMMIT: master
123123
steps:
@@ -132,7 +132,7 @@ jobs:
132132
-t $(dockerHubID)/env:$(TAG)
133133
dockerfile: '$(Build.SourcesDirectory)/.dev/docker/windows/Dockerfile'
134134
tags: "$(TAG)"
135-
135+
136136
- script: >
137137
docker run --rm -v "$(Build.SourcesDirectory)":c:\pcl $(dockerHubID)/env:$(TAG)
138138
powershell -command "mkdir c:\pcl\build; cd c:\pcl\build;

.dev/docker/windows/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# escape=`
22

3-
FROM mcr.microsoft.com/windows/servercore:ltsc2019
3+
FROM mcr.microsoft.com/windows/servercore:ltsc2022
44

55
# Use "--build-arg platform=x64" for 64 bit or x86 for 32 bit.
66
ARG PLATFORM
@@ -30,7 +30,7 @@ RUN wget $Env:CHANNEL_BASE_URL/vs_buildtools.exe -OutFile 'C:\TEMP\vs_buildtools
3030
"C:\TEMP\VisualStudio.chman", `
3131
"--add", `
3232
"Microsoft.VisualStudio.Workload.VCTools", `
33-
"Microsoft.Net.Component.4.7.2.SDK", `
33+
"Microsoft.Net.Component.4.8.SDK", `
3434
"Microsoft.VisualStudio.Component.VC.ATLMFC", `
3535
"--includeRecommended" `
3636
-Wait -PassThru; `
@@ -48,4 +48,5 @@ COPY $PLATFORM'-windows-rel.cmake' 'c:\vcpkg\triplets\'$PLATFORM'-windows-rel.cm
4848
4949
RUN cd .\vcpkg; `
5050
.\bootstrap-vcpkg.bat; `
51-
.\vcpkg install boost flann eigen3 qhull vtk[qt,opengl] gtest benchmark openni2 --triplet $Env:PLATFORM-windows-rel --host-triplet $Env:PLATFORM-windows-rel --clean-after-build;
51+
.\vcpkg install boost flann eigen3 qhull vtk[qt,opengl] gtest benchmark openni2 --triplet $Env:PLATFORM-windows-rel --host-triplet $Env:PLATFORM-windows-rel --clean-after-build --x-buildtrees-root=C:\b; `
52+

0 commit comments

Comments
 (0)