File tree Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -143,7 +143,7 @@ stages:
143
143
- job : Windows
144
144
displayName : Windows Build
145
145
pool :
146
- vmImage : ' windows-2019 '
146
+ vmImage : ' windows-2022 '
147
147
strategy :
148
148
matrix :
149
149
x86 :
Original file line number Diff line number Diff line change @@ -107,17 +107,17 @@ jobs:
107
107
timeoutInMinutes : 360
108
108
displayName : " Env"
109
109
pool :
110
- vmImage : ' windows-2019 '
110
+ vmImage : ' windows-2022 '
111
111
strategy :
112
112
matrix :
113
113
Winx86 :
114
114
PLATFORM : x86
115
- TAG : winx86
115
+ TAG : windows2022-x86
116
116
GENERATOR : " 'Visual Studio 16 2019' -A Win32"
117
- VCPKGCOMMIT : fd766eba2b4cf59c7123d46189be373e2cee959d
117
+ VCPKGCOMMIT : 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
118
118
Winx64 :
119
119
PLATFORM : x64
120
- TAG : winx64
120
+ TAG : windows2022-x64
121
121
GENERATOR : " 'Visual Studio 16 2019' -A x64"
122
122
VCPKGCOMMIT : master
123
123
steps :
@@ -132,7 +132,7 @@ jobs:
132
132
-t $(dockerHubID)/env:$(TAG)
133
133
dockerfile : ' $(Build.SourcesDirectory)/.dev/docker/windows/Dockerfile'
134
134
tags : " $(TAG)"
135
-
135
+
136
136
- script : >
137
137
docker run --rm -v "$(Build.SourcesDirectory)":c:\pcl $(dockerHubID)/env:$(TAG)
138
138
powershell -command "mkdir c:\pcl\build; cd c:\pcl\build;
Original file line number Diff line number Diff line change 1
1
# escape=`
2
2
3
- FROM mcr.microsoft.com/windows/servercore:ltsc2019
3
+ FROM mcr.microsoft.com/windows/servercore:ltsc2022
4
4
5
5
# Use "--build-arg platform=x64" for 64 bit or x86 for 32 bit.
6
6
ARG PLATFORM
@@ -30,7 +30,7 @@ RUN wget $Env:CHANNEL_BASE_URL/vs_buildtools.exe -OutFile 'C:\TEMP\vs_buildtools
30
30
"C:\T EMP\V isualStudio.chman" , `
31
31
"--add" , `
32
32
"Microsoft.VisualStudio.Workload.VCTools" , `
33
- "Microsoft.Net.Component.4.7.2 .SDK" , `
33
+ "Microsoft.Net.Component.4.8 .SDK" , `
34
34
"Microsoft.VisualStudio.Component.VC.ATLMFC" , `
35
35
"--includeRecommended" `
36
36
-Wait -PassThru; `
@@ -48,4 +48,5 @@ COPY $PLATFORM'-windows-rel.cmake' 'c:\vcpkg\triplets\'$PLATFORM'-windows-rel.cm
48
48
49
49
RUN cd .\v cpkg; `
50
50
.\b ootstrap-vcpkg.bat; `
51
- .\v cpkg 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
+ .\v cpkg 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
+
You can’t perform that action at this time.
0 commit comments