Assembly v 7.2 (11.05.24)

adslbarxatov · May 11, 2024 · b7a86d7 · b7a86d7
1 parent 9d22cd0
commit b7a86d7
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 46 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.1.5'
+      TAG: '7.2'
 
     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,9 @@
-_Changes for v 7.1.5_:
+_Changes for v 7.2_:
+- 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;
-- Upgraded the self-update algorithm (useful for Windows 10 rights management);
-- The method of setup for autostart settings has been rewritten: now the app uses the separate button in the packages manager for it;
-- The interface of packages manager has been updated
+- Autorun option now will use the registry instead of the start menu
diff --git a/Changes.log b/Changes.log
@@ -1,7 +1,9 @@
 DPArray: changes log
 
-ToDo:
-- В AppAbout поменять «user manual» на «user guide»
+Version 7.2:
+• 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
 
 Version 7.1.5:
 • The mini-launcher obtained new appearance;

diff --git a/Packages.dpt b/Packages.dpt
@@ -4,8 +4,8 @@ n:DPArray
 a:DPArray.dp
 f:fvd
 i:INFOPAGE
-v:7.1.5
-p:00095A9E4E066FFC
+v:7.2
+p:00095C9FD8600705
 
 
 
@@ -59,8 +59,8 @@ a:KassArray.dp
 f:F
 i:INFOPAGE
 l:r
-v:5.5.3
-p:00163E0406522F20
+v:5.6
+p:00163C055A2A2223
 
 n:OS macros executor
 a:OSMacrosExecutor.dp
@@ -216,8 +216,8 @@ a:KassArray.apk
 f:FV
 i:INFOPAGE
 l:r
-v:5.5.3
-s:35996843
+v:5.6
+s:35988651
 
 n:Make decision
 u:GIT_LINK/MakeDecision/GIT_PATH/DEFFILE
@@ -266,7 +266,7 @@ n:KassArray
 f:FVD
 l:r
 i:MS_STORE/9ND98F4C4Q60
-v:5.5.3
+v:5.6
 
 n:Mafia helper
 f:FVD
@@ -306,7 +306,7 @@ n:KassArray
 f:FVD
 l:r
 i:GP_STOREcom.RD_AAOW.TextToKKT
-v:5.5.3
+v:5.6
 
 n:Make decision
 f:FVD
@@ -338,17 +338,12 @@ f:FVD
 i:HU_STORE/qsttV4pmU0
 v:3.5.2
 
-/n:PA detector
-/f:FVD
-/i:MI_STOREcom.RD_AAOW.EnchantIt
-/v:3.4.2
-
 /n:uNot
 /f:FVD
 /i:MI_STOREcom.RD_AAOW.UniNotifier
 /v:7.1.3
 
 
 
-me:ES: DPArray v 7.1 is available for deployment!
-mr:ES: DPArray v 7.1 доступен для развёртки!
+me:ES: DPArray v 7.2 is available now!
+mr:ES: DPArray v 7.2 теперь доступен!
diff --git a/packages/DPArray.dp b/packages/DPArray.dp
diff --git a/packages/KassArray.dp b/packages/KassArray.dp
diff --git a/src/DPModule/AppRequirements.cs b/src/DPModule/AppRequirements.cs
@@ -11,7 +11,7 @@ public enum AppDefaultRequirements
 		/// <summary>
 		/// Microsoft .NET Framework 4.8
 		/// </summary>
-		DotNETFramework = 0,
+		DotNETFramework480 = 0,
 
 		/// <summary>
 		/// Microsoft Visual C++ Runtime Libraries
@@ -33,6 +33,11 @@ public enum AppDefaultRequirements
 		/// </summary>
 		DirectX = 4,
 
+		/// <summary>
+		/// Microsoft .NET Framework 4.8.1
+		/// </summary>
+		DotNETFramework481 = 5,
+
 		/// <summary>
 		/// Не является стандартной зависимостью
 		/// </summary>
@@ -155,15 +160,36 @@ public AppRequirements (AppDefaultRequirements ReqType)
 
 			switch (ReqType)
 				{
-				case AppDefaultRequirements.DotNETFramework:
+				case AppDefaultRequirements.DotNETFramework481:
 				default:
+					downloadLink = "https://go.microsoft.com/fwlink/?LinkId=2203304";
+					description = "Microsoft .NET Framework 4.8.1";
+					fileName = "DotNETFramework481.exe";    // Автозагрузка
+					fileSize = "1466664";
+
+					defaultType = AppDefaultRequirements.DotNETFramework481;
+
+					s = RDGenerics.GetCustomSettingsValue (
+						"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full",
+						"Release");
+					try
+						{
+						v = uint.Parse (s);
+						}
+					catch
+						{
+						break;
+						}
+
+					alreadyInstalled = (v >= 533320);
+					break;
+
+				case AppDefaultRequirements.DotNETFramework480:
 					downloadLink = "https://go.microsoft.com/fwlink/?linkid=2088631";
 					description = "Microsoft .NET Framework 4.8";
 					fileName = "DotNETFramework48.exe";    // Автозагрузка
 					fileSize = "121307088";
 
-					defaultType = AppDefaultRequirements.DotNETFramework;
-
 					s = RDGenerics.GetCustomSettingsValue (
 						"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full",
 						"Release");
@@ -275,9 +301,12 @@ public static string GetRequirementAlias (AppDefaultRequirements ReqType)
 				case AppDefaultRequirements.DotNet6:
 					return "NF6+";
 
-				case AppDefaultRequirements.DotNETFramework:
+				case AppDefaultRequirements.DotNETFramework480:
 					return "CS+";
 
+				case AppDefaultRequirements.DotNETFramework481:
+					return "NF481+";
+
 				case AppDefaultRequirements.SQLCE:
 					return "SQL+";
 
@@ -289,6 +318,6 @@ public static string GetRequirementAlias (AppDefaultRequirements ReqType)
 		/// <summary>
 		/// Возвращает количество доступных стандартных зависимостей
 		/// </summary>
-		public const uint DefaultRequirementsCount = 5;
+		public const uint DefaultRequirementsCount = 6;
 		}
 	}
diff --git a/src/Generics/WindowsShortcut.cs b/src/Generics/WindowsShortcut.cs
@@ -82,23 +82,6 @@ public static int DeleteDesktopShortcut (string ShortcutFileName)
 				Environment.GetFolderPath (Environment.SpecialFolder.Desktop));
 			}
 
-		/*
-		/// <summary>
-		/// Метод создаёт ярлык к файлу в меню автозапуска
-		/// </summary>
-		/// <param name="ShortcutArguments">Аргументы командной строки, передаваемые с файлом</param>
-		/// <param name="ShortcutFileName">Имя файла ярлыка</param>
-		/// <param name="TargetFile">Файл, для которого создаётся ярлык</param>
-		/// <returns>Возвращает 0 в случае успеха</returns>
-		public static int CreateStartupShortcut (string TargetFile, string ShortcutFileName,
-			string ShortcutArguments)
-			{
-			return CreateShortcut (TargetFile, ShortcutFileName,
-				Environment.GetFolderPath (Environment.SpecialFolder.CommonStartup),
-				ShortcutArguments);
-			}
-		*/
-
 		/// <summary>
 		/// Метод удаляет ярлык к файлу из меню автозапуска
 		/// </summary>