From c046d2b603552f516bc61694a5b42720ac960106 Mon Sep 17 00:00:00 2001 From: Matthew John Cheetham Date: Tue, 14 Jul 2026 15:02:23 +0100 Subject: [PATCH] windows: use Inno Setup 7.0.2 and x64 native installer Update to Inno Setup 7.0.2, and use the new 64-bit installer for win-x64 and win-arm64 targets, falling back to the classic 32-bit installer for win-x86 tagets. Signed-off-by: Matthew John Cheetham --- Directory.Packages.props | 2 +- build/windows/installer/Setup.iss | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 224de527e4..848fd1ed41 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -23,7 +23,7 @@ - + diff --git a/build/windows/installer/Setup.iss b/build/windows/installer/Setup.iss index ab5eb86fa4..4fafa7bac2 100644 --- a/build/windows/installer/Setup.iss +++ b/build/windows/installer/Setup.iss @@ -1,10 +1,10 @@ -; This script requires Inno Setup Compiler 6.0.0 or later to compile +; This script requires Inno Setup Compiler 7.0.0 or later to compile ; The Inno Setup Compiler (and IDE) can be found at http://www.jrsoftware.org/isinfo.php ; General documentation on how to use InnoSetup scripts: http://www.jrsoftware.org/ishelp/index.php ; Ensure minimum Inno Setup tooling version -#if VER < EncodeVer(6,0,0) - #error Update your Inno Setup version (6.0.0 or newer) +#if VER < EncodeVer(7,0,0) + #error Update your Inno Setup version (7.0.0 or newer) #endif #ifndef PayloadDir @@ -70,6 +70,12 @@ AppUpdatesURL={#GcmUrl} AppContact={#GcmUrl} AppCopyright={#GcmCopyright} AppReadmeFile={#GcmReadme} +; We prefer to use the x64 installer for x64 and ARM64 systems +#if RuntimeIdentifier=="win-x86" +SetupArchitecture=x86 +#else +SetupArchitecture=x64 +#endif ; Windows ARM64 supports installing and running x64 binaries, but not vice versa. #if RuntimeIdentifier=="win-x64" ArchitecturesAllowed=x64compatible