Revert "GitHub Actions: Use preinstalled dependencies on Windows"

This reverts commit 8e766a6,
to fix our Windows GitHub actions.

Author: Al2Klimov

doc/win-dev.ps1

@@ -70,26 +70,43 @@ try {
 	$Env:Path += $ChocoPath
 }
 
-# GitHub Actions uses an image that comes with most dependencies preinstalled. Don't install them twice.
-if (-not $Env:GITHUB_ACTIONS) {
-    choco install -y `
-        "visualstudio${VsVersion}community" `
-        "visualstudio${VsVersion}-workload-vctools" `
-        "visualstudio${VsVersion}-workload-manageddesktop" `
-        "visualstudio${VsVersion}-workload-nativedesktop" `
-        "visualstudio${VsVersion}-workload-universal" `
-        "visualstudio${VsVersion}buildtools" `
-        git `
-        cmake `
-        winflexbison3 `
-        netfx-4.6-devpack `
-        windows-sdk-8.1 `
-        wixtoolset
-    ThrowOnNativeFailure
-} else {
-    choco install -y winflexbison3
-    ThrowOnNativeFailure
-}
+
+choco install -y "visualstudio${VsVersion}community"
+ThrowOnNativeFailure
+
+choco install -y "visualstudio${VsVersion}-workload-vctools"
+ThrowOnNativeFailure
+
+choco install -y "visualstudio${VsVersion}-workload-manageddesktop"
+ThrowOnNativeFailure
+
+choco install -y "visualstudio${VsVersion}-workload-nativedesktop"
+ThrowOnNativeFailure
+
+choco install -y "visualstudio${VsVersion}-workload-universal"
+ThrowOnNativeFailure
+
+choco install -y "visualstudio${VsVersion}buildtools"
+ThrowOnNativeFailure
+
+
+choco install -y git
+ThrowOnNativeFailure
+
+choco install -y cmake
+ThrowOnNativeFailure
+
+choco install -y netfx-4.6-devpack
+ThrowOnNativeFailure
+
+choco install -y winflexbison3
+ThrowOnNativeFailure
+
+choco install -y windows-sdk-8.1
+ThrowOnNativeFailure
+
+choco install -y wixtoolset
+ThrowOnNativeFailure
 
 # Disable the progress bar for downloads from the Web, which will speed up the entire download process
 $Global:ProgressPreference = 'SilentlyContinue';

tools/win32/load-vsenv.ps1

@@ -29,9 +29,8 @@ if (Test-Path env:BITS) {
 
 # Execute vcvars in cmd and store env
 $vcvars_locations = @(
-  "${VSBASE}\BuildTools\VC\Auxiliary\Build\vcvars${bits}.bat"
+  "${VSBASE}\BuildTools\VC\Auxiliary\Build\vcvars${bits}.bat",
   "${VSBASE}\Community\VC\Auxiliary\Build\vcvars${bits}.bat"
-  "${VSBASE}\Enterprise\VC\Auxiliary\Build\vcvars${bits}.bat"
 )
 
 $vcvars = $null