Ver Fonte

Updated installer to install .NET 8

Krzysztof Krysiński há 1 ano atrás
pai
commit
d138826ad3

+ 1 - 1
incompatible.json

@@ -1 +1 @@
-["0.1.3.0", "0.1.3.1", "0.1.3.2", "0.1.3.3", "0.1.3.4", "0.1.3.5", "0.1.3.6", "0.1.4.0", "0.1.5.0", "0.1.6.0", "0.1.7.0", "0.1.8.0", "0.1.9.0", "0.1.9.1", "0.1.9.2", "1.0.0.0", "1.0.0.1", "1.0.1.0", "1.1.0.0", "1.1.3.0", "1.2.0.0", "1.2.1.0"]
+["0.1.3.0", "0.1.3.1", "0.1.3.2", "0.1.3.3", "0.1.3.4", "0.1.3.5", "0.1.3.6", "0.1.4.0", "0.1.5.0", "0.1.6.0", "0.1.7.0", "0.1.8.0", "0.1.9.0", "0.1.9.1", "0.1.9.2", "1.0.0.0", "1.0.0.1", "1.0.1.0", "1.1.0.0", "1.1.3.0", "1.2.0.0", "1.2.1.0", "1.2.2.0", "1.2.3.0", "1.2.4.0"]

+ 14 - 14
src/Installer/installer-setup-x64-light.iss

@@ -4,8 +4,8 @@
 // requires netcorecheck.exe and netcorecheck_x64.exe (see download link below)
 #define UseNetCoreCheck
 #ifdef UseNetCoreCheck
-  ;#define UseDotNet70
-  #define UseDotNet70Desktop
+  ;#define UseDotNet80
+  #define UseDotNet80Desktop
 #endif
 
 // custom setup info
@@ -401,24 +401,24 @@ var
   Version: String;
 begin
 
