Fix Windows build on CI (#710)

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

.azure-pipelines.yml

@@ -139,21 +139,33 @@ stages:
       timeoutInMinutes: 120
       pool:
         vmImage: windows-2019
+      variables:
+      - name: VCPKG_DEFAULT_BINARY_CACHE
+        value: $(Build.BinariesDirectory)/vcpkg_archives
+      - name: VCPKG_LIBS_TO_INSTALL
+        value: 'giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango'
       steps:
         - script: |
+            md "$(VCPKG_DEFAULT_BINARY_CACHE)"
+            vcpkg install $(VCPKG_LIBS_TO_INSTALL) --triplet x86-windows
+            vcpkg install $(VCPKG_LIBS_TO_INSTALL) --triplet x64-windows
             vcpkg integrate install
-            vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango --triplet x86-windows
-            vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango --triplet x64-windows
           displayName: 'Install Windows dependencies'
 
-        - task: MSBuild@1
+        - task: Cache@2
+          displayName: Cache vcpkg binaries
+          inputs:
+            key: '$(VCPKG_LIBS_TO_INSTALL) | $(Agent.OS)'
+            path: '$(VCPKG_DEFAULT_BINARY_CACHE)'
+
+        - task: VSBuild@1
           displayName: 'Build libgdiplus x86'
           inputs:
             solution: libgdiplus.sln
             platform: Win32
             configuration: Release
 
-        - task: MSBuild@1
+        - task: VSBuild@1
           displayName: 'Build libgdiplus x64'
           inputs:
             solution: libgdiplus.sln

src/libgdiplus.vcxproj

@@ -22,9 +22,9 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{BE724C6E-BF07-4B3E-901B-7584BC7B6C8A}</ProjectGuid>
     <RootNamespace>libgdiplus</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
@@ -91,6 +91,11 @@
       <!-- FIXME: To align with the GDI+ calling convention, this should be StdCall. Only relevant on x86 -->
       <CallingConvention>Cdecl</CallingConvention>
       <AdditionalIncludeDirectories>$(ProjectDir)..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <!-- Workaround for https://github.com/microsoft/vcpkg/issues/17702 -->
+      <AdditionalIncludeDirectories Condition="'$(_ZVcpkgCurrentInstalledDir)' != ''">%(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)\include\glib-2.0;$(_ZVcpkgCurrentInstalledDir)\lib\glib-2.0\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(_ZVcpkgCurrentInstalledDir)' != ''">%(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)\include\pango-1.0</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(_ZVcpkgCurrentInstalledDir)' != ''">%(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)\include\cairo</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(_ZVcpkgCurrentInstalledDir)' != ''">%(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)\include\harfbuzz</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -110,4 +115,4 @@
     <None Include="*.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>