From 39f068d98341bff702d3557a59ff9a7a435af152 Mon Sep 17 00:00:00 2001 From: Elias Fierke Date: Thu, 18 Sep 2025 15:26:09 +0200 Subject: [PATCH] [chore:] changes from github --- AddressCheck.cs | 1 + CombineAddresses.cs | 20 ++++++++++++------ DataStructures.cs | 4 ++-- MainWindow.axaml.cs | 3 +-- .../net9.0/Avalonia/Resources.Inputs.cache | 2 +- obj/Debug/net9.0/Avalonia/resources | Bin 10110 -> 10189 bytes obj/Debug/net9.0/Logof Client.AssemblyInfo.cs | 2 +- .../Logof Client.AssemblyInfoInputs.cache | 2 +- obj/Logof Client.csproj.nuget.dgspec.json | 4 ++-- obj/project.assets.json | 4 ++-- obj/project.nuget.cache | 4 ++-- obj/project.packagespec.json | 2 +- obj/rider.project.model.nuget.info | 2 +- obj/rider.project.restore.info | 2 +- 14 files changed, 30 insertions(+), 22 deletions(-) diff --git a/AddressCheck.cs b/AddressCheck.cs index f438a90..34a7a09 100644 --- a/AddressCheck.cs +++ b/AddressCheck.cs @@ -205,6 +205,7 @@ public class AddressCheck } } + // Adressen-Länge if (address_component_count > 10) { hasFaults = true; diff --git a/CombineAddresses.cs b/CombineAddresses.cs index 2596b16..182a7fa 100644 --- a/CombineAddresses.cs +++ b/CombineAddresses.cs @@ -16,12 +16,20 @@ public class CombineAddresses public async Task Perform(List address_lists) { KasAddressList result = new(); - for (var i = 0; i < address_lists.Count; i++) - if (i == 0) - result = address_lists[i]; - else - result = await Merge(result, address_lists[i], i + 1, address_lists.Count); - + await Task.Run(async () => + { + for (var i = 0; i < address_lists.Count; i++) + if (i == 0) + lock (result) + { + result = address_lists[i]; + } + else + lock (result) + { + result = Merge(result, address_lists[i], i + 1, address_lists.Count).Result; + } + }); return result; } diff --git a/DataStructures.cs b/DataStructures.cs index f588780..12c7429 100644 --- a/DataStructures.cs +++ b/DataStructures.cs @@ -63,8 +63,8 @@ public class KasPerson string name3, string name4, string name5, - string funktion, - string funktion2, + string funktion, // ignorieren + string funktion2, // ignorieren string abteilung, string funktionad) { diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs index ec30f71..e4069a9 100644 --- a/MainWindow.axaml.cs +++ b/MainWindow.axaml.cs @@ -56,10 +56,9 @@ public partial class MainWindow : Window //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig"); } - private void MnuExit_OnClick(object? sender, RoutedEventArgs e) { - throw new NotImplementedException(); + Environment.Exit(0); } private void MnuAbout_OnClick(object? sender, RoutedEventArgs e) diff --git a/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache b/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache index a1f2b57..47ed786 100644 --- a/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache +++ b/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -cb40a7d659d0be2a992cc643999cfc9cedc9ed4b083f115fa8f585d3fe49e469 +7c9a93128a982a1e9b3ed6a98b955291256152e83f2d8c0a81b93bfa11851fbe diff --git a/obj/Debug/net9.0/Avalonia/resources b/obj/Debug/net9.0/Avalonia/resources index 8fe5b0e44154b635ac67e230b4c2e26ec66f73b8..86c009b7a1b8618af3108e5c0b40f87ca793f8b2 100644 GIT binary patch delta 44 zcmV+{0Mq~ePR&n{i2>J*lS~~Hll>hXlMW#WllLN50Wq^qBQOM? CUJyF~ delta 33 pcmX@>|IcqiCwm7g1A~;l;$%e?2}Z?@E8UbP+bYLzo~vxY0sy>{3QYh2 diff --git a/obj/Debug/net9.0/Logof Client.AssemblyInfo.cs b/obj/Debug/net9.0/Logof Client.AssemblyInfo.cs index 8361e85..0d7139f 100644 --- a/obj/Debug/net9.0/Logof Client.AssemblyInfo.cs +++ b/obj/Debug/net9.0/Logof Client.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Logof Client")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+028df0fe91584edef4af501bd73fe525cb08ec66")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+412de903f5b3dfc96eb50f28565ef826c68c4250")] [assembly: System.Reflection.AssemblyProductAttribute("Logof Client")] [assembly: System.Reflection.AssemblyTitleAttribute("Logof Client")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net9.0/Logof Client.AssemblyInfoInputs.cache b/obj/Debug/net9.0/Logof Client.AssemblyInfoInputs.cache index 4a4c7cc..976c538 100644 --- a/obj/Debug/net9.0/Logof Client.AssemblyInfoInputs.cache +++ b/obj/Debug/net9.0/Logof Client.AssemblyInfoInputs.cache @@ -1 +1 @@ -cb47d029cb393b78d0a3efca74b5c2537fe464adbbea84dcb40bb67a45254c63 +106552b4e3cc179639dda17b27641bd40928d1e6b4629b5c3baae2909de72cef diff --git a/obj/Logof Client.csproj.nuget.dgspec.json b/obj/Logof Client.csproj.nuget.dgspec.json index 98f799b..5291e23 100644 --- a/obj/Logof Client.csproj.nuget.dgspec.json +++ b/obj/Logof Client.csproj.nuget.dgspec.json @@ -87,7 +87,7 @@ "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Ref", - "version": "[9.0.7, 9.0.7]" + "version": "[9.0.8, 9.0.8]" } ], "frameworkReferences": { @@ -95,7 +95,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/9.0.108/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/9.0.109/PortableRuntimeIdentifierGraph.json" } } } diff --git a/obj/project.assets.json b/obj/project.assets.json index 3c1c1f8..870283e 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -1564,7 +1564,7 @@ "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Ref", - "version": "[9.0.7, 9.0.7]" + "version": "[9.0.8, 9.0.8]" } ], "frameworkReferences": { @@ -1572,7 +1572,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/9.0.108/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/9.0.109/PortableRuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 4ee02be..5f1ff6e 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "Xf4OVxwU5ds=", + "dgSpecHash": "aE0qKetUvS8=", "success": true, "projectFilePath": "/home/fierke/Nextcloud/Documents/source/repos/logofclient/Logof Client/Logof Client.csproj", "expectedPackageFiles": [ @@ -34,7 +34,7 @@ "/home/fierke/.nuget/packages/skiasharp.nativeassets.win32/2.88.9/skiasharp.nativeassets.win32.2.88.9.nupkg.sha512", "/home/fierke/.nuget/packages/system.io.pipelines/8.0.0/system.io.pipelines.8.0.0.nupkg.sha512", "/home/fierke/.nuget/packages/tmds.dbus.protocol/0.21.2/tmds.dbus.protocol.0.21.2.nupkg.sha512", - "/home/fierke/.nuget/packages/microsoft.aspnetcore.app.ref/9.0.7/microsoft.aspnetcore.app.ref.9.0.7.nupkg.sha512" + "/home/fierke/.nuget/packages/microsoft.aspnetcore.app.ref/9.0.8/microsoft.aspnetcore.app.ref.9.0.8.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index a164039..dc35391 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/home/fierke/Nextcloud/Documents/source/repos/logofclient/Logof Client/Logof Client.csproj","projectName":"Logof Client","projectPath":"/home/fierke/Nextcloud/Documents/source/repos/logofclient/Logof Client/Logof Client.csproj","outputPath":"/home/fierke/Nextcloud/Documents/source/repos/logofclient/Logof Client/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.100"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Controls.DataGrid":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.2, )"},"Lucide.Avalonia":{"target":"Package","version":"[0.1.35, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[9.0.7, 9.0.7]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/share/dotnet/sdk/9.0.108/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"/home/fierke/Nextcloud/Documents/source/repos/logofclient/Logof Client/Logof Client.csproj","projectName":"Logof Client","projectPath":"/home/fierke/Nextcloud/Documents/source/repos/logofclient/Logof Client/Logof Client.csproj","outputPath":"/home/fierke/Nextcloud/Documents/source/repos/logofclient/Logof Client/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.100"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Controls.DataGrid":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.2, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.2, )"},"Lucide.Avalonia":{"target":"Package","version":"[0.1.35, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[9.0.8, 9.0.8]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/share/dotnet/sdk/9.0.109/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 5fdb101..9da148f 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17560571568233159 \ No newline at end of file +17581228084312842 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 5fdb101..9da148f 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17560571568233159 \ No newline at end of file +17581228084312842 \ No newline at end of file