Enable all matrix options

Author: AlexNDRmac

.appveyor.yml

@@ -3,65 +3,65 @@ version: 1.3.5-{build}
 environment:
   matrix:
 
-    # - PHP_VERSION: 7.0
-    #   VC_VERSION: 14
-    #   BUILD_TYPE: "Win32"
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # - PHP_VERSION: 7.0
-    #   VC_VERSION: 14
-    #   BUILD_TYPE: "nts-Win32"
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # - PHP_VERSION: 7.1
-    #   VC_VERSION: 14
-    #   BUILD_TYPE: "Win32"
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # - PHP_VERSION: 7.1
-    #   VC_VERSION: 14
-    #   BUILD_TYPE: "nts-Win32"
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
-    # - PHP_VERSION: 7.2
-    #   VC_VERSION: 15
-    #   BUILD_TYPE: "Win32"
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # - PHP_VERSION: 7.2
-    #   VC_VERSION: 15
-    #   BUILD_TYPE: "nts-Win32"
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # - PHP_VERSION: 7.3
-    #   VC_VERSION: 15
-    #   BUILD_TYPE: Win32
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # - PHP_VERSION: 7.3
-    #   VC_VERSION: 15
-    #   BUILD_TYPE: nts-Win32
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # - PHP_VERSION: 7.4
-    #   VC_VERSION: 15
-    #   BUILD_TYPE: Win32
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    # - PHP_VERSION: 7.4
-    #   VC_VERSION: 15
-    #   BUILD_TYPE: nts-Win32
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - PHP_VERSION: 7.0
+      VC_VERSION: 14
+      BUILD_TYPE: "Win32"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+
+    - PHP_VERSION: 7.0
+      VC_VERSION: 14
+      BUILD_TYPE: "nts-Win32"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+
+    - PHP_VERSION: 7.1
+      VC_VERSION: 14
+      BUILD_TYPE: "Win32"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+
+    - PHP_VERSION: 7.1
+      VC_VERSION: 14
+      BUILD_TYPE: "nts-Win32"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+
+    - PHP_VERSION: 7.2
+      VC_VERSION: 15
+      BUILD_TYPE: "Win32"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    - PHP_VERSION: 7.2
+      VC_VERSION: 15
+      BUILD_TYPE: "nts-Win32"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    - PHP_VERSION: 7.3
+      VC_VERSION: 15
+      BUILD_TYPE: Win32
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    - PHP_VERSION: 7.3
+      VC_VERSION: 15
+      BUILD_TYPE: nts-Win32
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    - PHP_VERSION: 7.4
+      VC_VERSION: 15
+      BUILD_TYPE: Win32
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+
+    - PHP_VERSION: 7.4
+      VC_VERSION: 15
+      BUILD_TYPE: nts-Win32
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
     - PHP_VERSION: 8.0
       VC_VERSION: 16
       BUILD_TYPE: Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
-    # - PHP_VERSION: 8.0
-    #   VC_VERSION: 16
-    #   BUILD_TYPE: nts-Win32
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_VERSION: 8.0
+      VC_VERSION: 16
+      BUILD_TYPE: nts-Win32
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
   PHP_SDK_VERSION: 2.1.9
   # PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1
@@ -106,8 +106,9 @@ install:
 
 build_script:
   - ps: InitializeBuildVars
-  - '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%'
+  - IF EXIST '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%'
   - IF EXIST '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%'
+  - for /f "tokens=1* delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath') do call "%%i\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
   - phpsdk_setvars
   - cmd /c .ci\build-win32.bat
   - phpize

.ci/AppVeyor.psm1

@@ -28,7 +28,7 @@ Function InitializeBuildVars {
 			If (-not (Test-Path $VSInstaller)) {
 				Throw 'The VSCOMNTOOLS environment variable is not set. Check your MS VS installation'
 			}
-			$Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -products * -property installationPath)
+			$Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -property installationPath)
 			break
 		}
 		default {