diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index abed297fa..990f35315 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -14,8 +14,8 @@ internal static class RevisionClass { public const string Major = "3"; public const string Minor = "4"; - public const string Build = "2"; - public const string Revision = "2038"; + public const string Build = "3"; + public const string Revision = "2041"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 7672de197..8c58d2bf2 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=4 -%REVISION%=2038 -%COREVERSION%=2 +%REVISION%=2041 +%COREVERSION%=3 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 081091b0e..610fec1c5 100644 Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 3ffccdab7..9bfd1f927 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.2038' +!define VERSION '3.4.3.2041' diff --git a/VisualPascalABCNET/Form1.cs b/VisualPascalABCNET/Form1.cs index 0669d8a52..031517c5c 100644 --- a/VisualPascalABCNET/Form1.cs +++ b/VisualPascalABCNET/Form1.cs @@ -1476,15 +1476,16 @@ namespace VisualPascalABC __showhelpinqueue(); } - private void __checkforupdate(object state) + /*private void __checkforupdate(object state) { WorkbenchServiceFactory.UpdateService.CheckForUpdates(); - } + }*/ private void miCheckUpdates_Click(object sender, EventArgs e) { - if (!ThreadPool.QueueUserWorkItem(__checkforupdate)) - __checkforupdate(null); + WorkbenchServiceFactory.UpdateService.CheckForUpdates(); + //if (!ThreadPool.QueueUserWorkItem(__checkforupdate)) + // __checkforupdate(null); } private void cmCollapseRegions_Click(object sender, EventArgs e) diff --git a/VisualPascalABCNET/Workbench/UpdateService.cs b/VisualPascalABCNET/Workbench/UpdateService.cs index 0bdc72a7e..1368e9b13 100644 --- a/VisualPascalABCNET/Workbench/UpdateService.cs +++ b/VisualPascalABCNET/Workbench/UpdateService.cs @@ -75,8 +75,9 @@ namespace VisualPascalABC PascalABCCompiler.StringResources.Get("VP_MF_UPDATE_CHECK"), MessageBoxButtons.YesNo) == DialogResult.Yes) { - System.Diagnostics.Process.Start(PascalABCCompiler.StringResources.Get("VP_MF_PABC_DOWNLOAD_PAGE")); - //WorkbenchServiceFactory.OperationsService.AddTabWithUrl("PascalABC.NET", PascalABCCompiler.StringResources.Get("VP_MF_PABC_DOWNLOAD_PAGE")); + //System.Diagnostics.Process.Start(PascalABCCompiler.StringResources.Get("VP_MF_PABC_DOWNLOAD_PAGE")); + // SSM 24/04/19 - вернул назад, т.к. обновление закрывало оболочку из-за некорректно написанного асинхронного вызова. Обойдёмся без асинхронного вызова. Слишком много пользователей пострадало. + WorkbenchServiceFactory.OperationsService.AddTabWithUrl("PascalABC.NET", PascalABCCompiler.StringResources.Get("VP_MF_PABC_DOWNLOAD_PAGE")); } break; case -1: diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index c073f1899..b91994698 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