Provisioning: MSVC 2019 update: Add Vswhere helper function

Change-Id: Idd6bf24450d9447c38c39c64abff5b55d71c12b9
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
(cherry picked from commit 37c0cf82ae)

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.4.3
+	branch = 6.4
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.4.3
+	branch = 6.4
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.4.3
+	branch = 6.4
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.4.3
+	branch = 6.4
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.4.3
+	branch = 6.4
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,68 +252,68 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.4.3
+	branch = 6.4
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.4.3
+	branch = 6.4
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.4.3
+	branch = 6.4
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.4.3
+	branch = 6.4
 	status = preview
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.4.3
+	branch = 6.4
 	status = preview
 

coin/provisioning/common/windows/update-msvc2019.ps1

@@ -73,15 +73,57 @@ function Install {
     Remove-Item -Force -Path $installerPath
 }
 
+function Get-Vswhere-Property {
+    Param (
+        [ValidateSet(2017, 2019, 2022)]
+        [int] $vsYear = $(BadParam("Visual Studio Year")),
+
+        [ValidatePattern("Professional|Build *Tools|Community|Enterprise")]
+        [string] $vsEdition = $(BadParam("Visual Studio Edition")),
+
+        [string] $property = $(BadParam("vswhere property"))
+    )
+
+    $range = switch ($vsYear)
+    {
+        2017 { "[15.0,16`)" }
+        2019 { "[16.0,17`)" }
+        2022 { "[17.0,18`)" }
+    }
+
+    $vsEdition = $vsEdition -replace " ",""
+
+    $vswhereInfo = New-Object System.Diagnostics.ProcessStartInfo
+    $vswhereInfo.FileName = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+    $vswhereInfo.RedirectStandardError = $true
+    $vswhereInfo.RedirectStandardOutput = $true
+    $vswhereInfo.UseShellExecute = $false
+    $vswhereInfo.Arguments = "-version $range", "-latest", `
+    "-products Microsoft.VisualStudio.Product.$vsEdition", "-property $property"
+    $vswhereProcess = New-Object System.Diagnostics.Process
+    $vswhereProcess.StartInfo = $vswhereInfo
+    $vswhereProcess.Start() | Out-Null
+    $vswhereProcess.WaitForExit()
+    $stdout = $vswhereProcess.StandardOutput.ReadToEnd()
+    if ([string]::IsNullOrEmpty($stdout))
+    {
+        throw "VS edition or property $property not found by vswhere"
+    }
+    $stderr = $vswhereProcess.StandardError.ReadToEnd()
+    $vsExit = $vswhereProcess.ExitCode
+    if ($vsExit -ne 0)
+    {
+        throw "vswhere failed with exit code $vsExit. stderr: $stderr"
+    }
+    return $stdout
+}
+
 Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller
 # Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller
 
-$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
+$msvc2019Version = Get-Vswhere-Property 2019 "Professional" catalog_productDisplayVersion
-    -version [16.0,17.0`) -latest -property catalog_productDisplayVersion 2`>`&1)
+$msvc2019Complete = Get-Vswhere-Property 2019 "Professional" isComplete
-$msvc2019Complete = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
+$msvc2019Launchable = Get-Vswhere-Property 2019 "Professional" isLaunchable
-    -version [16.0,17.0`) -latest -property isComplete 2`>`&1)
-$msvc2019Launchable = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
-    -version [16.0,17.0`) -latest -property isLaunchable 2`>`&1)
 
 if($msvc2019Version -ne $version -or [int]$msvc2019Complete -ne 1 `
     -or [int]$msvc2019Launchable -ne 1) {