Skip to content

Commit

Permalink
Windows: install the required .NET runtime during the installation pr…
Browse files Browse the repository at this point in the history
…ocess instead of including the runtime twice in the release (#2184) #minor
  • Loading branch information
IhateTrains authored Sep 14, 2024
1 parent 14bc5c8 commit 04a8822
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ jobs:
with:
fronter_dir: 'Fronter.NET'
release_dir: 'Publish'
self_contained: ${{ matrix.build != 'win-x64' }} # InnoSetup takes care of installing the .NET runtime on Windows.
build_updater: ${{ matrix.build != 'win-x64' }} # Windows release uses InnoSetup instead.
env:
BACKBLAZE_KEY_ID: ${{ secrets.BACKBLAZE_KEY_ID }}
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
path = Fronter.NET
url = https://github.com/ParadoxGameConverters/Fronter.NET

[submodule "InnoDependencyInstaller"]
path = InnoDependencyInstaller
url = https://github.com/IhateTrains/InnoDependencyInstaller.git
branch = NET-9
15 changes: 15 additions & 0 deletions ImperatorToCK3.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!


#define public Dependency_Path_NetCoreCheck "InnoDependencyInstaller\dependencies\"

#include "InnoDependencyInstaller\CodeDependencies.iss"

#define MyAppName "ImperatorToCK3 Converter"
#define MyAppPublisher "Paradox Game Converters Group"
#define MyAppURL "https://paradoxgameconverters.com/"
Expand Down Expand Up @@ -28,6 +33,8 @@ Compression=lzma
SolidCompression=yes
WizardStyle=modern

ArchitecturesInstallIn64BitMode=x64

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"

Expand All @@ -45,3 +52,11 @@ Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\ConverterFrontend.exe"; Ic
[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent runascurrentuser

[Code]
function InitializeSetup: Boolean;
begin
// Install .NET 9 runtime if it is not already installed.
Dependency_AddDotNet90;
Result := True;
end;
3 changes: 1 addition & 2 deletions ImperatorToCK3/Properties/PublishProfiles/win-x64.pubxml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net9.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<SelfContained>false</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
<PublishReadyToRun>false</PublishReadyToRun>
<PublishReadyToRunShowWarnings>True</PublishReadyToRunShowWarnings>
<PublishTrimmed>true</PublishTrimmed>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions InnoDependencyInstaller

0 comments on commit 04a8822

Please sign in to comment.