Add Visual Studio 2026 build and update libs

- OpenSSL 3.5.6
- xmlsec1 1.3.11
- zlib 1.3.2

IB-8886, IB-8845

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

.github/workflows/build.yml

@@ -14,7 +14,12 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        target: [macos, iphoneos, iphonesimulator]
+        include:
+        - target: macos
+        - target: iphoneos
+          triplet: arm64-ios
+        - target: iphonesimulator
+          triplet: arm64-x64-ios-simulator
     steps:
     - name: Checkout
       uses: actions/checkout@v6
@@ -29,39 +34,50 @@ jobs:
         sudo rm -rf /Library/Frameworks/Python.framework/Versions/3.13
         sudo rm -rf /Library/Frameworks/Python.framework/Versions/3.14
     - name: Cache
+      if: matrix.target == 'macos'
       uses: actions/cache@v5
       id: cache
       with:
         path: cache
         key: ${{ matrix.target }}-${{ hashFiles('prepare_osx_build_environment.sh') }}
+    - name: Cache vcpkg
+      if: matrix.target != 'macos'
+      uses: actions/cache@v5
+      with:
+        path: ${{ github.workspace }}/vcpkg_cache
+        key: vcpkg-${{ matrix.target }}-${{ hashFiles('vcpkg.json') }}
     - name: Build openssl
-      if: steps.cache.outputs.cache-hit != 'true'
+      if: matrix.target == 'macos' && steps.cache.outputs.cache-hit != 'true'
       run: ./prepare_osx_build_environment.sh openssl ${{ matrix.target }}
     - name: Build xmlsec
-      if: steps.cache.outputs.cache-hit != 'true'
+      if: matrix.target == 'macos' && steps.cache.outputs.cache-hit != 'true'
       run: ./prepare_osx_build_environment.sh xmlsec ${{ matrix.target }}
     - name: Move to cache
-      if: steps.cache.outputs.cache-hit != 'true'
+      if: matrix.target == 'macos' && steps.cache.outputs.cache-hit != 'true'
       run: |
         mkdir cache
         sudo mv /Library/libdigidocpp* cache
