Another mop up commit to add missing changes from the last mop-up.

2025-12-20 06:35:47 +00:00 · 2019-12-13 09:48:00 -05:00
parent 95d3c31f21
commit 1dcd276b1e
188 changed files with 7333 additions and 7393 deletions
--- a/images/win/scripts/Installers/Windows2016/Install-Wix.ps1
+++ b/images/win/scripts/Installers/Windows2016/Install-Wix.ps1
@@ -1,54 +1,53 @@
-################################################################################
-##  File:  Install-Wix.ps1
-##  Team:  CI-Build
-##  Desc:  Install WIX.
-################################################################################
-function Install-VsixExtension
-{
-    Param
-    (
-        [String]$Url,
-        [String]$Name
-    )
-
-    $exitCode = -1
-
-    try
-    {
-        Write-Host "Downloading $Name..."
-        $FilePath = "${env:Temp}\$Name"
-
-        Invoke-WebRequest -Uri $Url -OutFile $FilePath
-
-        $ArgumentList = ('/quiet', $FilePath)
-
-        Write-Host "Starting Install $Name..."
-        $process = Start-Process -FilePath 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VSIXInstaller.exe' -ArgumentList $ArgumentList -Wait -PassThru
-        $exitCode = $process.ExitCode
-
-        if ($exitCode -eq 0 -or $exitCode -eq 3010)
-        {
-            Write-Host -Object 'Installation successful'
-            return $exitCode
-        }
-        else
-        {
-            Write-Host -Object "Non zero exit code returned by the installation process : $exitCode."
-            return $exitCode
-        }
-    }
-    catch
-    {
-        Write-Host -Object "Failed to install the Extension $Name"
-        Write-Host -Object $_.Exception.Message
-        return -1
-    }
-}
-
-
-choco install wixtoolset -y --force
-
-#Installing VS extension 'Wix Toolset Visual Studio 2017 Extension'
-$exitCode = Install-VsixExtension -Url 'https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix' -Name 'Votive2017.vsix'
-
-return $exitCode
+################################################################################
+##  File:  Install-Wix.ps1
+##  Desc:  Install WIX.
+################################################################################
+function Install-VsixExtension
+{
+    Param
+    (
+        [String]$Url,
+        [String]$Name
+    )
+
+    $exitCode = -1
+
+    try
+    {
+        Write-Host "Downloading $Name..."
+        $FilePath = "${env:Temp}\$Name"
+
+        Invoke-WebRequest -Uri $Url -OutFile $FilePath
+
+        $ArgumentList = ('/quiet', $FilePath)
+
+        Write-Host "Starting Install $Name..."
+        $process = Start-Process -FilePath 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VSIXInstaller.exe' -ArgumentList $ArgumentList -Wait -PassThru
+        $exitCode = $process.ExitCode
+
+        if ($exitCode -eq 0 -or $exitCode -eq 3010)
+        {
+            Write-Host -Object 'Installation successful'
+            return $exitCode
+        }
+        else
+        {
+            Write-Host -Object "Non zero exit code returned by the installation process : $exitCode."
+            return $exitCode
+        }
+    }
+    catch
+    {
+        Write-Host -Object "Failed to install the Extension $Name"
+        Write-Host -Object $_.Exception.Message
+        return -1
+    }
+}
+
+
+choco install wixtoolset -y --force
+
+#Installing VS extension 'Wix Toolset Visual Studio 2017 Extension'
+$exitCode = Install-VsixExtension -Url 'https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix' -Name 'Votive2017.vsix'
+
+return $exitCode