diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 2148128c8..e551f563c 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 = "9"; public const string Build = "0"; - public const string Revision = "3492"; + public const string Revision = "3494"; 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 6a4cca998..e120ee4a5 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=0 -%REVISION%=3492 +%REVISION%=3494 %MINOR%=9 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index b8aa756af..3c2f4b38d 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3492 +3.9.0.3494 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 096165f98..4e4a61ffb 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3492' +!define VERSION '3.9.0.3494' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index fe0b37c31..b568baf7f 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -13758,7 +13758,18 @@ end; /// Преобразует многострочную строку в массив строк function ToLines(Self: string): array of string; extensionmethod; begin - Result := Self.Split(|NewLine|, System.StringSplitOptions.None); + Result := Self.Split(| + #13#10, // CR+LF: Win + #10, // LF: Linux + #13 // CR: Mac + // https://en.m.wikipedia.org/wiki/Newline#Unicode + // But standard .Net things like System.IO.StringReader don't support these, so for now - commented out +// #11, // Vertical Tab +// #12, // Form feed +// char($85), // Next Line +// char($2028), // Line Separator +// char($2029), // Paragraph SeparatorS + |, System.StringSplitOptions.None); end; procedure PassSpaces(var s: string; var from: integer);