Skip to content

Commit c7fee7d

Browse files
committed
added dependency check for .net 10 and download for .net 10.0.3
1 parent c93be3a commit c7fee7d

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

src/setup/CodeDependencies.iss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,11 +576,11 @@ end;
576576
procedure Dependency_AddDotNet100Desktop;
577577
begin
578578
// https://dotnet.microsoft.com/download/dotnet/10.0
579-
if not Dependency_IsNetCoreInstalled('Microsoft.WindowsDesktop.App', 10, 0, 0) then begin
579+
if not Dependency_IsNetCoreInstalled('Microsoft.WindowsDesktop.App', 10, 0, 3) then begin
580580
Dependency_Add('dotnet100desktop' + Dependency_ArchSuffix + '.exe',
581581
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
582-
'.NET Desktop Runtime 10.0.0' + Dependency_ArchTitle,
583-
Dependency_String('https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.0/windowsdesktop-runtime-10.0.0-win-x86.exe', 'https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.0/windowsdesktop-runtime-10.0.0-win-x64.exe'),
582+
'.NET Desktop Runtime 10.0.3' + Dependency_ArchTitle,
583+
Dependency_String('https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.0/windowsdesktop-runtime-10.0.3-win-x86.exe', 'https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.3/windowsdesktop-runtime-10.0.3-win-x64.exe'),
584584
'', False, False);
585585
end;
586586
end;

src/setup/LogExpertInstaller.iss

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,7 @@ Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(
192192

193193
[Code]
194194
function InitializeSetup(): Boolean;
195-
var ErrCode: integer;
196195
begin
197-
if not Dependency_IsNetCoreInstalled('Microsoft.AspNetCore.App', 10, 0, 0) then begin
198-
if MsgBox('.net 10 64Bit is missing do you want to download it from https://dotnet.microsoft.com/download/dotnet/10.0 ?', mbConfirmation, MB_YESNO) = IDYES then
199-
begin
200-
ShellExecAsOriginalUser('open', 'https://dotnet.microsoft.com/download/dotnet/10.0', '', '', SW_SHOW, ewNoWait, ErrCode);
201-
end;
202-
end;
196+
Dependency_AddDotNet100Desktop;
203197
Result := True;
204198
end;

0 commit comments

Comments
 (0)