Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update .NET Framework installer to 4.8 #32

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update .NET Framework installer to 4.8 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f82d06b
add .NET Framework 4.8 installer
qupo1 Jan 8, 2025
10492b0
switch to .NET Framework 4.8 installer
qupo1 Jan 8, 2025
febc28f
remove old .NET Framework installer
qupo1 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions FreenetInstall_InnoSetup.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Source: "{app}\wrapper\wrapper.conf"; DestDir: "{app}\wrapper"; DestName: "wrapp
Source: "FreenetInstaller_InnoSetup_library\FreenetInstaller_InnoSetup_library.dll"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy
Source: "install_bundle\OpenJDK11U-jre_x86-32_windows_hotspot_11.0.15_10.msi"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
Source: "install_bundle\OpenJDK11U-jre_x64_windows_hotspot_11.0.15_10.msi"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
Source: "install_bundle\dotNetFx40_Full_setup.exe"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
Source: "install_bundle\ndp48-web.exe"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
#include "fred_deps.iss"
Source: "install_node\FreenetTray.exe"; DestDir: "{app}"; Flags: ignoreversion nocompression
Source: "install_node\FreenetTray.exe.config"; DestDir: "{app}"; Flags: ignoreversion
Expand Down Expand Up @@ -323,8 +323,8 @@ var
begin
InstallButton := TNewButton (Sender);
InstallButton.Enabled := False;
ExtractTemporaryFiles('{tmp}\dotNetFx40_Full_setup.exe');
if not ShellExec('runas', ExpandConstant('{tmp}\dotNetFx40_Full_setup.exe'), '', '', SW_SHOW, ewWaitUntilTerminated,ErrorCode) then begin
ExtractTemporaryFiles('{tmp}\ndp48-web.exe');
if not ShellExec('runas', ExpandConstant('{tmp}\ndp48-web.exe'), '', '', SW_SHOW, ewWaitUntilTerminated,ErrorCode) then begin
MsgBox(FmtMessage(CustomMessage('ErrorLaunchDependencyInstaller'), ['.NET 4.0', inttostr(ErrorCode), SysErrorMessage(ErrorCode)]),
mbError, MB_OK);
InstallButton.Enabled := True;
Expand Down
Binary file removed install_bundle/dotNetFx40_Full_setup.exe
View file
Open in desktop
Binary file not shown.
Binary file added install_bundle/ndp48-web.exe
View file
Open in desktop
Binary file not shown.