diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 5e09838..904f2ad 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -16,7 +16,7 @@ jobs: # Константы, используемые далее по тексту env: PROJ: ${{ github.event.repository.name }} - TAG: '7.2.1' + TAG: '7.2.2' steps: # Проверка состава репозитория (без анализа, как может показаться) diff --git a/.release/DPArray.sfx.exe b/.release/DPArray.sfx.exe new file mode 100644 index 0000000..8daae3e Binary files /dev/null and b/.release/DPArray.sfx.exe differ diff --git a/.release/Release.md b/.release/Release.md index d7c2709..3819964 100644 --- a/.release/Release.md +++ b/.release/Release.md @@ -1,8 +1,7 @@ -_Changes for v 7.2.1_: +_Changes for v 7.2.2_: +- Fixed the incorrect operation of the `Deselect all` option in the packages manager; +- Updated the `Help and support` links set; - 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 +- Support for `.NET Framework 4.8.1` has been added diff --git a/Changes.log b/Changes.log index 8f148cf..3253ea1 100644 --- a/Changes.log +++ b/Changes.log @@ -1,5 +1,9 @@ DPArray: changes log +Version 7.2.2: +• Fixed the incorrect operation of the Deselect all option in the packages manager; +• Updated the Help and support links set + Version 7.2.1: • Added support for .NET 8.0; • Adjusted colors in the mini-launcher diff --git a/Packages.dpt b/Packages.dpt index 54aad94..35314ec 100644 --- a/Packages.dpt +++ b/Packages.dpt @@ -4,8 +4,8 @@ n:DPArray a:DPArray.dp f:fvd i:INFOPAGE -v:7.2.1 -p:00095AA1F9311058 +v:7.2.2 +p:00095EA158B8D2DC diff --git a/packages/DPArray.dp b/packages/DPArray.dp index 00850e2..e92a2b2 100644 Binary files a/packages/DPArray.dp and b/packages/DPArray.dp differ diff --git a/src/DPModule/AppRequirements.cs b/src/DPModule/AppRequirements.cs index 690e7da..e6e90ea 100644 --- a/src/DPModule/AppRequirements.cs +++ b/src/DPModule/AppRequirements.cs @@ -174,7 +174,7 @@ public AppRequirements (AppDefaultRequirements ReqType) defaultType = AppDefaultRequirements.DotNETFramework481; - s = RDGenerics.GetCustomSettingsValue ( + s = RDGenerics.GetCustomRegistryValue ( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "Release"); try @@ -195,7 +195,7 @@ public AppRequirements (AppDefaultRequirements ReqType) fileName = "DotNETFramework48.exe"; // Автозагрузка fileSize = "121307088"; - s = RDGenerics.GetCustomSettingsValue ( + s = RDGenerics.GetCustomRegistryValue ( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "Release"); try @@ -216,7 +216,7 @@ public AppRequirements (AppDefaultRequirements ReqType) fileName = "VCRedistributables143.exe"; fileSize = "13730768"; - s = RDGenerics.GetCustomSettingsValue ( + s = RDGenerics.GetCustomRegistryValue ( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\Installer\\Dependencies\\" + "Microsoft.VS.VC_RuntimeAdditionalVSU_x86,v14", "Version"); @@ -228,7 +228,7 @@ public AppRequirements (AppDefaultRequirements ReqType) downloadLink = "https://microsoft.com/en-us/download/details.aspx?id=30709"; description = "Microsoft SQL Server Compact 4.0 SP1"; - s = RDGenerics.GetCustomSettingsValue ( + s = RDGenerics.GetCustomRegistryValue ( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SQL Server Compact Edition\\v4.0", "Version" ); @@ -241,7 +241,7 @@ public AppRequirements (AppDefaultRequirements ReqType) "runtime-desktop-6.0.9-windows-x86-installer"; description = "Microsoft .NET Framework 6.0 (or newer)"; - s = RDGenerics.GetCustomSettingsValue ( + s = RDGenerics.GetCustomRegistryValue ( "HKEY_LOCAL_MACHINE\\SOFTWARE\\dotnet\\Setup\\InstalledVersions\\x86\\hostfxr", "Version" ); @@ -261,7 +261,7 @@ public AppRequirements (AppDefaultRequirements ReqType) "runtime-desktop-8.0.4-windows-x86-installer"; description = "Microsoft .NET Framework 8.0 (or newer)"; - s = RDGenerics.GetCustomSettingsValue ( + s = RDGenerics.GetCustomRegistryValue ( "HKEY_LOCAL_MACHINE\\SOFTWARE\\dotnet\\Setup\\InstalledVersions\\x86\\hostfxr", "Version" ); diff --git a/src/Generics/AboutForm.cs b/src/Generics/AboutForm.cs index a415380..09a1a92 100644 --- a/src/Generics/AboutForm.cs +++ b/src/Generics/AboutForm.cs @@ -137,7 +137,7 @@ public AboutForm () if (veryFirstStart < 0) veryFirstStart = - string.IsNullOrWhiteSpace (RDGenerics.GetAppSettingsValue (LastShownVersionKey)) ? 1 : 0; + string.IsNullOrWhiteSpace (RDGenerics.GetAppRegistryValue (LastShownVersionKey)) ? 1 : 0; string line = ProgramDescription.AssemblyLocalizedReferences[localized ? 0 + locOffset : 0]; if (string.IsNullOrWhiteSpace (line)) @@ -203,14 +203,14 @@ public int AcceptEULA () private int LaunchForm (bool StartupMode, bool AcceptMode) { // Запрос настроек - adpRevision = RDGenerics.GetDPArraySettingsValue (ADPRevisionKey); - string helpShownAt = RDGenerics.GetAppSettingsValue (LastShownVersionKey); + adpRevision = RDGenerics.GetDPArrayRegistryValue (ADPRevisionKey); + string helpShownAt = RDGenerics.GetAppRegistryValue (LastShownVersionKey); // Если поле пустое, устанавливается минимальное значение if (adpRevision == "") { adpRevision = "rev. 10" + newPolicyAlias; - RDGenerics.SetDPArraySettingsValue (ADPRevisionKey, adpRevision); + RDGenerics.SetDPArrayRegistryValue (ADPRevisionKey, adpRevision); } // Контроль @@ -319,14 +319,14 @@ private int LaunchForm (bool StartupMode, bool AcceptMode) if (RDGenerics.StartedFromMSStore) HypeHelpFlag.Checked = HypeHelpFlag.Visible = false; else - HypeHelpFlag.Checked = (RDGenerics.GetDPArraySettingsValue (HypeHelpKey) == "1"); + HypeHelpFlag.Checked = (RDGenerics.GetDPArrayRegistryValue (HypeHelpKey) == "1"); RDGenerics.LoadAppAboutWindowDimensions (this); this.ShowDialog (); RDGenerics.SaveAppAboutWindowDimensions (this); - RDGenerics.SetDPArraySettingsValue (HypeHelpKey, HypeHelpFlag.Checked ? "1" : "0"); + RDGenerics.SetDPArrayRegistryValue (HypeHelpKey, HypeHelpFlag.Checked ? "1" : "0"); // HypeHelp (только если окно отображено) if (HypeHelpFlag.Checked) @@ -334,7 +334,7 @@ private int LaunchForm (bool StartupMode, bool AcceptMode) DateTime lastHypeHelp; try { - lastHypeHelp = DateTime.Parse (RDGenerics.GetDPArraySettingsValue (LastHypeHelpKey)); + lastHypeHelp = DateTime.Parse (RDGenerics.GetDPArrayRegistryValue (LastHypeHelpKey)); } catch { @@ -346,18 +346,18 @@ private int LaunchForm (bool StartupMode, bool AcceptMode) RDGenerics.RunWork (HypeHelper, null, null, RDRunWorkFlags.DontSuspendExecution); lastHypeHelp = DateTime.Now.AddMinutes (RDGenerics.RND.Next (65, 95)); - RDGenerics.SetDPArraySettingsValue (LastHypeHelpKey, lastHypeHelp.ToString ()); + RDGenerics.SetDPArrayRegistryValue (LastHypeHelpKey, lastHypeHelp.ToString ()); } } // Запись версий по завершению if (StartupMode) - RDGenerics.SetAppSettingsValue (LastShownVersionKey, ProgramDescription.AssemblyVersion); + RDGenerics.SetAppRegistryValue (LastShownVersionKey, ProgramDescription.AssemblyVersion); // В случае невозможности загрузки Политики признак необходимости принятия до этого момента // не удаляется из строки версии. Поэтому требуется страховка if (AcceptMode && policyAccepted) - RDGenerics.SetDPArraySettingsValue (ADPRevisionKey, adpRevision.Replace (newPolicyAlias, "")); + RDGenerics.SetDPArrayRegistryValue (ADPRevisionKey, adpRevision.Replace (newPolicyAlias, "")); // Завершение return policyAccepted ? 0 : -1; @@ -512,7 +512,7 @@ private void UpdatesPageButton_Click (object sender, EventArgs e) #if !DPMODULE // Контроль наличия DPArray - string dpmv = RDGenerics.GetDPArraySettingsValue (LastShownVersionKey); + string dpmv = RDGenerics.GetDPArrayRegistryValue (LastShownVersionKey); string downloadLink, packagePath; int l; @@ -551,7 +551,7 @@ private void UpdatesPageButton_Click (object sender, EventArgs e) return; #else downloadLink = RDGenerics.DPArrayPackageLink; - packagePath = RDGenerics.GetDPArraySettingsValue (RDGenerics.DPArrayName); + packagePath = RDGenerics.GetDPArrayRegistryValue (RDGenerics.DPArrayName); if (string.IsNullOrWhiteSpace (packagePath)) // Такое может быть, если DPArray ни разу не обновлялся { @@ -696,7 +696,7 @@ private void UpdatesChecker (object sender, DoWorkEventArgs e) { string adpRev = ExtractPolicyRevision (GetPolicy ()); if (!string.IsNullOrWhiteSpace (adpRev) && (adpRev != adpRevision)) - RDGenerics.SetDPArraySettingsValue (ADPRevisionKey, adpRev + newPolicyAlias); + RDGenerics.SetDPArrayRegistryValue (ADPRevisionKey, adpRev + newPolicyAlias); } // Не было проблем с загрузкой страницы