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/CHANGELOG.md b/CHANGELOG.md index fce2ce5..7f84be7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ Changelog ========= +[v1.0.0.0][v1.0.0.0] (2025-XX-YY) {#v1.0.0.0} +--------------------------------------------- + +### Neue Funktionen {#v1.0.0.0-features} + +* Something. + +### Behobene Fehler {#v1.0.0.0-bugfixes} + +* Something. + +### Sonstiges {#v1.0.0.0-misc} + +* Something. + +[v1.0.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.0 + + [v0.13.8][v0.13.8] (2025-02-21) {#v0.13.8} ------------------------------------------ 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<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0"); + Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0.0"); try { await AppDbUpdater.CheckDb(); diff --git a/Elwig/Elwig.csproj b/Elwig/Elwig.csproj index 8bf420b..57e25c2 100644 --- a/Elwig/Elwig.csproj +++ b/Elwig/Elwig.csproj @@ -7,7 +7,7 @@ <UseWPF>true</UseWPF> <PreserveCompilationContext>true</PreserveCompilationContext> <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon> - <Version>0.13.8</Version> + <Version>1.0.0.0</Version> <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ApplicationManifest>app.manifest</ApplicationManifest> @@ -26,20 +26,20 @@ <ItemGroup> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" /> - <PackageReference Include="LinqKit" Version="1.3.8" /> - <PackageReference Include="MailKit" Version="4.11.0" /> + <PackageReference Include="LinqKit" Version="1.3.7" /> + <PackageReference Include="MailKit" Version="4.9.0" /> <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.4" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" /> - <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.4" /> - <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" /> - <PackageReference Include="NJsonSchema" Version="11.2.0" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.1" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" /> + <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.1" /> + <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" /> + <PackageReference Include="NJsonSchema" Version="11.1.0" /> <PackageReference Include="PdfiumViewer" Version="2.13.0" /> <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" /> <PackageReference Include="RazorLight" Version="2.3.1" /> - <PackageReference Include="ScottPlot.WPF" Version="5.0.55" /> - <PackageReference Include="System.IO.Ports" Version="9.0.4" /> - <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.4" /> + <PackageReference Include="ScottPlot.WPF" Version="5.0.53" /> + <PackageReference Include="System.IO.Ports" Version="9.0.1" /> + <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.1" /> </ItemGroup> </Project> 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;