change: simplify version getter

lemutec · Sep 29, 2024 · 3b5a93d · 3b5a93d
1 parent 1856e60
commit 3b5a93d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 59 deletions.
diff --git a/build/MicaSetup.Tools/MakeIcon/ViewModels/AboutViewModel.cs b/build/MicaSetup.Tools/MakeIcon/ViewModels/AboutViewModel.cs
@@ -1,29 +1,10 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
 using System.Reflection;
-using System.Text;
 
 namespace MakeIcon.ViewModels;
 
 public partial class AboutViewModel : ObservableObject
 {
     [ObservableProperty]
-    private string version = $"v{Assembly.GetCallingAssembly().GetAssemblyVersion()}";
-}
-
-file static class AssemblyExtensions
-{
-    public static string GetAssemblyVersion(this Assembly assembly)
-    {
-        Version version = assembly.GetName().Version;
-        StringBuilder sb = new();
-
-        sb.Append(version.Major);
-        sb.Append(".");
-        sb.Append(version.Minor);
-        sb.Append(".");
-        sb.Append(version.Build);
-
-        return sb.ToString();
-    }
+    private string version = $"v{Assembly.GetCallingAssembly().GetName().Version.ToString(3)}";
 }
diff --git a/build/MicaSetup.Tools/MakeMica/ViewModels/AboutViewModel.cs b/build/MicaSetup.Tools/MakeMica/ViewModels/AboutViewModel.cs
@@ -1,29 +1,10 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
 using System.Reflection;
-using System.Text;
 
 namespace MakeMica.ViewModels;
 
 public partial class AboutViewModel : ObservableObject
 {
     [ObservableProperty]
-    private string version = $"v{Assembly.GetCallingAssembly().GetAssemblyVersion()}";
-}
-
-file static class AssemblyExtensions
-{
-    public static string GetAssemblyVersion(this Assembly assembly)
-    {
-        Version version = assembly.GetName().Version;
-        StringBuilder sb = new();
-
-        sb.Append(version.Major);
-        sb.Append(".");
-        sb.Append(version.Minor);
-        sb.Append(".");
-        sb.Append(version.Build);
-
-        return sb.ToString();
-    }
+    private string version = $"v{Assembly.GetCallingAssembly().GetName().Version.ToString(3)}";
 }
diff --git a/build/MicaSetup.Tools/MakeMui/ViewModels/AboutViewModel.cs b/build/MicaSetup.Tools/MakeMui/ViewModels/AboutViewModel.cs
@@ -1,28 +1,10 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using System.Reflection;
-using System.Text;
 
 namespace MakeMui.ViewModels;
 
 public partial class AboutViewModel : ObservableObject
 {
     [ObservableProperty]
-    private string version = $"v{Assembly.GetCallingAssembly().GetAssemblyVersion()}";
-}
-
-file static class AssemblyExtensions
-{
-    public static string GetAssemblyVersion(this Assembly assembly)
-    {
-        Version version = assembly.GetName().Version;
-        StringBuilder sb = new();
-
-        sb.Append(version.Major);
-        sb.Append(".");
-        sb.Append(version.Minor);
-        sb.Append(".");
-        sb.Append(version.Build);
-
-        return sb.ToString();
-    }
+    private string version = $"v{Assembly.GetCallingAssembly().GetName().Version.ToString(3)}";
 }