Provisioning: Update MSVC 2019 version to 16.11.18 in Tier 1

Older version seems to have issues with installer when updating
the visual studio and buildtools versions through installer via
command line.

Task-number: QTQAINFRA-5090
Pick-to: 6.4 6.3 6.2 5.15
Change-Id: Iaec5391ed7bc9780374a7f971624522dae2feee6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

2 files changed, 6 insertions, 48 deletions

diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 0fbc300c..c8a454eb 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -54,7 +54,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
         'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
 -
-    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Template: 'qtci-windows-11_21H2-x86_64-52'
     Compiler: 'MSVC2019'
     Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -73,7 +73,7 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
     ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Template: 'qtci-windows-11_21H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -110,7 +110,7 @@ Configurations:
     ]
 -
     Id: 'Windows11_21H2-MSVC2019-x64-host'
-    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Template: 'qtci-windows-11_21H2-x86_64-52'
     Compiler: 'MSVC2019'
     Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
     Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
@@ -119,7 +119,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
     ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Template: 'qtci-windows-11_21H2-x86_64-52'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
     Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
@@ -182,7 +182,7 @@ Configurations:
     ]
 -
     Id: 'Windows11_21H2-LLVM-x64-host'
-    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Template: 'qtci-windows-11_21H2-x86_64-52'
     Compiler: 'Clang'
     Features: ['Sccache', 'UseConfigure']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
@@ -204,7 +204,7 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
     ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Template: 'qtci-windows-11_21H2-x86_64-52'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
     Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/97-msvc2019.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/97-msvc2019.ps1
deleted file mode 100644
index 4f048086..00000000
--- a/coin/provisioning/qtci-windows-11_21H2-x86_64/97-msvc2019.ps1
+++ /dev/null
@@ -1,42 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with:
-. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1"
-