From 4f7bed572af38862faf2d0567a018c89ab944610 Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 18 May 2026 11:34:27 +0200
Subject: [PATCH 1/3] Make sure it's compatible with Windows VS 2026

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0fa5767..c6f6e2b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -7,7 +7,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: windows-2025-vs2026
     strategy:
       fail-fast: false
       matrix:

From 6e5b801b0bbec201270973c991cc96c2054804bc Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 18 May 2026 13:23:47 +0200
Subject: [PATCH 2/3] Upgrade libiconv to 1.19-1

---
 .github/workflows/windows.yml | 2 +-
 libiconv                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c6f6e2b..4c5aa9b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -163,7 +163,7 @@ jobs:
       - name: Bundle release
         run: |
           # Update versions in case you changed submodules tags
-          $iconvVer = "1.18-1"
+          $iconvVer = "1.19-1"
           $xmlVer = "2.11.9-3"
           $xsltVer = "1.1.39"
           $zlibVer = "1.3.1"
diff --git a/libiconv b/libiconv
index 880a1fa..accac41 160000
--- a/libiconv
+++ b/libiconv
@@ -1 +1 @@
-Subproject commit 880a1fa8b5581e37e136a7b051947d3ea39097b6
+Subproject commit accac417318a3eef7402685a268cab8037e62ba1

From e0d5989eeb38e788e2808afd3d230552a737c4cd Mon Sep 17 00:00:00 2001
From: Amin Solhizadeh <amin.solhizadeh@gmail.com>
Date: Mon, 18 May 2026 14:31:11 +0200
Subject: [PATCH 3/3] Change MSVC17 to MSVC18

---
 .github/workflows/windows.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 4c5aa9b..f93fb8d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -71,7 +71,7 @@ jobs:
             $platform = "ARM64"
           }
 
-          Set-Location .\libiconv\MSVC17
+          Set-Location .\libiconv\MSVC18
           msbuild libiconv_static\libiconv_static.vcxproj /p:Configuration=Release /p:Platform=$platform /p:WindowsTargetPlatformVersion=10.0
           if ($LASTEXITCODE -ne 0) {
             exit $LASTEXITCODE
@@ -84,7 +84,7 @@ jobs:
           if ($env:MATRIX_ARCH -eq 'amd64_arm64') {
             $platDir = "ARM64"
           }
-          $iconvLib = Join-Path $env:GITHUB_WORKSPACE "libiconv\MSVC17\$platDir\lib"
+          $iconvLib = Join-Path $env:GITHUB_WORKSPACE "libiconv\MSVC18\$platDir\lib"
           $iconvInc = Join-Path $env:GITHUB_WORKSPACE libiconv\source\include
           Write-Output "ICONV_LIB=$iconvLib" | Out-File -FilePath $env:GITHUB_ENV -Append
           Write-Output "ICONV_INC=$iconvInc" | Out-File -FilePath $env:GITHUB_ENV -Append