|
|
@@ -59,7 +59,7 @@ Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
|
|
|
Source: "*.dll"; DestDir: "{app}"; Flags: ignoreversion
|
|
|
Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
|
|
|
|
|
|
-Source: "..\dotNet451Setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: FrameworkIsNotInstalled
|
|
|
+Source: "..\dotNet46Setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: FrameworkIsNotInstalled
|
|
|
|
|
|
[Icons]
|
|
|
Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"
|
|
|
@@ -67,7 +67,7 @@ Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
|
|
|
Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
|
|
|
|
|
|
[Run]
|
|
|
-Filename: "{tmp}\dotNet451Setup.exe"; Parameters: "/passive /promptrestart"; Check: FrameworkIsNotInstalled; StatusMsg: "Microsoft .NET Framework 4.5.1 is being installed. Please wait..."
|
|
|
+Filename: "{tmp}\dotNet46Setup.exe"; Parameters: "/passive /promptrestart"; Check: FrameworkIsNotInstalled; StatusMsg: "Microsoft .NET Framework 4.6 is being installed. Please wait..."
|
|
|
Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
|
|
|
|
|
|
[Code]
|
|
|
@@ -77,7 +77,7 @@ var
|
|
|
release: cardinal;
|
|
|
begin
|
|
|
exists := RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', release);
|
|
|
- result := not exists or (release < 378758);
|
|
|
+ result := not exists or (release < 393295); { 393295 on Win10, 393297 below }
|
|
|
end;
|
|
|
|
|
|
procedure BumpInstallCount;
|