diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 5196fda..0d8cb89 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -1,7 +1,7 @@ name: Deploy on: push: - tags: ["v[0-9]+.[0-9]+.[0-9]+"] + tags: ["v([0-9]+.)?[0-9]+.[0-9]+.[0-9]+"] jobs: deploy: name: Build and Deploy diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs index 19f7a7a..9842c1a 100644 --- a/Elwig/App.xaml.cs +++ b/Elwig/App.xaml.cs @@ -82,7 +82,7 @@ namespace Elwig { } protected override async void OnStartup(StartupEventArgs evt) { - Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute()?.InformationalVersion.Split('+')[0] ?? "0.0.0"); + Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute()?.InformationalVersion.Split('+')[0] ?? "0.0.0.0"); try { await AppDbUpdater.CheckDb(); diff --git a/Elwig/Elwig.csproj b/Elwig/Elwig.csproj index 40cea10..57e25c2 100644 --- a/Elwig/Elwig.csproj +++ b/Elwig/Elwig.csproj @@ -7,7 +7,7 @@ true true Resources\Images\Elwig.ico - 0.13.7 + 1.0.0.0 de-AT true app.manifest diff --git a/Elwig/Windows/MainWindow.xaml.cs b/Elwig/Windows/MainWindow.xaml.cs index f97c691..ba22a42 100644 --- a/Elwig/Windows/MainWindow.xaml.cs +++ b/Elwig/Windows/MainWindow.xaml.cs @@ -25,7 +25,7 @@ namespace Elwig.Windows { public MainWindow() { InitializeComponent(); var v = Assembly.GetExecutingAssembly().GetName().Version; - VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}") + $" – {App.BranchName}"; + VersionField.Text = $"Version: {v?.ToString() ?? "?"} – {App.BranchName}"; if (App.Client.Client == null) VersionField.Text += " (Unbekannt)"; Menu_Help_Update.IsEnabled = App.Config.UpdateUrl != null; Menu_Help_Smtp.IsEnabled = App.Config.Smtp != null;