Fix CI (#548)

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
             msbuild_Configuration: Release
             msbuild_Platform: Win32
             msbuild_PlatformToolset: v142
-            msbuild_WindowsTargetPlatformVersion: 8.1
+            msbuild_WindowsTargetPlatformVersion: 10.0
 
           - target: win64
             runner: windows-2019 # has VS2019 preinstalled which supports PlatformToolset <= v142, WindowsTargetPlatformVersion 10
@@ -50,7 +50,7 @@ jobs:
             msbuild_Configuration: Release
             msbuild_Platform: x64
             msbuild_PlatformToolset: v142
-            msbuild_WindowsTargetPlatformVersion: 8.1
+            msbuild_WindowsTargetPlatformVersion: 10.0
 
     steps:
     - name: "SCM Checkout"
@@ -60,19 +60,11 @@ jobs:
       if: startsWith(matrix.target, 'win')
       run: choco install visualstudio2019buildtools visualstudio2019-workload-vctools
 
-    - name: "Install: Windows 8.1 SDK"
-      shell: powershell
-      if: startsWith(matrix.target, 'win')
-      # https://github.com/actions/virtual-environments/issues/842#issuecomment-643382166
-      run: |
-        Invoke-WebRequest -Method Get -Uri https://go.microsoft.com/fwlink/p/?LinkId=323507 -OutFile sdksetup.exe -UseBasicParsing
-        Start-Process -Wait sdksetup.exe -ArgumentList "/q", "/norestart", "/features", "OptionId.WindowsDesktopSoftwareDevelopmentKit", "OptionId.NetFxSoftwareDevelopmentKit"
-
     - name: Add msbuild to PATH
       if: startsWith(matrix.target, 'win')
       uses: microsoft/[email protected]
       with:
-        vs-version: '[15.0,16.0)'
+        vs-version: '[16.0,17.0)'
 
     - name: "Install: Required Dev Packages"
       run: |

CMakeLists.txt

@@ -8,6 +8,7 @@ set(HL_VERSION ${HL_VERSION_MAJOR}.${HL_VERSION_MINOR}.${HL_VERSION_PATCH})
 cmake_policy(SET CMP0042 NEW)
 
 if(WIN32)
+    set(CMAKE_SYSTEM_VERSION 10.0)
     project(hashlink C CXX) # C++ required for directx
 else()
     project(hashlink C)
@@ -142,7 +143,7 @@ add_executable(hl
     src/main.c
     src/module.c
     src/debugger.c
-	src/profile.c
+    src/profile.c
 )
 
 if (UNIX AND NOT APPLE)

azure-pipelines.yml

@@ -36,18 +36,20 @@ stages:
       - template: other/azure-pipelines/build-windows.yml
         parameters:
           name: Windows64_CMake
-          vmImage: 'windows2019'
+          vmImage: 'windows-2019'
           buildSystem: cmake
-          cmakeGenerator: 'Visual Studio 16 2019 Win64'
+          cmakeGenerator: 'Visual Studio 16 2019'
+
       - template: other/azure-pipelines/build-windows.yml
         parameters:
           name: Windows32_CMake
-          vmImage: 'windows2019'
+          vmImage: 'windows-2019'
           buildSystem: cmake
           cmakeGenerator: 'Visual Studio 16 2019'
+          architecture: 'Win32'
 
       - template: other/azure-pipelines/build-windows.yml
         parameters:
           name: Windows_VS
-          vmImage: 'windows2019'
+          vmImage: 'windows-2019'
           buildSystem: vs

hl.vcxproj

@@ -30,7 +30,7 @@
     <ProjectGuid>{BBF750D2-6DD2-4A41-AC3A-07C070B94FA1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>hl</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libhl.vcxproj

@@ -30,7 +30,7 @@
     <ProjectGuid>{C6213FBF-BC2B-4235-A827-84A60E848C52}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libhl</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/directx/directx.vcxproj

@@ -35,7 +35,7 @@
     <ProjectGuid>{EC79BC9F-9947-4BCC-92F9-14F90CDE4B04}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>directx</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/fmt/fmt.vcxproj

@@ -176,7 +176,7 @@
     <ProjectGuid>{7DDA1414-6675-45C7-8254-42057901F865}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>jpg</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>fmt</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

libs/mysql/mysql.vcxproj

@@ -43,7 +43,7 @@
     <ProjectGuid>{540E0E11-B7B1-43F8-B107-0867B2D97F74}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>mysql</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/openal/openal.vcxproj

@@ -30,7 +30,7 @@
     <ProjectGuid>{EC2DCE5C-267A-4050-8DDE-5BF58FF08E31}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>openal</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/sdl/sdl.vcxproj

@@ -30,7 +30,7 @@
     <ProjectGuid>{12049F27-EA26-4A33-ADF8-E542C4167C00}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>sdl</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/sqlite/sqlite.vcxproj

@@ -30,7 +30,7 @@
     <ProjectGuid>{43AAD9DB-4708-46B6-AAE8-A5DB95A0B573}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>sqlite</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/ssl/ssl.vcxproj

@@ -103,7 +103,7 @@
     <ProjectGuid>{F4D939D6-88D6-4FF2-874A-7BECF75A01C2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ui</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/ui/ui.vcxproj

@@ -30,7 +30,7 @@
     <ProjectGuid>{6534D221-34DF-404A-AFCD-6DEC9BBC9798}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ui</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

libs/uv/uv.vcxproj

@@ -30,7 +30,7 @@
     <ProjectGuid>{76E4DB00-8114-4B96-BA76-39D800F8D5EE}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>uv</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

other/azure-pipelines/build-windows.yml

@@ -2,6 +2,7 @@ parameters:
   name: 'BuildWindows'
   vmImage: ''
   buildSystem: 'cmake' # either 'cmake' or 'vs'
+  architecture: 'x64' # either 'x64' or 'Win32'
   cmakeGenerator: ''
   cmakeConfig: 'RelWithDebInfo'
 
@@ -10,18 +11,13 @@ jobs:
     pool:
       vmImage: ${{ parameters.vmImage }}
     variables:
-      ${{ if endsWith(parameters.cmakeGenerator, 'Win64') }}:
+      ${{ if eq(parameters.architecture, 'x64') }}:
         MARCH: 64
         FFMPEG_URL: https://github.com/HaxeFoundation/hashlink/files/5648056/ffmpeg-3.4.2-win64-dev.zip
-      ${{ if not(endsWith(parameters.cmakeGenerator, 'Win64')) }}:
+      ${{ if eq(parameters.architecture, 'Win32') }}:
         MARCH: 32
         FFMPEG_URL: https://github.com/HaxeFoundation/hashlink/files/5648055/ffmpeg-3.4.2-win32-dev.zip
     steps:
-      - ${{ if eq(parameters.vmImage, 'windows2019') }}:
-        - powershell: |
-            Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-            Write-Host "##vso[task.prependpath]C:\ProgramData\chocolatey\bin"
-          displayName: Install Chocolatey
       - powershell: |
           Invoke-WebRequest https://www.libsdl.org/release/SDL2-devel-2.0.5-VC.zip -OutFile SDL.zip
           Expand-Archive SDL.zip -DestinationPath .
@@ -55,7 +51,7 @@ jobs:
           haxelib list
         displayName: Install hashlink haxelib
       - ${{ if eq(parameters.buildSystem, 'cmake') }}:
-        - script: cmake . -G "${{ parameters.cmakeGenerator }}"
+        - script: cmake . -G "${{ parameters.cmakeGenerator }}" -A ${{ parameters.architecture }}
           displayName: CMake
         - script: cmake --build . --config ${{ parameters.cmakeConfig }}
           displayName: Build
@@ -66,7 +62,7 @@ jobs:
         - task: PublishPipelineArtifact@1
           inputs:
             artifactName: ${{ parameters.name }}Binaries
-            targetPath: bin/hashlink-1.13.0-win$(MARCH).zip
+            targetPath: bin/hashlink-1.12.0-win$(MARCH).zip
       - ${{ if eq(parameters.buildSystem, 'vs') }}:
         - task: MSBuild@1
           inputs: