Update windows docker to .net 4.8 and ltsc2022 (PointCloudLibrary#5801)

Update windows docker to .net 4.8 and ltsc2022
larshg · Nov 28, 2023 · 29a33b6 · 29a33b6
1 parent 2938ed0
commit 29a33b6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.ci/azure-pipelines/azure-pipelines.yaml b/.ci/azure-pipelines/azure-pipelines.yaml
@@ -143,7 +143,7 @@ stages:
       - job: Windows
         displayName: Windows Build
         pool:
-          vmImage: 'windows-2019'
+          vmImage: 'windows-2022'
         strategy:
           matrix:
             x86:

diff --git a/.ci/azure-pipelines/env.yml b/.ci/azure-pipelines/env.yml
@@ -107,17 +107,17 @@ jobs:
   timeoutInMinutes: 360
   displayName: "Env"
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-2022'
   strategy:
     matrix:
       Winx86:
         PLATFORM: x86
-        TAG: winx86
+        TAG: windows2022-x86
         GENERATOR: "'Visual Studio 16 2019' -A Win32"
-        VCPKGCOMMIT: fd766eba2b4cf59c7123d46189be373e2cee959d
+        VCPKGCOMMIT: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
       Winx64:
         PLATFORM: x64
-        TAG: winx64
+        TAG: windows2022-x64
         GENERATOR: "'Visual Studio 16 2019' -A x64"
         VCPKGCOMMIT: master
   steps:
@@ -132,7 +132,7 @@ jobs:
         -t $(dockerHubID)/env:$(TAG)
       dockerfile: '$(Build.SourcesDirectory)/.dev/docker/windows/Dockerfile'
       tags: "$(TAG)"
-      
+
   - script: >
       docker run --rm -v "$(Build.SourcesDirectory)":c:\pcl $(dockerHubID)/env:$(TAG) 
       powershell -command "mkdir c:\pcl\build; cd c:\pcl\build; 

diff --git a/.dev/docker/windows/Dockerfile b/.dev/docker/windows/Dockerfile
@@ -1,6 +1,6 @@
 # escape=`
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
 # Use "--build-arg platform=x64" for 64 bit or x86 for 32 bit.
 ARG PLATFORM
@@ -30,7 +30,7 @@ RUN wget $Env:CHANNEL_BASE_URL/vs_buildtools.exe -OutFile 'C:\TEMP\vs_buildtools
     "C:\TEMP\VisualStudio.chman",                                   `
     "--add",                                                        `
     "Microsoft.VisualStudio.Workload.VCTools",                      `
-    "Microsoft.Net.Component.4.7.2.SDK",                            `
+    "Microsoft.Net.Component.4.8.SDK",                            `
     "Microsoft.VisualStudio.Component.VC.ATLMFC",                   `
     "--includeRecommended"                                          `
     -Wait -PassThru;                                                `
@@ -48,4 +48,5 @@ COPY $PLATFORM'-windows-rel.cmake' 'c:\vcpkg\triplets\'$PLATFORM'-windows-rel.cm
 
 RUN cd .\vcpkg;                                                `
     .\bootstrap-vcpkg.bat;                                            `
-    .\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;
+    .\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; `
+