try VS 2019

Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>

Author: hoefling

appveyor.yml

@@ -1,14 +1,14 @@
+image: Visual Studio 2019
 environment:
   matrix:
-  - Architecture: x86
-    Compiler: vs2015
+#  - Architecture: x86
   - Architecture: x64
-    Compiler: vs2015
 install:
 - cmd: git submodule update --init --recursive
-- ps: install-module pscx -scope CurrentUser -AllowClobber
 build: off
 build_script:
+- ps: $env:Path = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\;" + $env:Path
+- ps: $env:INCLUDE += ";C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt;C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include"
 - ps: >-
     $x64param = if ($env:Architecture -eq 'x64') { $true } else { $false }
     .\build.ps1 -x64:$x64param

build.ps1

@@ -13,8 +13,11 @@ Function ThrowIfError($exitCode, $module)
     }
 }
 
-$ErrorActionPreference = "Stop"
-Import-Module Pscx
+#$ErrorActionPreference = "Stop"
+
+echo $env:Path
+Get-Command nmake
+Get-Command link
 
 $x64Dir = If($x64) { "\x64" } Else { "" }
 $distname = If($x64) { "win64" } Else { "win32" }
@@ -23,9 +26,7 @@ $vcvarsarch = If($x64) { "amd64" } Else { "x86" }
 
 Set-Location $PSScriptRoot
 
-Import-VisualStudioVars -VisualStudioVersion 140 -Architecture $vcvarsarch
-
-Set-Location .\libiconv\MSVC14
+Set-Location .\libiconv\MSVC16
 msbuild libiconv.sln /p:Configuration=Release /p:Platform=$vcarch /t:libiconv_static
 ThrowIfError $LastExitCode "libiconv"
 If($x64) {
@@ -77,14 +78,15 @@ Set-Location ..
 # xmlsec
 Set-Location .\xmlsec\win32
 cscript configure.js lib="$zlibLib;$iconvLib;$xmlLib;$sslLib;$xsltLib" include="$zlibInc;$iconvInc;$xmlInc;$sslInc;$xsltInc" iconv=yes xslt=yes unicode=yes static=yes with-dl=no
+nmake xmlseca
 $p = Start-Process -NoNewWindow -Wait -PassThru nmake xmlseca
 ThrowIfError $p.ExitCode "xmlsec"
 $xmlsecLib = Join-Path (pwd) binaries
 $xmlsecInc = Join-Path (pwd) ..\include
 Set-Location ../..
 
 # Pushed by Import-VisualStudioVars
-Pop-EnvironmentBlock
+#Pop-EnvironmentBlock
 
 # Bundle releases
 Function BundleRelease($name, $lib, $inc)
@@ -99,7 +101,8 @@ Function BundleRelease($name, $lib, $inc)
     Copy-Item -Recurse $inc .\dist\$name\include
     Get-ChildItem -File -Recurse .\dist\$name\include | Where{$_.Name -NotMatch ".h$" } | Remove-Item
 
-    Write-Zip  .\dist\$name .\dist\$name.zip
+    #Write-Zip  .\dist\$name .\dist\$name.zip
+    Compress-Archive -Path .\dist\$name -DestinationPath .\dist\$name.zip
     Remove-Item -Recurse -Path .\dist\$name
 }