Tests: Update dependencies

Elwig: Update dependencies
Upgrade to .NET 10
2025-11-29 12:34:33 +01:00 · 2025-11-29 12:34:33 +01:00 · 2025-11-29 12:34:33 +01:00 · 2025-11-29 12:34:29 +01:00 · 2025-11-10 00:15:46 +01:00 · 2025-11-10 00:13:53 +01:00
9 changed files with 61 additions and 34 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 Changelog
 =========

+[v1.0.2.0][v1.0.2.0] (2025-11-10) {#v1.0.2.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.2.0-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) können Kontaktdaten der Mitglieder als .vcf-Datei exportiert werden. (01f4480a08, 9dc225d3e4)
+
+### Sonstiges {#v1.0.2.0-misc}
+
+* Wenn ein Serial-/COM-Port-USB-Adapter an- oder abgesteckt wird, wird das nun automatisch erkannt. (e6367da286)
+* Abhängigkeiten aktualisiert. (b10c744bf9, 0d513f7bff)
+
+[v1.0.2.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.2.0
+
+
+
+
 [v1.0.1.5][v1.0.1.5] (2025-10-29) {#v1.0.1.5}
 ---------------------------------------------

--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@@ -2,12 +2,12 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
    <Nullable>enable</Nullable>
    <UseWPF>true</UseWPF>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.0.1.5</Version>
+    <Version>1.0.2.0</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -22,23 +22,23 @@

  <ItemGroup>
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="LinqKit" Version="1.3.8" />
-    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="LinqKit" Version="1.3.9" />
+    <PackageReference Include="MailKit" Version="4.14.1" />
    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3485.44" />
-    <PackageReference Include="NJsonSchema" Version="11.4.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3595.46" />
+    <PackageReference Include="NJsonSchema" Version="11.5.2" />
    <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.56" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.IO.Hashing" Version="9.0.9" />
-    <PackageReference Include="System.IO.Ports" Version="9.0.9" />
-    <PackageReference Include="System.Management" Version="9.0.10" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.0" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.0" />
+    <PackageReference Include="System.Management" Version="10.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
  </ItemGroup>

 </Project>
--- a/Elwig/Helpers/Export/VCard.cs
+++ b/Elwig/Helpers/Export/VCard.cs
@@ -34,20 +34,20 @@ namespace Elwig.Helpers.Export {
            int count = data.Count() + 1, i = 0;

            foreach (var row in data) {
-                var billingAddr = row.BillingAddress != null ? $"ADR;TYPE=work;LANGUAGE=de;LABEL=\"{row.BillingAddress.FullName}\\n{row.BillingAddress.Address}\\n{row.BillingAddress.PostalDest.AtPlz?.Plz} {row.BillingAddress.PostalDest.AtPlz?.Ort.Name}\\nÖsterreich\":;;{row.BillingAddress.Address};{row.BillingAddress.PostalDest.AtPlz?.Ort.Name};;{row.BillingAddress.PostalDest.AtPlz?.Plz};Österreich\r\n" : null;
+                var billingAddr = row.BillingAddress != null ? $"ADR;TYPE=work;LANGUAGE=de;LABEL=\"{Escape(row.BillingAddress.FullName)}\\n{Escape(row.BillingAddress.Address)}\\n{row.BillingAddress.PostalDest.AtPlz?.Plz} {Escape(row.BillingAddress.PostalDest.AtPlz?.Ort.Name)}\\nÖsterreich\":;;{Escape(row.BillingAddress.Address)};{Escape(row.BillingAddress.PostalDest.AtPlz?.Ort.Name)};;{row.BillingAddress.PostalDest.AtPlz?.Plz};Österreich\r\n" : null;
                var tel = string.Join("", row.TelephoneNumbers
                    .Where(n => n.Type != "fax")
-                    .Select(n => $"TEL;TYPE={(n.Type == "mobile" ? "cell" : "voice")}:{n.Number}\r\n"));
-                var email = string.Join("", row.EmailAddresses.Select(a => $"EMAIL:{a.Address}\r\n"));
+                    .Select(n => $"TEL;TYPE={(n.Type == "mobile" ? "cell" : "voice")}:{Escape(n.Number)}\r\n"));
+                var email = string.Join("", row.EmailAddresses.Select(a => $"EMAIL:{Escape(a.Address)}\r\n"));
                await _writer.WriteLineAsync($"""
                    BEGIN:VCARD
                    VERSION:4.0
                    UID:mg{row.MgNr}@{App.Client.NameToken.ToLower()}.elwig.at
                    NOTE:MgNr. {row.MgNr}
-                    FN:{row.AdministrativeName}
-                    N:{row.Name};{row.GivenName};{row.MiddleName};{row.Prefix};{row.Suffix}
+                    FN:{Escape(row.AdministrativeName)}
+                    N:{Escape(row.Name)};{Escape(row.GivenName)};{Escape(row.MiddleName)};{Escape(row.Prefix)};{Escape(row.Suffix)}
                    KIND:{(row.IsJuridicalPerson ? "org" : "individual")}
-                    ADR{(billingAddr == null ? "" : ";TYPE=home")};LANGUAGE=de;LABEL="{row.Address}\n{row.PostalDest.AtPlz?.Plz} {row.PostalDest.AtPlz?.Ort.Name}\nÖsterreich":;;{row.Address};{row.PostalDest.AtPlz?.Ort.Name};;{row.PostalDest.AtPlz?.Plz};Österreich
+                    ADR{(billingAddr == null ? "" : ";TYPE=home")};LANGUAGE=de;LABEL="{Escape(row.Address)}\n{row.PostalDest.AtPlz?.Plz} {Escape(row.PostalDest.AtPlz?.Ort.Name)}\nÖsterreich":;;{Escape(row.Address)};{Escape(row.PostalDest.AtPlz?.Ort.Name)};;{row.PostalDest.AtPlz?.Plz};Österreich
                    {billingAddr}{tel}{email}REV:{row.ModifiedAt.ToUniversalTime():yyyyMMdd\THHmmss\Z}
                    END:VCARD
                    """);
@@ -61,5 +61,9 @@ namespace Elwig.Helpers.Export {
        public void Export(IEnumerable<Member> data, IProgress<double>? progress = null) {
            ExportAsync(data, progress).GetAwaiter().GetResult();
        }
+
+        private static string? Escape(string? text) {
+            return text?.Replace("\\", "\\\\").Replace(",", "\\,").Replace(";", "\\;").Replace("\n", "\\n").Replace("\r", "");
+        }
    }
 }
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@@ -502,6 +502,7 @@ namespace Elwig.Helpers {
            if (App.Config.Smtp == null)
                return false;
            return await Task.Run(async () => {
+                await AddSentMailBody(subject, text, 1);
                SmtpClient? client = null;
                try {
                    client = await GetSmtpClient();
@@ -519,6 +520,11 @@ namespace Elwig.Helpers {
                    }
                    msg.Body = body;
                    await client!.SendAsync(msg);
+                    await AddSentMails([(
+                            "email", member.MgNr, member.AdministrativeName,
+                            member.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
+                            subject, docs.Select(d => d.Title).ToArray()
+                        )]);
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    return false;
@@ -539,7 +545,7 @@ namespace Elwig.Helpers {
                await doc.Generate();
                var success = await SendEmail(e.Member, e.Subject, e.Text, [doc]);
                if (success)
-                    MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!", "E-Mail verschickt",
+                    MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!\n\nEs kann einige Minuten dauern, bis die E-Mail im Posteingang des Empfängers aufscheint.", "E-Mail verschickt",
                        MessageBoxButton.OK, MessageBoxImage.Information);
            } else if (mode == ExportMode.SavePdf) {
                var d = new SaveFileDialog() {
@@ -654,9 +660,9 @@ namespace Elwig.Helpers {
        }

        public static async Task<string?> FindSentMailBody(DateTime target) {
-            var dt = $"{target:yyyy-MM-dd_HH-mm-ss}_";
+            var dt = $"{target:yyyy-MM-dd_HH-mm-ss}";
            var filename = Directory.GetFiles(App.MailsPath, "????-??-??_??-??-??_*.txt")
-                .Where(n => Path.GetFileName(n).CompareTo(dt) <= 0)
+                .Where(n => Path.GetFileName(n)[..19].CompareTo(dt) <= 0)
                .Order()
                .LastOrDefault();
            if (filename == null)
--- a/Elwig/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Elwig/Properties/PublishProfiles/FolderProfile.pubxml
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishDir>bin\Publish</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
    <_TargetId>Folder</_TargetId>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@@ -929,13 +929,13 @@ namespace Elwig.Windows {
                        await Utils.AddSentMails([(
                            "email", m.MgNr, m.AdministrativeName,
                            m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
-                            subject,
-                            docs.Select(d => d.Title).ToArray()
+                            subject, docs.Select(d => d.Title).ToArray()
                        )]);
                    }
                });

-                MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information);
+                MessageBox.Show("Erfolgreich alle E-Mails verschickt!\n\nEs kann einige Minuten dauern, bis die E-Mails in den Posteingängen der Empfänger aufscheinen.", "Rundschreiben verschicken",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
            } finally {
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.0.1.5 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.2.0 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.0.1.5 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.2.0 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
--- a/Tests/E2ETests/Utils.cs
+++ b/Tests/E2ETests/Utils.cs
@@ -6,7 +6,7 @@ namespace Tests.E2ETests {

        public const int WINDOW_OPEN_SLEEP = 2000;

-        public static readonly string ApplicationPath = Path.GetFullPath(@"..\..\..\..\Elwig\bin\Debug\net8.0-windows\Elwig.exe");
+        public static readonly string ApplicationPath = Path.GetFullPath(@"..\..\..\..\Elwig\bin\Debug\net10.0-windows\Elwig.exe");
        public static readonly string ConfigPath = Path.GetFullPath(@"..\..\..\..\Tests\config.test.ini");
        public static readonly string TestDatabasePath = Path.GetFullPath(@"..\..\..\..\Tests\ElwigTestDB.sqlite3");

--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <IsPackable>false</IsPackable>
@@ -19,12 +19,12 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
    <PackageReference Include="NUnit" Version="4.4.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.10.0">
+    <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
Author	SHA1	Message	Date
Lorenz Stechauner	3b6333a6a2	Tests: Update dependencies All checks were successful Test / Run tests (push) Successful in 2m22s Details	2025-11-29 12:34:33 +01:00
Lorenz Stechauner	9b37330362	Elwig: Update dependencies	2025-11-29 12:34:33 +01:00
Lorenz Stechauner	889a17b21c	Upgrade to .NET 10	2025-11-29 12:34:33 +01:00
Lorenz Stechauner	ac6d559e5d	Helpers/Utils: Fix mail log for single mails	2025-11-29 12:34:29 +01:00
Lorenz Stechauner	6d80cca241	Bump version to 1.0.2.0 All checks were successful Test / Run tests (push) Successful in 1m44s Details Deploy / Build and Deploy (push) Successful in 1m36s Details	2025-11-10 00:15:46 +01:00
Lorenz Stechauner	9dc225d3e4	Export/VCard: Add Escape method All checks were successful Test / Run tests (push) Successful in 1m54s Details	2025-11-10 00:13:53 +01:00
Lorenz Stechauner	0d513f7bff	Tests: Update dependencies All checks were successful Test / Run tests (push) Successful in 2m3s Details	2025-11-09 23:49:42 +01:00
Lorenz Stechauner	b10c744bf9	Elwig: Update dependencies	2025-11-09 23:49:33 +01:00