Include msvc++ 14.40.33810.0 redist package in the installer. Resolve… (

#70) * Include msvc++ 14.40.33810.0 redist package in the installer. Resolves #69. * Remove setup-dotnet action for self-hosted runners.
alexhelms · Sep 29, 2024 · fb6bf35 · fb6bf35
1 parent e51068d
commit fb6bf35
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -23,9 +23,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.x
       - name: Restore Tools
         run: dotnet tool restore
       - name: Restore
@@ -46,9 +43,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.x
       - name: Restore
         run: dotnet restore ${{ env.PROJECT }}
       - name: Tools

diff --git a/.github/workflows/windows-installer.yml b/.github/workflows/windows-installer.yml
@@ -20,9 +20,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.x
       - name: Restore
         run: dotnet restore ${{ env.PROJECT }}
       - name: Tools

diff --git a/installer/VC_redist.x64.exe b/installer/VC_redist.x64.exe
diff --git a/lumidex-installer-win.iss b/lumidex-installer-win.iss
@@ -25,7 +25,7 @@ DisableDirPage=yes
 ArchitecturesAllowed=x64compatible
 ArchitecturesInstallIn64BitMode=x64compatible
 DisableProgramGroupPage=yes
-PrivilegesRequired=lowest
+PrivilegesRequired=admin
 OutputDir=dist/win
 OutputBaseFilename={#MyAppName}-{#MyAppProductVersion}-win
 SetupIconFile=Lumidex\Assets\lumidex-icon.ico
@@ -45,10 +45,15 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "{#MyAppSourceFolder}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "LICENSE.md"; DestDir: "{app}"; Flags: ignoreversion
+Source: "installer\VC_redist.x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; 
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{tmp}\VC_redist.x64.exe"; \
+  StatusMsg: "Installing VC++ 14.40.33810.0 x64"; \
+  Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"""; Flags: waituntilterminated
+