diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 1fb65df40..a49f56c75 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 = "2"; public const string Build = "0"; - public const string Revision = "1442"; + public const string Revision = "1445"; 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 ad42492c0..94b832ac8 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=2 -%REVISION%=1442 %COREVERSION%=0 +%REVISION%=1445 +%MINOR%=2 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 7022916ed..c290af655 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.2.0.1442' +!define VERSION '3.2.0.1445' diff --git a/SyntaxTree/tree/NodesGenerator.exe b/SyntaxTree/tree/NodesGenerator.exe index 023f8eebe..41b2a61a2 100644 Binary files a/SyntaxTree/tree/NodesGenerator.exe and b/SyntaxTree/tree/NodesGenerator.exe differ diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 54dbb0b42..7a7772656 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -6310,7 +6310,7 @@ end; // ----------------------------------------------------- function PascalABCVersion: string; begin - Result := '3.2.0.1364'; + Result := '3.2.0.1364'{PABC_VERSION}; end; function ParamCount: integer; diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe index f94a2011e..de6730b58 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe and b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb index e7ec23a75..a34dc4d93 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb and b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 226440722..d2acfb45b 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.Form1.resources b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.Form1.resources index c817ff6e2..9c1347bf2 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.Form1.resources and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.Form1.resources differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe index f94a2011e..de6730b58 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb index e7ec23a75..a34dc4d93 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt index 64058492a..c95dda836 100644 --- a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt +++ b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt @@ -76,3 +76,15 @@ G:\MMCS\Programming\PascalABCNET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\ G:\MMCS\Programming\PascalABCNET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator_old.csproj.GenerateResource.Cache G:\MMCS\Programming\PascalABCNET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.exe G:\MMCS\Programming\PascalABCNET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.pdb +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\bin\Debug\NodesGenerator.exe.config +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\bin\Debug\NodesGenerator.exe +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\bin\Debug\NodesGenerator.pdb +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.Form1.resources +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.method_editor.resources +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.node_def.resources +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.simple_node_editor.resources +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.subnode_editor.resources +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.template_form.resources +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator_old.csproj.GenerateResource.Cache +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.exe +J:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.pdb diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache index a6c88961c..f1693bc9f 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csprojResolveAssemblyReference.cache b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csprojResolveAssemblyReference.cache deleted file mode 100644 index 914e7ff4a..000000000 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll index aaffe29ae..031dc2723 100644 Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