fix asbuild version info.

Author: danwalmsley

AvalonStudio/AvalonStudioBuild/AvalonStudioBuild.csproj

@@ -11,11 +11,12 @@
     <NoWarn>NU1701</NoWarn>
 	<PackAsTool>true</PackAsTool>
 	<ToolCommandName>avalon</ToolCommandName>
-  <PackageId>AvalonBuild</PackageId>
-	<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+	<AssemblyVersion>$(Version)</AssemblyVersion>
+    <PackageId>AvalonBuild</PackageId>
+	<GenerateAssemblyInfo>True</GenerateAssemblyInfo>
 	<PackageOutputPath>./nupkg</PackageOutputPath>
 	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	 <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+	<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
   <ItemGroup>

AvalonStudio/AvalonStudioBuild/GlobalAssemblyInfo.cs

@@ -5,12 +5,9 @@
 // General Information about an assembly is controlled through the following
 // // set of attributes. Change these attribute values to modify the information
 // // associated with an assembly.
-[assembly: AssemblyTitle("Avalon Build")]
 [assembly: AssemblyDescription("")]
 // [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("VitalElement")]
-[assembly: AssemblyProduct("AvalonStudio")]
-[assembly: AssemblyCopyright("Copyright © 2019 Vital Element")]
+
 // [assembly: AssemblyTrademark("")]
 // [assembly: AssemblyCulture("")]
 //
@@ -36,7 +33,3 @@
 // [assembly: AssemblyFileVersion("1.0.0.0")]
 //
 
-
-[assembly: AssemblyVersion (ThisAssembly.Git.BaseVersion.Major + "." + ThisAssembly.Git.BaseVersion.Minor + "." + ThisAssembly.Git.BaseVersion.Patch)]
-[assembly: AssemblyFileVersion (ThisAssembly.Git.BaseVersion.Major + "." + ThisAssembly.Git.BaseVersion.Minor + "." + ThisAssembly.Git.BaseVersion.Patch)]
-

AvalonStudio/AvalonStudioBuild/Program.cs

@@ -17,13 +17,14 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 
 namespace AvalonStudio
 {
     internal class Program
     {
-        private const string releaseName = "Apollo";
+        private const string releaseName = "Artemis";
 
         private static readonly ProgramConsole console = new ProgramConsole();
 
@@ -521,6 +522,11 @@ private static int RunPackage (PackageOptions options)
         {
             var arguments = $"cvf package.tar {options.SourceDirectory}";
 
+            if(options.SourceDirectory == ".")
+            {
+                arguments += " --exclude=package.tar";
+            }
+
             if (!File.Exists(Path.Combine(options.SourceDirectory, "package.manifest")))
             {
                 console.WriteLine("File: package.manifest was not found.");
@@ -602,7 +608,10 @@ private static int Main(string[] args)
 
             PackageManager.LoadAssetsAsync().Wait();
 
-            Console.WriteLine("Avalon Build - {0} - {1}  - {2}", releaseName, ThisAssembly.Git.BaseVersion.Major + "." + ThisAssembly.Git.BaseVersion.Minor + "." + ThisAssembly.Git.BaseVersion.Patch, Platform.PlatformIdentifier);
+
+            var assemblyVersion = Assembly.GetCallingAssembly().GetName().Version;
+
+            Console.WriteLine("Avalon Build - {0} - {1}  - {2}", releaseName, assemblyVersion.Major + "." + assemblyVersion.Minor + "." + assemblyVersion.Build, Platform.PlatformIdentifier);
 
             Console.WriteLine($"Cache Path: {Platform.BaseDirectory}");
 

AvalonStudio/build/SharedVersion.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Owners>VitalElement, Dan Walmsley</Owners>
     <Authors>Dan Walmsley</Authors>
-    <Version>0.10.0</Version>
+    <Version>0.10.1</Version>
     <Copyright>Copyright 2021 &#169; VitalElement</Copyright>
     <PackageLicenseUrl>https://github.com/VitalElement/AvalonStudio.Shell/blob/master/LICENSE.md</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/VitalElement/AvalonStudio/</PackageProjectUrl>