diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 8ef23ebe3..c2281e6cf 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 = "2"; - public const string Revision = "3015"; + public const string Revision = "3016"; 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 2541d7c76..2b4ea6129 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=8 -%REVISION%=3015 %COREVERSION%=2 +%REVISION%=3016 +%MINOR%=8 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 99b28020a..3916d1138 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.2.3015 +3.8.2.3016 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index fca358a07..2715d8c69 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.2.3015' +!define VERSION '3.8.2.3016' diff --git a/TestSuite/CompilationSamples/ABCDatabases.pas b/TestSuite/CompilationSamples/ABCDatabases.pas index 82e25bc30..f821886b6 100644 --- a/TestSuite/CompilationSamples/ABCDatabases.pas +++ b/TestSuite/CompilationSamples/ABCDatabases.pas @@ -80,6 +80,8 @@ type [PrintAttribute(' ', 4, -5)] property УчитсяВКШ: boolean read _inSunSchool; end;} + + ///!# Ученик = auto class Фамилия: string; Класс, Рост: integer; diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 4d5638e20..b57bcb90a 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -14137,7 +14137,9 @@ begin // SSM 10/11/18 восстановил эту строку чтобы в главном потоке в вещественных была точка System.Threading.Thread.CurrentThread.CurrentCulture := new System.Globalization.CultureInfo('en-US'); - + var defaultCulture := typeof(System.Globalization.CultureInfo).GetProperty('DefaultThreadCurrentCulture'); + if defaultCulture <> nil then + defaultCulture.SetValue(nil, new System.Globalization.CultureInfo('en-US')); input := new TextFile(); output := new TextFile(); output.sw := Console.Out; diff --git a/TestSuite/CompilationSamples/PT4Exam.pas b/TestSuite/CompilationSamples/PT4Exam.pas index 0fa0b754d..6f6f42d02 100644 --- a/TestSuite/CompilationSamples/PT4Exam.pas +++ b/TestSuite/CompilationSamples/PT4Exam.pas @@ -154,7 +154,7 @@ end; initialization - PrintDelimDefault := ' '; + PrintDelimDefault := ''; finalization FinExam;