From da1637a219cfb4602e4130da7d42b0da800946c0 Mon Sep 17 00:00:00 2001 From: Tyrie Vella Date: Mon, 2 Dec 2024 16:23:22 -0800 Subject: [PATCH] Replace x64 check installer with x64compatible PR #1815 updated the installer dependency version, which seems to have caused the installer to enforce the AllowedArchitectures=x64 check (which has been there for years). We've received complaints from users that the latest release refuses to install on their ARM machines, but previous versions did and worked fine with the default x86/64 emulation. The latest version of Innosetup adds x64compatible option for the AllowedArchitectures and ArchitecturesInstallIn64BitMode to address the case of x64 emulation on ARM. --- GVFS/GVFS.Installers/GVFS.Installers.csproj | 2 +- GVFS/GVFS.Installers/Setup.iss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GVFS/GVFS.Installers/GVFS.Installers.csproj b/GVFS/GVFS.Installers/GVFS.Installers.csproj index 44c166d56..bf0c5ec7f 100644 --- a/GVFS/GVFS.Installers/GVFS.Installers.csproj +++ b/GVFS/GVFS.Installers/GVFS.Installers.csproj @@ -12,7 +12,7 @@ - + diff --git a/GVFS/GVFS.Installers/Setup.iss b/GVFS/GVFS.Installers/Setup.iss index 109f4f45b..886da1042 100644 --- a/GVFS/GVFS.Installers/Setup.iss +++ b/GVFS/GVFS.Installers/Setup.iss @@ -39,8 +39,8 @@ MinVersion=10.0.14374 DisableDirPage=yes DisableReadyPage=yes SetupIconFile="{#LayoutDir}\GitVirtualFileSystem.ico" -ArchitecturesInstallIn64BitMode=x64 -ArchitecturesAllowed=x64 +ArchitecturesInstallIn64BitMode=x64compatible +ArchitecturesAllowed=x64compatible WizardImageStretch=no WindowResizable=no CloseApplications=yes