-#ifdef UseDotNet70
-  // https://dotnet.microsoft.com/download/dotnet/7.0
-  if not IsNetCoreInstalled('Microsoft.NETCore.App 7.0.0') then begin
-    AddDependency('dotnet70' + GetArchitectureSuffix + '.exe',
+#ifdef UseDotNet80
+  // https://dotnet.microsoft.com/download/dotnet/8.0
+  if not IsNetCoreInstalled('Microsoft.NETCore.App 8.0.1') then begin
+    AddDependency('dotnet80' + GetArchitectureSuffix + '.exe',
       '/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
-      '.NET Runtime 7.0' + GetArchitectureTitle,
-      GetString('https://download.visualstudio.microsoft.com/download/pr/75c0d7c7-9f30-46fd-9675-a301f0e051f4/ec04d5cc40aa6537a4af21fad6bf8ba9/dotnet-runtime-7.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/87bc5966-97cc-498c-8381-bff4c43aafc6/baca88b989e7d2871e989d33a667d8e9/dotnet-runtime-7.0.0-win-x64.exe'),
+      '.NET Runtime 8.0' + GetArchitectureTitle,
+      GetString('https://download.visualstudio.microsoft.com/download/pr/8c884ea1-2ae5-4359-82a4-8ce8fb309b0e/53a67e660c7b331577c95b02f87935fe/dotnet-runtime-8.0.1-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/cede7e69-dbd4-4908-9bfb-12fa4660e2b9/d9ed17179d0275abee5afd29d5460b48/dotnet-runtime-8.0.1-win-x64.exe'),
       '', False, False, False);
   end;
 #endif
 
-#ifdef UseDotNet70Desktop
-  // https://dotnet.microsoft.com/download/dotnet/7.0
-  if not IsNetCoreInstalled('Microsoft.WindowsDesktop.App 7.0.0') then begin
-    AddDependency('dotnet70desktop' + GetArchitectureSuffix + '.exe',
+#ifdef UseDotNet80Desktop
+  // https://dotnet.microsoft.com/download/dotnet/8.0
+  if not IsNetCoreInstalled('Microsoft.WindowsDesktop.App 8.0.1') then begin
+    AddDependency('dotnet80desktop' + GetArchitectureSuffix + '.exe',
       '/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
-      '.NET Desktop Runtime 7.0' + GetArchitectureTitle,
-      GetString('https://download.visualstudio.microsoft.com/download/pr/d05a833c-2cf9-4d06-89ae-a0f3e10c5c91/c668ff42e23c2f67aa3d80227860585f/windowsdesktop-runtime-7.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/5b2fbe00-507e-450e-8b52-43ab052aadf2/79d54c3a19ce3fce314f2367cf4e3b21/windowsdesktop-runtime-7.0.0-win-x64.exe'),
+      '.NET Desktop Runtime 8.0' + GetArchitectureTitle,
+      GetString('https://download.visualstudio.microsoft.com/download/pr/ca725693-6de7-4a4d-b8a4-4390b0387c66/ce13f2f016152d9b5f2d3c6537cc415b/windowsdesktop-runtime-8.0.1-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/f18288f6-1732-415b-b577-7fb46510479a/a98239f751a7aed31bc4aa12f348a9bf/windowsdesktop-runtime-8.0.1-win-x64.exe'),
       '', False, False, False);
   end;
 #endif

+ 14 - 14
src/Installer/installer-setup-x86-light.iss

@@ -4,8 +4,8 @@
 // requires netcorecheck.exe and netcorecheck_x64.exe (see download link below)
 #define UseNetCoreCheck
 #ifdef UseNetCoreCheck
-  ;#define UseDotNet70
-  #define UseDotNet70Desktop
+  ;#define UseDotNet80
+  #define UseDotNet80Desktop
 #endif
 
 // custom setup info
@@ -400,24 +400,24 @@ var
   Version: String;
 begin
 
-#ifdef UseDotNet70
-  // https://dotnet.microsoft.com/download/dotnet/7.0
-  if not IsNetCoreInstalled('Microsoft.NETCore.App 7.0.0') then begin
-    AddDependency('dotnet70' + GetArchitectureSuffix + '.exe',
+#ifdef UseDotNet80
+  // https://dotnet.microsoft.com/download/dotnet/8.0
+  if not IsNetCoreInstalled('Microsoft.NETCore.App 8.0.1') then begin
+    AddDependency('dotnet80' + GetArchitectureSuffix + '.exe',
       '/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
-      '.NET Runtime 7.0' + GetArchitectureTitle,
-      GetString('https://download.visualstudio.microsoft.com/download/pr/75c0d7c7-9f30-46fd-9675-a301f0e051f4/ec04d5cc40aa6537a4af21fad6bf8ba9/dotnet-runtime-7.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/87bc5966-97cc-498c-8381-bff4c43aafc6/baca88b989e7d2871e989d33a667d8e9/dotnet-runtime-7.0.0-win-x64.exe'),
+      '.NET Runtime 8.0' + GetArchitectureTitle,
+      GetString('https://download.visualstudio.microsoft.com/download/pr/8c884ea1-2ae5-4359-82a4-8ce8fb309b0e/53a67e660c7b331577c95b02f87935fe/dotnet-runtime-8.0.1-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/cede7e69-dbd4-4908-9bfb-12fa4660e2b9/d9ed17179d0275abee5afd29d5460b48/dotnet-runtime-8.0.1-win-x64.exe'),
       '', False, False, False);
   end;
 #endif
 
-#ifdef UseDotNet70Desktop
-  // https://dotnet.microsoft.com/download/dotnet/7.0
-  if not IsNetCoreInstalled('Microsoft.WindowsDesktop.App 7.0.0') then begin
-    AddDependency('dotnet70desktop' + GetArchitectureSuffix + '.exe',
+#ifdef UseDotNet80Desktop
+  // https://dotnet.microsoft.com/download/dotnet/8.0
+  if not IsNetCoreInstalled('Microsoft.WindowsDesktop.App 8.0.1') then begin
+    AddDependency('dotnet80desktop' + GetArchitectureSuffix + '.exe',
       '/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
-      '.NET Desktop Runtime 7.0' + GetArchitectureTitle,
-      GetString('https://download.visualstudio.microsoft.com/download/pr/d05a833c-2cf9-4d06-89ae-a0f3e10c5c91/c668ff42e23c2f67aa3d80227860585f/windowsdesktop-runtime-7.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/5b2fbe00-507e-450e-8b52-43ab052aadf2/79d54c3a19ce3fce314f2367cf4e3b21/windowsdesktop-runtime-7.0.0-win-x64.exe'),
+      '.NET Desktop Runtime 8.0' + GetArchitectureTitle,
+      GetString('https://download.visualstudio.microsoft.com/download/pr/ca725693-6de7-4a4d-b8a4-4390b0387c66/ce13f2f016152d9b5f2d3c6537cc415b/windowsdesktop-runtime-8.0.1-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/f18288f6-1732-415b-b577-7fb46510479a/a98239f751a7aed31bc4aa12f348a9bf/windowsdesktop-runtime-8.0.1-win-x64.exe'),
       '', False, False, False);
   end;
 #endif