From 13f618e544b0825651577a013c6691b3262d9a45 Mon Sep 17 00:00:00 2001
From: Antoine Aflalo <soundswitch+github@aaflalo.me>
Date: Fri, 2 Apr 2021 19:43:24 -0400
Subject: [PATCH] chore(installer): Move to self-contained and only x64

---
 Installer/setup.iss | 8 ++++----
 Make.bat            | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Installer/setup.iss b/Installer/setup.iss
index 01a6c32d41..d588a47d13 100644
--- a/Installer/setup.iss
+++ b/Installer/setup.iss
@@ -6,7 +6,7 @@
 #define use_msi45
 #define use_msiproduct
 
-#define use_dotnet_core '5.0.4'
+;#define use_dotnet_core '5.0.4'
 
 ;#define use_vc2017
 
@@ -49,7 +49,7 @@ RestartApplications=no
 MinVersion=6.1.7601
 PrivilegesRequired=admin
 PrivilegesRequiredOverridesAllowed=commandline dialog
-ArchitecturesAllowed=x86 x64
+ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 
 ;Downloading and installing dependencies will only work if the memo/ready page is enabled (default behaviour)
@@ -75,8 +75,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: deletefiles; Description: "{cm:ExistingSettings}"; Flags: unchecked checkedonce
 
 [Files] 
-Source: "{#ExeDir}SoundSwitch.exe"; DestDir: "{app}";  Flags: signonce
-Source: "{#ExeDir}*"; DestDir: "{app}"; Flags: recursesubdirs;
+Source: "{#ExeDir}SoundSwitch.exe"; DestDir: "{app}";  Flags: signonce ignoreversion
+Source: "{#ExeDir}*"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion;
 
 [Registry]
 Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run\{#MyAppSetupName}"; Flags: uninsdeletekey
diff --git a/Make.bat b/Make.bat
index 2c9a2590d0..4f9362aef8 100644
--- a/Make.bat
+++ b/Make.bat
@@ -23,7 +23,8 @@ if "%~1" neq "" (
 
 set FILE_DIR=%~dp0
 set FRAMEWORK=net5.0-windows
-set BIN_DIR=%FILE_DIR%SoundSwitch\bin\%buildPlatform%\%FRAMEWORK%\publish
+set ARCH=win-x64
+set BIN_DIR=%FILE_DIR%SoundSwitch\bin\%buildPlatform%\%FRAMEWORK%\%ARCH%\publish
 
 set finalDir=%FILE_DIR%Final
 
@@ -48,7 +49,7 @@ echo.
 echo Building SoundSwitch %buildPlatform%
 echo.
 echo Build AnyCPU
-dotnet publish -c %buildPlatform% || (set errorMessage=Build AnyCPU failed & goto ERROR_QUIT)
+dotnet publish -c %buildPlatform%  -r %ARCH% /p:PublishTrimmed=true %FILE_DIR%SoundSwitch\SoundSwitch.csproj || (set errorMessage=Build AnyCPU failed & goto ERROR_QUIT)
 echo.
 
 if %buildChangelogAndReadme%==1 (