Fix versioning on linux (and hopefully macos), change versioning to f…

…ull semver (Major.Minor.Build.Revision), update version number to 0.2.1.1
cainan-c · Sep 3, 2024 · 439462c · 439462c
1 parent 161ae41
commit 439462c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/tns2tool/Program.cs b/tns2tool/Program.cs
@@ -12,38 +12,26 @@ public class Program
     {
         public static byte VersionMajor { get; private set; } = 0;
         public static byte VersionMinor { get; private set; } = 0;
+        public static byte VersionBuild { get; private set; } = 0;
         public static byte VersionRevision { get; private set; } = 0;
         public static string InformationalVersion { get; private set; } = "";
 
         public static string GetFileVersion()
         {
-            return $"{VersionMajor}.{VersionMinor}";
+            return $"{VersionMajor}.{VersionMinor}.{VersionBuild}.{VersionRevision}";
         }
 
         static void PopulateVersionInfo()
         {
-            Version version = Assembly.GetEntryAssembly()!.GetName().Version!;
+            Assembly entryAssembly = Assembly.GetEntryAssembly()!;
+            Version version = entryAssembly.GetName().Version!;
+
             VersionMajor = (byte)version.Major;
             VersionMinor = (byte)version.Minor;
+            VersionBuild = (byte)version.Build;
             VersionRevision = (byte)version.Revision;
 
-            try
-            {
-                InformationalVersion =
-                    FileVersionInfo.GetVersionInfo(Environment.ProcessPath!).ProductVersion!;
-            }
-#if DEBUG
-            catch (Exception ex)
-            {
-
-                Console.WriteLine("Error getting InformationalVersion: " + ex.Message);
-#else
-            catch
-            {
-#endif
-                // fallback informational version, hopefully we never need this
-                InformationalVersion = $"{VersionMajor}.{VersionMinor}.{VersionRevision}";
-            }
+            InformationalVersion = entryAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion;
         }
 
         static void Main(string[] args)
@@ -78,7 +66,7 @@ static void Main(string[] args)
                         return;
                     }
 
-                    ProcessFile(option, inputFile, isGzip, outputPath: null);
+                    ProcessFile(option, inputFile, isGzip, null);
                 }
                 else if (args[1] == "-inPath")
                 {
@@ -102,7 +90,7 @@ static void Main(string[] args)
             }
         }
 
-        static void ProcessFile(string option, string inputFile, bool isGzip, string outputPath)
+        static void ProcessFile(string option, string inputFile, bool isGzip, string? outputPath)
         {
             try
             {
@@ -155,12 +143,12 @@ static void ProcessDirectory(string option, string inputPath, bool isGzip)
         }
 
         // Function to generate the output file name based on the input file and the output path
-        static string GetOutputFileName(string inputFile, string outputPath, string newExtension)
+        static string GetOutputFileName(string inputFile, string? outputPath, string newExtension)
         {
             string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(inputFile);
-            string directory = outputPath ?? Path.GetDirectoryName(inputFile);
+            string? directory = outputPath ?? Path.GetDirectoryName(inputFile);
 
-            return Path.Combine(directory, $"{fileNameWithoutExtension}{newExtension}");
+            return Path.Combine(directory!, $"{fileNameWithoutExtension}{newExtension}");
         }
 
         // Function to determine the output file extension based on the content

diff --git a/tns2tool/tns2tool.csproj b/tns2tool/tns2tool.csproj
@@ -7,7 +7,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.2.1</Version>
+    <Version>0.2.1.1</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Configurations>Debug;Release;FullRelease</Configurations>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>