Skip to content

Commit 13ca544

Browse files
committed
update .NET Framework installer to 4.8
4.8 supports Windows 7/8 And wintray now requires .NET 4.8
1 parent b07cc42 commit 13ca544

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

FreenetInstall_InnoSetup.iss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Source: "{app}\wrapper\wrapper.conf"; DestDir: "{app}\wrapper"; DestName: "wrapp
6868
Source: "FreenetInstaller_InnoSetup_library\FreenetInstaller_InnoSetup_library.dll"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy
6969
Source: "install_bundle\OpenJDK11U-jre_x86-32_windows_hotspot_11.0.15_10.msi"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
7070
Source: "install_bundle\OpenJDK11U-jre_x64_windows_hotspot_11.0.15_10.msi"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
71-
Source: "install_bundle\dotNetFx40_Full_setup.exe"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
71+
Source: "install_bundle\ndp48-web.exe"; DestDir: "{tmp}"; Flags: ignoreversion dontcopy nocompression
7272
#include "fred_deps.iss"
7373
Source: "install_node\FreenetTray.exe"; DestDir: "{app}"; Flags: ignoreversion nocompression
7474
Source: "install_node\FreenetTray.exe.config"; DestDir: "{app}"; Flags: ignoreversion
@@ -323,8 +323,8 @@ var
323323
begin
324324
InstallButton := TNewButton (Sender);
325325
InstallButton.Enabled := False;
326-
ExtractTemporaryFiles('{tmp}\dotNetFx40_Full_setup.exe');
327-
if not ShellExec('runas', ExpandConstant('{tmp}\dotNetFx40_Full_setup.exe'), '', '', SW_SHOW, ewWaitUntilTerminated,ErrorCode) then begin
326+
ExtractTemporaryFiles('{tmp}\ndp48-web.exe');
327+
if not ShellExec('runas', ExpandConstant('{tmp}\ndp48-web.exe'), '', '', SW_SHOW, ewWaitUntilTerminated,ErrorCode) then begin
328328
MsgBox(FmtMessage(CustomMessage('ErrorLaunchDependencyInstaller'), ['.NET 4.0', inttostr(ErrorCode), SysErrorMessage(ErrorCode)]),
329329
mbError, MB_OK);
330330
InstallButton.Enabled := True;
-869 KB
Binary file not shown.

install_bundle/ndp48-web.exe

1.37 MB
Binary file not shown.

0 commit comments

Comments
 (0)