Assembly v 7.2.1 (18.05.24)

adslbarxatov · May 17, 2024 · 39d0b93 · 39d0b93
1 parent 6d033fc
commit 39d0b93
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 28 deletions.
diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -16,7 +16,7 @@ jobs:
 # Константы, используемые далее по тексту
     env:
       PROJ: ${{ github.event.repository.name }}
-      TAG: '7.2'
+      TAG: '7.2.1'
 
     steps:
 # Проверка состава репозитория (без анализа, как может показаться)

diff --git a/.release/DPArray.sfx.exe b/.release/DPArray.sfx.exe
diff --git a/.release/Release.md b/.release/Release.md
@@ -1,9 +1,8 @@
-_Changes for v 7.2_:
+_Changes for v 7.2.1_:
+- Added support for `.NET 8.0`;
+- Adjusted colors in the mini-launcher;
 - The application has been retargeted to `.NET Framework 4.8.1`;
 - Support for `.NET Framework 4.8.1` has been added;
 - Some minor fixes have been applied;
 - The mini-launcher obtained new appearance;
-- User can now set the color for the additional buttons in the mini-launcher. Also now they can be removed. Use the right mouse click for it;
-- Access checking method has been completely rewritten: now it will properly detect problems with file / registry input / output and help user with fixing them;
-- Added the special section in the user guide for access troubleshooting;
-- Autorun option now will use the registry instead of the start menu
+- User can now set the color for the additional buttons in the mini-launcher. Also now they can be removed. Use the right mouse click for it
diff --git a/Changes.log b/Changes.log
@@ -1,5 +1,9 @@
 DPArray: changes log
 
+Version 7.2.1:
+• Added support for .NET 8.0;
+• Adjusted colors in the mini-launcher
+
 Version 7.2:
 • The application has been retargeted to .NET Framework 4.8.1;
 • Support for .NET Framework 4.8.1 has been added;

diff --git a/Packages.dpt b/Packages.dpt
@@ -4,8 +4,8 @@ n:DPArray
 a:DPArray.dp
 f:fvd
 i:INFOPAGE
-v:7.2
-p:00095C9FD8600705
+v:7.2.1
+p:00095AA1F9311058
 
 
 
@@ -179,17 +179,17 @@ n:Races
 a:Races.7z
 f:F
 i:INFOPAGE
-v:2.3.2
-s:14697934
-p:01DACB2F90B6530C
+v:2.4
+s:14694158
+p:01DAB384137E74CD
 
 n:Snake
 a:Snake.7z
 f:F
 i:INFOPAGE
-v:2.3.2
-s:16132670
-p:0236216FC1F44086
+v:2.4
+s:16131110
+p:023609C49A713F8B
 
 n:Thousand
 a:Thousand.dp
@@ -202,9 +202,9 @@ n:Turtle
 a:Turtle.7z
 f:F
 i:INFOPAGE
-v:2.3.2
-s:14785913
-p:0240FF1F2B2FA04A
+v:2.4
+s:14786690
+p:0240E77487DBB06C
 
 
 

diff --git a/packages/DPArray.dp b/packages/DPArray.dp
diff --git a/packages/Races.7z b/packages/Races.7z
diff --git a/packages/Snake.7z b/packages/Snake.7z
diff --git a/packages/Turtle.7z b/packages/Turtle.7z
diff --git a/src/DPModule/AppRequirements.cs b/src/DPModule/AppRequirements.cs
@@ -26,7 +26,7 @@ public enum AppDefaultRequirements
 		/// <summary>
 		/// Microsoft .NET Framework 6.0
 		/// </summary>
-		DotNet6 = 3,
+		DotNet60 = 3,
 
 		/// <summary>
 		/// Microsoft DirectX update
@@ -38,6 +38,11 @@ public enum AppDefaultRequirements
 		/// </summary>
 		DotNETFramework481 = 5,
 
+		/// <summary>
+		/// Microsoft .NET Framework 8.0
+		/// </summary>
+		DotNet80 = 6,
+
 		/// <summary>
 		/// Не является стандартной зависимостью
 		/// </summary>
@@ -231,7 +236,7 @@ public AppRequirements (AppDefaultRequirements ReqType)
 					alreadyInstalled = s.StartsWith ("4.0");
 					break;
 
-				case AppDefaultRequirements.DotNet6:
+				case AppDefaultRequirements.DotNet60:
 					downloadLink = "https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/" +
 						"runtime-desktop-6.0.9-windows-x86-installer";
 					description = "Microsoft .NET Framework 6.0 (or newer)";
@@ -251,6 +256,26 @@ public AppRequirements (AppDefaultRequirements ReqType)
 					alreadyInstalled = (v >= 6);
 					break;
 
+				case AppDefaultRequirements.DotNet80:
+					downloadLink = "https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/" +
+						"runtime-desktop-8.0.4-windows-x86-installer";
+					description = "Microsoft .NET Framework 8.0 (or newer)";
+
+					s = RDGenerics.GetCustomSettingsValue (
+						"HKEY_LOCAL_MACHINE\\SOFTWARE\\dotnet\\Setup\\InstalledVersions\\x86\\hostfxr",
+						"Version"
+						);
+					v = 0;
+
+					try
+						{
+						v = uint.Parse (s.Substring (0, 1));
+						}
+					catch { }
+
+					alreadyInstalled = (v >= 8);
+					break;
+
 				case AppDefaultRequirements.DirectX:
 					downloadLink = "https://microsoft.com/en-us/download/confirmation.aspx?id=35";
 					description = "Microsoft DirectX 9 updates";
@@ -295,29 +320,35 @@ public static string GetRequirementAlias (AppDefaultRequirements ReqType)
 				default:
 					return "";
 
-				case AppDefaultRequirements.DirectX:
-					return "DX+";
-
-				case AppDefaultRequirements.DotNet6:
-					return "NF6+";
-
-				case AppDefaultRequirements.DotNETFramework480:
-					return "CS+";
+				// Новые
+				case AppDefaultRequirements.DotNet80:
+					return "NF80+";
 
 				case AppDefaultRequirements.DotNETFramework481:
 					return "NF481+";
 
+				// Актуальные
+				case AppDefaultRequirements.DirectX:
+					return "DX+";
+
 				case AppDefaultRequirements.SQLCE:
 					return "SQL+";
 
 				case AppDefaultRequirements.VC_RTL:
 					return "CPP+";
+
+				// Устаревшие
+				case AppDefaultRequirements.DotNet60:
+					return "NF6+";
+
+				case AppDefaultRequirements.DotNETFramework480:
+					return "CS+";
 				}
 			}
 
 		/// <summary>
 		/// Возвращает количество доступных стандартных зависимостей
 		/// </summary>
-		public const uint DefaultRequirementsCount = 6;
+		public const uint DefaultRequirementsCount = 7;
 		}
 	}
diff --git a/src/Generics/AboutForm.cs b/src/Generics/AboutForm.cs
@@ -41,6 +41,7 @@ public partial class AboutForm: Form
 
 			"https://youtube.com/c/rdaaowfdl",
 
+#if HYPE_YT
 			"https://youtu.be/0_78MtyTAdA",
 			"https://youtu.be/UlB0zh3YH3A",
 			"https://youtu.be/QiOMIN4aE-Q",
@@ -58,6 +59,7 @@ public partial class AboutForm: Form
 			"https://youtu.be/25BYSySdAJk",
 			"https://youtu.be/gjs9K1EsFG8",
 			"https://youtu.be/nOb4MbL-jlI",
+#endif
 
 			"https://moddb.com/mods/esrm",
 			"https://moddb.com/mods/eshq",