fixes #1259 отображение публичной версии вместо технической

Author: EvilBeaver

src/oscommon.targets

@@ -21,6 +21,7 @@
     <PropertyGroup>
         <VersionPrefix Condition="'$(VersionPrefix)' == ''">2.0.0</VersionPrefix>
         <FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
+        <InformationalVersion Condition="'$(VersionSuffix)' != ''">$(FileVersion)-$(VersionSuffix)</InformationalVersion>
         <Product>1C (BSL) language runtime</Product>
         <Copyright>Copyright (c) 2021 EvilBeaver</Copyright>
     </PropertyGroup>

src/oscript/Program.cs

@@ -6,6 +6,7 @@ This Source Code Form is subject to the terms of the
 ----------------------------------------------------------*/
 
 using System;
+using System.Reflection;
 using System.Text;
 
 namespace oscript
@@ -41,5 +42,14 @@ public static int Main(string[] args)
 
 			return returnCode;
 		}
+		
+		public static string GetVersion()
+		{
+			var assembly = Assembly.GetExecutingAssembly();
+			var informationVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
+				.InformationalVersion ?? assembly.GetName().Version?.ToString() ?? "<unset>";
+
+			return informationVersion;
+		}
 	}
 }

src/oscript/ShowUsageBehavior.cs

@@ -13,7 +13,7 @@ internal class ShowUsageBehavior : AppBehavior
 	{
 		public override int Execute()
 		{
-            Output.WriteLine($"1Script Execution Engine. Version {Assembly.GetExecutingAssembly().GetName().Version}");
+            Output.WriteLine($"1Script Execution Engine. Version {Program.GetVersion()}");
             Output.WriteLine();
             Output.WriteLine("Usage:");
             Output.WriteLine();
@@ -30,10 +30,8 @@ public override int Execute()
             Output.WriteLine("  -encoding=<encoding-name> set output encoding");
             Output.WriteLine("  -codestat=<filename> write code statistics");
             Output.WriteLine();
-            Output.WriteLine("III. Build standalone executable: oscript.exe -make <script_path> <output_exe>");
-            Output.WriteLine("  Builds a standalone executable module based on script specified");
             Output.WriteLine();
-            Output.WriteLine("IV. Run as CGI application: oscript.exe -cgi <script_path> [script arguments..]");
+            Output.WriteLine("III. Run as CGI application: oscript.exe -cgi <script_path> [script arguments..]");
             Output.WriteLine("  Runs as CGI application under HTTP-server (Apache/Nginx/IIS/etc...)");
 
 			return 0;

src/oscript/ShowVersionBehavior.cs

@@ -13,7 +13,7 @@ internal class ShowVersionBehavior : AppBehavior
 	{
 		public override int Execute()
 		{
-			Output.WriteLine($"{Assembly.GetExecutingAssembly().GetName().Version}");
+			Output.WriteLine(Program.GetVersion());
 			return 0;
 		}
 	}