-    - name: Setup cache
-      run: sudo ln -s $PWD/cache/* /Library/
     - name: Build macOS
       if: matrix.target == 'macos'
       run: |
+        sudo ln -s $PWD/cache/* /Library/
         cmake --preset ${{ matrix.target }} -DCMAKE_BUILD_TYPE=RelWithDebInfo
         cmake --build --preset ${{ matrix.target }}
-        cmake --build --preset ${{ matrix.target }} --target test pkcs11sign embedlibs 
+        cmake --build --preset ${{ matrix.target }} --target test pkcs11sign embedlibs
         cmake --build --preset ${{ matrix.target }} --target zipdebug pkgbuild
     - name: Build ${{ matrix.target }}
       if: matrix.target != 'macos'
+      env:
+        VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
       run: |
+        export VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT
         cmake --preset ${{ matrix.target }} -DCMAKE_BUILD_TYPE=RelWithDebInfo
         cmake --build --preset ${{ matrix.target }}
-        sudo cmake --build --preset ${{ matrix.target }} --target install/strip
-        cd /Library
-        zip -q -r ${OLDPWD}/libdigidocpp.${{ matrix.target }}.zip libdigidocpp.*
+        cmake --build --preset ${{ matrix.target }} --target install/strip
+        mkdir -p libdigidocpp.${{ matrix.target }}/include
+        cp build/${{ matrix.target }}/vcpkg_installed/${{ matrix.triplet }}/lib/{libcrypto,libssl}.a libdigidocpp.${{ matrix.target }}/lib/
+        cp -r build/${{ matrix.target }}/vcpkg_installed/${{ matrix.triplet }}/include/openssl libdigidocpp.${{ matrix.target }}/include/
+        zip -q -r libdigidocpp.${{ matrix.target }}.zip libdigidocpp.${{ matrix.target }}
     - name: Archive artifacts
       uses: actions/upload-artifact@v6
       with:
@@ -88,14 +104,16 @@ jobs:
       uses: actions/cache@v5
       with:
         path: ${{ github.workspace }}/vcpkg_cache
-        key: vcpkg-${{ matrix.target }}-${{ hashFiles('vcpkg.json', 'vcpkg-ports/**') }}
+        key: vcpkg-${{ matrix.target }}-${{ hashFiles('vcpkg.json') }}
     - name: Build
       env:
         VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
       run: |
         export VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT
         export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME
         export ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME
+        git -C $VCPKG_INSTALLATION_ROOT fetch origin f77737496dabd44c63ecc599dc0f4d6cff30d0d5
+        git -C $VCPKG_INSTALLATION_ROOT reset --hard f77737496dabd44c63ecc599dc0f4d6cff30d0d5
         cmake --preset ${{ matrix.target }} "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo
         cmake --build --preset ${{ matrix.target }}
         cmake --build --preset ${{ matrix.target }} --target install/strip
@@ -151,6 +169,9 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
+        for f in /etc/apt/sources.list /etc/apt/sources.list.d/*.list /etc/apt/sources.list.d/*.sources; do
+          [ -f "$f" ] && sed -i 's|http://archive.ubuntu.com|http://azure.archive.ubuntu.com|g; s|http://security.ubuntu.com|http://azure.archive.ubuntu.com|g' "$f"
+        done
         echo 'path-exclude=/usr/share/man/*'      >  /etc/dpkg/dpkg.cfg.d/99-nodocs
         echo 'path-exclude=/usr/share/doc/*'      >> /etc/dpkg/dpkg.cfg.d/99-nodocs
         echo 'path-exclude=/usr/share/doc-base/*' >> /etc/dpkg/dpkg.cfg.d/99-nodocs
@@ -175,10 +196,10 @@ jobs:
         path: libdigidocpp*.*
   windows:
     name: Build on Windows
-    runs-on: windows-2025
+    runs-on: windows-2025${{ matrix.toolset == '145' && '-vs2026' || '' }}
     strategy:
       matrix:
-        toolset: [143]
+        toolset: [143, 145]
         platform: [x86, x64, arm64]
         include:
         - platform: x86
@@ -200,7 +221,7 @@ jobs:
       uses: actions/cache@v5
       with:
         path: ${{ github.workspace }}/vcpkg_cache
-        key: vcpkg-${{ matrix.toolset }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json', 'vcpkg-ports/**') }}
+        key: vcpkg-${{ matrix.toolset }}-${{ matrix.platform }}-${{ hashFiles('vcpkg.json') }}
     - name: Install dependencies
       run: winget install --silent --accept-source-agreements --accept-package-agreements swig doxygen 9NQ7512CXL7T
     - uses: actions/setup-java@v5
@@ -213,8 +234,9 @@ jobs:
       run: |
         & "$env:LOCALAPPDATA\Microsoft\WindowsApps\py.exe" install --target=.\python\${{ matrix.platform }} 3.13-${{ matrix.python }}
         $swig = (Get-Item "$env:LOCALAPPDATA\Microsoft\WinGet\Links\swig.exe").Target
-        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" ${{ matrix.setenv }} "&&" pwsh build.ps1 `
-          -vcpkg "C:/vcpkg/vcpkg.exe" `
+        $vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath
+        & "$vsPath\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.setenv }} "&&" pwsh build.ps1 `
+          -vcpkg "C:/vcpkg" `
           -swig $swig `
           -doxygen "C:/Program files/doxygen/bin/doxygen.exe" `
           -boost `

CMakeLists.txt

@@ -5,7 +5,7 @@ endif()
 if(POLICY CMP0177)
     cmake_policy(SET CMP0177 NEW)
 endif()
-project(libdigidocpp VERSION 4.4.0
+project(libdigidocpp VERSION 4.5.0
     DESCRIPTION "C++ library for digital signatures and validation of digitally signed documents"
     HOMEPAGE_URL https://github.com/open-eid/libdigidocpp
 )

CMakePresets.json

@@ -36,23 +36,24 @@
       "inherits": "default",
       "installDir": "$env{DEST}",
       "environment": {
-        "DEST": "libdigidocpp$env{DEST_SUFFIX}",
+        "DEST": "${sourceDir}/libdigidocpp$env{DEST_SUFFIX}",
         "DEST_SUFFIX": ".${presetName}"
       },
       "cacheVariables": {
         "CMAKE_DISABLE_FIND_PACKAGE_Boost": "YES",
         "CMAKE_DISABLE_FIND_PACKAGE_Doxygen": "YES",
-        "BUILD_TOOLS": "NO"
+        "BUILD_TOOLS": "NO",
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
       }
     },
     {
       "name": "ios",
       "hidden": true,
-      "inherits": ["macos", "mobile"],
+      "inherits": ["mobile","macos"],
       "cacheVariables": {
         "CMAKE_SYSTEM_NAME": "iOS",
         "CMAKE_OSX_SYSROOT": "${presetName}",
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "15.0",
+        "CMAKE_OSX_DEPLOYMENT_TARGET": "16.0",
         "CMAKE_DISABLE_FIND_PACKAGE_SWIG": "YES",
         "FRAMEWORK_DESTINATION": "$env{DEST}/lib"
       }
@@ -62,20 +63,25 @@
       "inherits": "ios",
       "description": "This iphoneos build is only available on macOS",
       "cacheVariables": {
-        "CMAKE_OSX_ARCHITECTURES": "arm64"
+        "CMAKE_OSX_ARCHITECTURES": "arm64",
+        "VCPKG_TARGET_TRIPLET": "arm64-ios"
       }
     },
     {
       "name": "iphonesimulator",
       "inherits": "ios",
-      "description": "This iphonesimulator build is only available on macOS"
+      "description": "This iphonesimulator build is only available on macOS",
+      "cacheVariables": {
+        "VCPKG_TARGET_TRIPLET": "arm64-x64-ios-simulator"
+      }
     },
     {
       "name": "iphonecatalyst",
       "inherits": "ios",
       "description": "This iphonecatalyst build is only available on macOS",
       "cacheVariables": {
-        "CMAKE_OSX_SYSROOT": "macosx"
+        "CMAKE_OSX_SYSROOT": "macosx",
+        "VCPKG_TARGET_TRIPLET": "arm64-x64-ios-catalyst"
       }
     },
     {
@@ -86,8 +92,7 @@
         "CMAKE_SYSTEM_NAME": "Android",
         "CMAKE_SYSTEM_VERSION": "30",
         "CMAKE_DISABLE_FIND_PACKAGE_Python3": "YES",
-        "BUILD_SHARED_LIBS": "NO",
-        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        "BUILD_SHARED_LIBS": "NO"
       }
     },
     {
@@ -116,6 +121,17 @@
         "CMAKE_ANDROID_ARCH_ABI": "x86_64",
         "VCPKG_TARGET_TRIPLET": "x64-android"
       }
+    },
+    {
+      "name": "windows",
+      "displayName": "Windows",
+      "binaryDir": "${sourceDir}/build/windows-$env{PLATFORM}",
+      "cacheVariables": {
+        "CMAKE_INSTALL_BINDIR": ".",
+        "CMAKE_INSTALL_LIBDIR": ".",
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+        "VCPKG_TARGET_TRIPLET": "$env{PLATFORM}-windows"
+      }
     }
   ],
   "buildPresets":
@@ -147,6 +163,10 @@
     {
       "name": "androidx86_64",
       "configurePreset": "androidx86_64"
+    },
+    {
+      "name": "windows",
+      "configurePreset": "windows"
     }
   ]
 }

build.ps1

@@ -3,16 +3,15 @@ param(
   [string]$libdigidocpp = $PSScriptRoot,
   [string]$platform = $env:PLATFORM,
   [string]$build_number = $(if ($null -eq $env:BUILD_NUMBER) {"0"} else {$env:BUILD_NUMBER}),
-  [string]$msiversion = "4.4.0.$build_number",
+  [string]$msiversion = (Select-String -Path "$libdigidocpp/CMakeLists.txt" -Pattern 'project\(\w+ VERSION (\S+)').Matches[0].Groups[1].Value + ".$build_number",
   [string]$msi_name = "libdigidocpp-$msiversion$env:VER_SUFFIX.$platform.msi",
   [string]$git = "git.exe",
-  [string]$vcpkg = "vcpkg\vcpkg.exe",
-  [string]$vcpkg_dir = (split-path -parent $vcpkg),
-  [string]$vcpkg_installed = $libdigidocpp,
-  [string]$vcpkg_installed_platform = "$vcpkg_installed\vcpkg_installed_$platform",
+  [string]$vcpkg = $env:VCPKG_ROOT,
+  [string]$vcpkg_installed = $null,
+  [string]$vcpkg_installed_platform = $(if($vcpkg_installed) { "$vcpkg_installed\vcpkg_installed_$platform" } else { "$libdigidocpp\build\windows-$platform\vcpkg_installed" }),
   [string]$vcpkg_triplet = "$platform-windows",
+  [string]$installdir = "$libdigidocpp\build\windows-$platform\install",
   [string]$cmake = "cmake.exe",
-  [string]$generator = "NMake Makefiles",
   [string]$swig = $null,
   [string]$doxygen = $null,
   [switch]$boost = $false,
@@ -29,8 +28,9 @@ Catch {
 }
 
 if(!(Test-Path -Path $vcpkg)) {
-  & $git clone https://github.com/microsoft/vcpkg $vcpkg_dir
-  & $vcpkg_dir\bootstrap-vcpkg.bat
+  $vcpkg = "$libdigidocpp\vcpkg"
+  & $git clone https://github.com/microsoft/vcpkg $vcpkg
+  & $vcpkg\bootstrap-vcpkg.bat
 }
 
 $cmakeext = @()
@@ -54,21 +54,19 @@ if($python) {
   $cmakeext += "-DPython3_ROOT_DIR=$python/$platform"
   $wixext += "-d", "python=1"
 }
+if($vcpkg_installed) {
+  $cmakeext += "-DVCPKG_INSTALLED_DIR=$vcpkg_installed_platform"
+}
+$env:PLATFORM = $platform
+$env:VCPKG_ROOT = $vcpkg
 
+Push-Location $libdigidocpp
+& $cmake --fresh --preset windows "-GNinja Multi-Config" $cmakeext "-DCMAKE_INSTALL_PREFIX=$installdir" "-DSIGNCERT=$sign"
 foreach($type in @("Debug", "RelWithDebInfo")) {
-  $buildpath = $platform+$type
-  & $cmake --fresh -B $buildpath -S $libdigidocpp "-G$generator" $cmakeext `
-    "-DCMAKE_BUILD_TYPE=$type" `
-    "-DCMAKE_INSTALL_PREFIX=$platform" `
-    "-DCMAKE_INSTALL_BINDIR=." `
-    "-DCMAKE_INSTALL_LIBDIR=." `
-    "-DCMAKE_TOOLCHAIN_FILE=$vcpkg_dir/scripts/buildsystems/vcpkg.cmake" `
-    "-DVCPKG_INSTALLED_DIR=$vcpkg_installed_platform" `
-    "-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet" `
-    "-DSIGNCERT=$sign"
-  & $cmake --build $buildpath --target $target
-  & $cmake --install $buildpath
+  & $cmake --build --preset windows --config $type --target $target
+  & $cmake --build --preset windows --config $type --target install
 }
+Pop-Location
 
 if($sign) {
   & signtool.exe sign /a /v /s MY /n "$sign" /fd SHA256 /du http://installer.id.ee `
@@ -77,7 +75,7 @@ if($sign) {
     $vcpkg_installed_platform/$vcpkg_triplet/debug/bin/*.dll
 }
 
-$docLocation = "$(Get-Location)/$platform/share/doc/libdigidocpp"
+$docLocation = "$installdir/share/doc/libdigidocpp"
 if (Test-Path -Path $docLocation -PathType Container) {
   $wixext += "-d", "docLocation=$docLocation"
 }
@@ -88,7 +86,7 @@ if (Test-Path -Path $docLocation -PathType Container) {
   -bv "WixUIDialogBmp=$libdigidocpp/dlgbmp.bmp" `
   -d "ICON=$libdigidocpp/ID.ico" `
   -d "vcpkg=$vcpkg_installed_platform/$vcpkg_triplet" `
-  -d "libdigidocpp=$(Get-Location)/$platform" `
+  -d "libdigidocpp=$installdir" `
   $libdigidocpp\libdigidocpp.wxs
 
 if($sign) {