docker: update Windows image

- install latest vs2019 compiler
- install latest win10 SDK
- add vswhere to simplify searching VS
- update Qt to 6.2.4
- update Qbs to 1.24.0
- drop support for 32-bit packages in choco

Change-Id: I0a57baf160307b84e62fea5c56687efcce7fe42c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 15 insertions, 23 deletions

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c600845d1..ea8c401ff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -154,8 +154,7 @@ jobs:
         modules.qbsbuildconfig.enableUnitTests:false
         modules.cpp.treatWarningsAsErrors:true
         project.withDocumentation:true
-        config:release-64 profile:qt64
-        config:release profile:qt
+        config:release profile:qt64
     - name: Print clcache stats
       run: docker-compose run --rm windows clcache -s
     - name: Get archive name
@@ -169,7 +168,6 @@ jobs:
         path: |
           release/qbs.*.nupkg
           release/qbs-windows-*.zip
-          release-64/qbs-windows-*.zip
 
   create-archives:
     name: Create Archives
@@ -211,12 +209,11 @@ jobs:
       uses: actions/download-artifact@v1
       with:
         name: qbs-windows-${{ github.run_id }}
-        path: ./tmp
+        path: ./tmp/release
     - name: Copy Windows artifacts
       run: |
         cp ./tmp/release/qbs.*.nupkg ./release
-        cp ./tmp/release/qbs-windows-x86-*.zip ./release
-        cp ./tmp/release-64/qbs-windows-x86_64-*.zip ./release
+        cp ./tmp/release/qbs-windows-x86_64-*.zip ./release
     - name: Copy changelog
       run: cp changelogs/changes-${{ steps.get-version-name.outputs.version-name }}.md release || echo "changelog not found"
     - name: Generate checksums
@@ -236,7 +233,6 @@ jobs:
           release/qbs-src-*.tar.gz
           release/qbs-linux-*.tar.gz
           release/qbs.*.nupkg
-          release/qbs-windows-x86-*.zip
           release/qbs-windows-x86_64-*.zip
           release/changes-*.md
           release/md5sums.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index 680d1b837..ceedef4a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -178,13 +178,13 @@ services:
         QTCREATOR_VERSION: 5.0.3
 
   windows:
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.15.0_1.18.2-0
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-6.2.4_1.24.0-0
     build:
       dockerfile: docker/windowsservercore/Dockerfile
       context: .
       args:
-        QT_VERSION: 5.15.0
-        QBS_VERSION: 1.18.2
+        QT_VERSION: 6.2.4
+        QTCREATOR_VERSION: 9.0.1
     working_dir: 'C:/qbs'
     environment:
       - BUILD_OPTIONS
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile
index 0909d81f2..8fce9fa59 100644
--- a/docker/windowsservercore/Dockerfile
+++ b/docker/windowsservercore/Dockerfile
@@ -6,7 +6,7 @@ LABEL Description="Windows Server Core development environment for Qbs with Qt,
 RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f
 RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d 1 /f
 
-# Install VS from the website since chocolatey has broken .NET 4.8 (dotnetfx package) which is a
+# Install VS 2019 from the website since chocolatey has broken .NET 4.8 (dotnetfx package) which is a
 # dependency for the visualstudio2019buildtools package
 RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \
     Invoke-WebRequest "https://aka.ms/vs/16/release/vs_community.exe" \
@@ -14,18 +14,17 @@ RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \
 
 RUN "%TEMP%\vs_community.exe"  --quiet --wait --norestart --noUpdateInstaller \
     --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
-    --add Microsoft.VisualStudio.Component.Windows10SDK.18362
+    --add Microsoft.VisualStudio.Component.Windows10SDK.20348
 
 RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \
     $Env:chocolateyVersion = '0.10.15' ; \
     $Env:chocolateyUseWindowsCompression = 'false' ; \
     "[Net.ServicePointManager]::SecurityProtocol = \"tls12, tls11, tls\"; iex ((New-Object System.Net.WebClient).DownloadString('http://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
 
-ARG QBS_VERSION
-RUN choco install -y python && \
+RUN choco install -y python --version 3.9 && \
     choco install -y 7zip --version 19.0 && \
     choco install -y git --version 2.24.0 --params "/GitAndUnixToolsOnPath" && \
-    choco install -y qbs --version %QBS_VERSION%
+    choco install -y vswhere
 
 # for building the documentation
 RUN pip install beautifulsoup4 lxml
@@ -42,13 +41,14 @@ RUN certutil -generateSSTFromWU roots.sst && \
 ARG QT_VERSION
 COPY scripts/install-qt.sh install-qt.sh
 
-RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win64_msvc2019_64 qtbase qtdeclarative qttools"
+RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win64_msvc2019_64 qtbase qtdeclarative qttools qt5compat"
 ENV QTDIR64=C:\\Qt\\${QT_VERSION}\\msvc2019_64
 
-RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win32_msvc2019 qtbase qtdeclarative qttools"
-ENV QTDIR=C:\\Qt\\${QT_VERSION}\\msvc2019
+########### Install Qbs #############
+ARG QTCREATOR_VERSION
+RUN bash -c "./install-qt.sh -d /c/Qt --version ${QTCREATOR_VERSION} qtcreator"
+RUN setx PATH "C:\\Qt\\Tools\\QtCreator\\bin;%PATH%"
 
 RUN qbs setup-toolchains --detect && \
     qbs setup-qt %QTDIR64%/bin/qmake.exe qt64 && \
-    qbs setup-qt %QTDIR%/bin/qmake.exe qt && \
     qbs config defaultProfile qt64
diff --git a/src/packages/chocolatey/chocolateyinstall.ps1 b/src/packages/chocolatey/chocolateyinstall.ps1
index f55d87eb9..fb763e681 100644
--- a/src/packages/chocolatey/chocolateyinstall.ps1
+++ b/src/packages/chocolatey/chocolateyinstall.ps1
@@ -9,15 +9,11 @@ ForEach ($line in (New-Object Net.WebClient).DownloadString("$qbsBaseUrl/${check
     $checksums.Add($items[1], $items[0])
 }
 
-$qbs32 = "qbs-windows-x86-$qbsVersion.zip"
 $qbs64 = "qbs-windows-x86_64-$qbsVersion.zip"
 
 Install-ChocolateyZipPackage `
     -PackageName 'qbs' `
-    -Url "$qbsBaseUrl/$qbs32" `
     -UnzipLocation "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" `
     -Url64bit "$qbsBaseUrl/$qbs64" `
-    -Checksum $checksums[$qbs32] `
-    -ChecksumType $checksumType `
     -Checksum64 $checksums[$qbs64] `
     -ChecksumType64 $checksumType