Skip to content

Commit

Permalink
chore(installer): Move to self-contained and only x64
Browse files Browse the repository at this point in the history
Fixes #563
  • Loading branch information
Belphemur committed Apr 2, 2021
1 parent cc7be1d commit 3659bda
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Installer/setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions Make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 (
Expand Down

0 comments on commit 3659bda

Please sign in to comment.