From 6073807aea5f7708db2066893509df4f3459f569 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Wed, 13 Jul 2022 12:11:04 +0300 Subject: [PATCH] Work --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Localization/DefaultLang.resources | Bin 100635 -> 100640 bytes Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/GraphABC.pas | 2 ++ fileslist_install.pas | 7 ------- 7 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 fileslist_install.pas diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 85db39efd..ae98c446d 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "8"; public const string Build = "3"; - public const string Revision = "3136"; + public const string Revision = "3137"; 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 f249bceb7..4335e7e8e 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=3 -%REVISION%=3136 %MINOR%=8 +%REVISION%=3137 +%COREVERSION%=3 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 598ef4055c640258f72e8eaaba7c952bd2181fea..1be086b3470503eb661358d7dd3f6711a41b59e2 100644 GIT binary patch delta 44 zcmV+{0Mq}Qk_MoX29V$ZJb~f0;Q{w<6v*P>?I6MK?d0I_<>DYH-qh19Ah+jl0W=va COBk&H delta 39 vcmZ25iEZ{Iwh0dy%^M$XeaQGdkKeN_F;BrMKQAS*D78#MWBZ$YMiWT@S1S+* diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 09ef04b3c..be299a84f 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.3.3136 +3.8.3.3137 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 2d27f49b5..bed4df5d8 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.3.3136' +!define VERSION '3.8.3.3137' diff --git a/TestSuite/CompilationSamples/GraphABC.pas b/TestSuite/CompilationSamples/GraphABC.pas index 8c6916351..4c901cc2d 100644 --- a/TestSuite/CompilationSamples/GraphABC.pas +++ b/TestSuite/CompilationSamples/GraphABC.pas @@ -1126,6 +1126,8 @@ type function peek: integer; override; end; +var IsRunningOnMono := System.Type.GetType('Mono.Runtime') <> nil; + function SetProcessDPIAware(): boolean; external 'user32.dll'; function operator*(s: Size; r: real): Size; extensionmethod; diff --git a/fileslist_install.pas b/fileslist_install.pas deleted file mode 100644 index 560328cbc..000000000 --- a/fileslist_install.pas +++ /dev/null @@ -1,7 +0,0 @@ -begin - Assign(output,'_GenerateLinuxVersion.bat'); - var a := EnumerateAllFiles('LinuxInstallerPABC'); - var b := a.Select(s -> 'copy bin\'+s[20:]+' Release\PascalABCNETLinux\'+s[20:]);//.OrderBy(s->ExtractFileExt(s)); - b := b.Append(#13#10'powershell Compress-Archive -Force Release\PascalABCNETLinux Release\PascalABCNETLinux.zip'); - b.PrintLines; -end. \ No newline at end of file