From 80a346583d48c5ac3b2a87c5df66c2e075149336 Mon Sep 17 00:00:00 2001 From: unclshura Date: Sat, 16 May 2026 20:47:16 +0100 Subject: [PATCH] Other way of setting build number. --- splitter-cli/BuildInfo.cs | 12 +++++++---- splitter-cli/CommandLine.cs | 2 +- splitter-cli/ThisAssembly.template | 9 --------- splitter-cli/splitter.csproj | 32 +++++++----------------------- 4 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 splitter-cli/ThisAssembly.template diff --git a/splitter-cli/BuildInfo.cs b/splitter-cli/BuildInfo.cs index 4ae6898..e7ebc83 100644 --- a/splitter-cli/BuildInfo.cs +++ b/splitter-cli/BuildInfo.cs @@ -1,8 +1,12 @@ -namespace splitter; +using System.Reflection; + +namespace splitter; public static class BuildInfo { - public static string Version { get; } = ThisAssembly.Version; - public static string BuildNumber { get; } = ThisAssembly.BuildNumber; - public static string Commit { get; } = ThisAssembly.Commit; + private static readonly Assembly Assembly = typeof(BuildInfo).Assembly; + + public static string Version => Assembly.GetCustomAttribute()?.InformationalVersion ?? "unknown"; + public static string FileVersion => Assembly.GetCustomAttribute()?.Version ?? "unknown"; + public static string AssemblyVersion => Assembly.GetName().Version?.ToString() ?? "unknown"; } diff --git a/splitter-cli/CommandLine.cs b/splitter-cli/CommandLine.cs index 7c5fcd4..cca7519 100644 --- a/splitter-cli/CommandLine.cs +++ b/splitter-cli/CommandLine.cs @@ -330,7 +330,7 @@ public sealed class CommandLine public static void PrintVersion() { - Console.WriteLine($"...---=== splitter version {BuildInfo.Version} (commit {BuildInfo.Commit}, build {BuildInfo.BuildNumber}) ===---..."); + Console.WriteLine($"...---=== splitter version {BuildInfo.Version} (file version: {BuildInfo.FileVersion}, build {BuildInfo.AssemblyVersion}) ===---..."); } public static void PrintHelp() diff --git a/splitter-cli/ThisAssembly.template b/splitter-cli/ThisAssembly.template deleted file mode 100644 index 00ad47a..0000000 --- a/splitter-cli/ThisAssembly.template +++ /dev/null @@ -1,9 +0,0 @@ -// Auto-generated. Do not edit. -namespace splitter; - -internal static class ThisAssembly -{ - public const string Version = "@VERSION@"; - public const string BuildNumber = "@BUILDNUMBER@"; - public const string Commit = "@COMMIT@"; -} diff --git a/splitter-cli/splitter.csproj b/splitter-cli/splitter.csproj index 9c3eee7..6c938ca 100644 --- a/splitter-cli/splitter.csproj +++ b/splitter-cli/splitter.csproj @@ -34,32 +34,14 @@ false - - - - - + + 1.0.0 + $(Version).$(BuildNumber)+$(SourceRevisionId) + $(Version) + $(Version).$(BuildNumber) + - - - - - - - - - - - - - - - - - +