diff --git a/.github/workflows/CSharpBible.yml b/.github/workflows/CSharpBible.yml
index a601fb628..80e82e2a4 100644
--- a/.github/workflows/CSharpBible.yml
+++ b/.github/workflows/CSharpBible.yml
@@ -1,115 +1,51 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow will build, test, sign and package a WPF or Windows Forms desktop application
-# built on .NET Core.
-# To learn how to migrate your existing application to .NET Core,
-# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework
-#
-# To configure this workflow:
-#
-# 1. Configure environment variables
-# GitHub sets default environment variables for every workflow run.
-# Replace the variables relative to your project in the "env" section below.
-#
-# 2. Signing
-# Generate a signing certificate in the Windows Application
-# Packaging Project or add an existing signing certificate to the project.
-# Next, use PowerShell to encode the .pfx file using Base64 encoding
-# by running the following Powershell script to generate the output string:
-#
-# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte
-# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt'
-#
-# Open the output file, SigningCertificate_Encoded.txt, and copy the
-# string inside. Then, add the string to the repo as a GitHub secret
-# and name it "Base64_Encoded_Pfx."
-# For more information on how to configure your signing certificate for
-# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing
-#
-# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key".
-# See "Build the Windows Application Packaging project" below to see how the secret is used.
-#
-# For more information on GitHub Actions, refer to https://github.com/features/actions
-# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
-# refer to https://github.com/microsoft/github-actions-for-desktop-apps
-
-name: .NET Core Desktop
+name: CSharpBible CI3
on:
push:
- branches: [ "master" ]
+ paths:
+ - "CSharpBible/**"
pull_request:
- branches: [ "master" ]
+ paths:
+ - "CSharpBible/**"
jobs:
-
- build:
-
- strategy:
- matrix:
- configuration: [Debug, Release]
-
- runs-on: windows-latest # For a list of available runner types, refer to
- # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
-
- env:
- Solution_Name: CSharpBible.sln # Replace with your solution name, i.e. MyWpfApp.sln.
- Test_Project_Path: Tests\Test.csproj # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj.
- Wap_Project_Directory: CSharpBible # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package.
- Wap_Project_Path: CSharpBible # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj.
-
+ build-test:
+ runs-on: windows-latest
+ defaults:
+ run:
+ working-directory: CSharpBible
steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- fetch-depth: 0
-
- # Install the .NET Core workload
- - name: Install .NET Core
- uses: actions/setup-dotnet@v3
- with:
- dotnet-version: 6.0.x
-
- # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- - name: Setup MSBuild.exe
- uses: microsoft/setup-msbuild@v1.0.2
-
- # Execute all unit tests in the solution
- - name: Execute unit tests
- run: dotnet test
-
- # Restore the application to populate the obj folder with RuntimeIdentifiers
- - name: Restore the application
- run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
- env:
- Configuration: ${{ matrix.configuration }}
-
- # Decode the base 64 encoded pfx and save the Signing_Certificate
- - name: Decode the pfx
- run: |
- $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
- $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx
- [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
-
- # Create the app package by building and packaging the Windows Application Packaging project
- - name: Create the app package
- run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
- env:
- Appx_Bundle: Always
- Appx_Bundle_Platforms: x86|x64
- Appx_Package_Build_Mode: StoreUpload
- Configuration: ${{ matrix.configuration }}
-
- # Remove the pfx
- - name: Remove the pfx
- run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx
-
- # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
- - name: Upload build artifacts
- uses: actions/upload-artifact@v3
- with:
- name: MSIX Package
- path: ${{ env.Wap_Project_Directory }}\AppPackages
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Setup .NET 8.0
+ uses: actions/setup-dotnet@v4
+ with:
+ dotnet-version: "8.0.x"
+
+ - name: Remove private projects
+ run: |
+ dotnet sln CSharpBible.sln remove "Mobile/MauiApp1/MauiApp1.csproj"
+ dotnet sln CSharpBible.sln remove "Simulation/AGVFktTests/AGVFktTests.csproj"
+ dotnet sln CSharpBible.sln remove "Simulation/AGVFkt/AGVFkt.csproj"
+ dotnet sln CSharpBible.sln remove "DB/ADO_Test/ADO_Test.csproj"
+ dotnet sln CSharpBible.sln remove "Libraries/CSFreeVision_/CSFreeVision.csproj"
+ dotnet sln CSharpBible.sln remove "Mobile/DXMauiApp1/DXMauiApp1.csproj"
+ dotnet sln CSharpBible.sln remove "Web/MyComponent/Client/MyComponent.Client.csproj"
+ dotnet sln CSharpBible.sln remove "Web/MyComponent/Server/MyComponent.Server.csproj"
+ dotnet sln CSharpBible.sln remove "Web/MyComponent/Shared/MyComponent.csproj"
+ dotnet sln CSharpBible.sln remove "WinUI/App1/App1/App1.csproj"
+ dotnet sln CSharpBible.sln remove "App2/App2.csproj"
+ dotnet sln CSharpBible.sln remove "../PackageDwnLd.csproj"
+ dotnet sln CSharpBible.sln remove "Web/BlazorApp1/BlazorApp1.csproj"
+ dotnet sln CSharpBible.sln remove "Web/WebApp1/BlazorApp2/BlazorApp2.csproj"
+ dotnet sln CSharpBible.sln remove "Web/WebApp1/WebApplication1/WebApplication1/WebApplication1.csproj"
+
+ - name: Restore
+ run: dotnet restore CSharpBible.sln -p:TargetFramework=net8.0-windows
+
+ - name: Build
+ run: dotnet build CSharpBible.sln --configuration Release --no-restore -p:TargetFramework=net8.0-windows
+
+ - name: Test
+ run: dotnet test CSharpBible.sln --configuration Release --no-build --verbosity normal -p:TargetFramework=net8.0-windows
diff --git a/.github/workflows/Teststatements.yml b/.github/workflows/Teststatements.yml
new file mode 100644
index 000000000..ec5a8018d
--- /dev/null
+++ b/.github/workflows/Teststatements.yml
@@ -0,0 +1,35 @@
+name: TestStatemens CI0
+
+on:
+ push:
+ paths:
+ - "TestStatements/**"
+ pull_request:
+ paths:
+ - "TestStatements/**"
+
+jobs:
+ build-test:
+ runs-on: windows-latest
+ defaults:
+ run:
+ working-directory: TestStatements
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Setup .NET 8.0
+ uses: actions/setup-dotnet@v4
+ with:
+ dotnet-version: "8.0.x"
+
+ - name: Remove private projects
+ run: |
+
+ - name: Restore
+ run: dotnet restore TestStatements.sln -p:TargetFramework=net8.0-windows
+
+ - name: Build
+ run: dotnet build TestStatements.sln --configuration Release --no-restore -p:TargetFramework=net8.0-windows
+ - name: Test
+ run: dotnet test TestStatements.sln --configuration Release --no-build --verbosity normal -p:TargetFramework=net8.0-windows
diff --git a/.gitignore b/.gitignore
index 3e5f6349f..0b4b38c24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,37 @@
.vs
+.gitignore
bin
obj
+*.db
+*.cache
+*.bin
+*.dll
*.bak
*.user
-/obj.net
-/CSharpBible/Data/obj.net
-/CSharpBible/obj.net
*.log
+*.suo
+*.snk
+**/vs
+**/obj
+**/obj.net
+**/bin
+**/Help
+/CSharpBible/App2
+/CSharpBible/Mobile
+/CSharpBible/Web
+/CSharpBible/packages
+/CSharpBible/Simulation
+/CSharpBible/DB/ADO_Test
+/CSharpBible/Libraries/CSFreeVision_
+/CSharpBible/Libraries/MathLibraryTests/TestResults
+/CSharpBible/Graphics/PermutationTests/TestResults
+/CSharpBible/MVVM_Tutorial
+/CSharpBible/WinUI/App1
+/TestStatements/Help
+/CSharpBible/Games/SharpHack.Wpf/tiles.png
+/CSharpBible/Games/SharpHack.Wpf/tiles2.png
+/CSharpBible/Resources/t10k-images.idx3-ubyte
+/CSharpBible/Resources/t10k-labels.idx1-ubyte
+/CSharpBible/Resources/train-images.idx3-ubyte
+/CSharpBible/Resources/train-labels.idx1-ubyte
+/CSharpBible/Games/Sokoban_Base/Version.svn
diff --git a/Avalonia_Apps/AA14_ScreenX/AA14_ScreenX/AA14_ScreenX.csproj b/Avalonia_Apps/AA14_ScreenX/AA14_ScreenX/AA14_ScreenX.csproj
index d246e0113..87fc8753a 100644
--- a/Avalonia_Apps/AA14_ScreenX/AA14_ScreenX/AA14_ScreenX.csproj
+++ b/Avalonia_Apps/AA14_ScreenX/AA14_ScreenX/AA14_ScreenX.csproj
@@ -23,11 +23,4 @@
-
-
-
-
-
-
-
diff --git a/Avalonia_Apps/AA15_Labyrinth/AA15_Labyrinth/AA15_Labyrinth.csproj b/Avalonia_Apps/AA15_Labyrinth/AA15_Labyrinth/AA15_Labyrinth.csproj
index 868598e9c..a3e52e864 100644
--- a/Avalonia_Apps/AA15_Labyrinth/AA15_Labyrinth/AA15_Labyrinth.csproj
+++ b/Avalonia_Apps/AA15_Labyrinth/AA15_Labyrinth/AA15_Labyrinth.csproj
@@ -24,10 +24,4 @@
-
-
-
-
-
-
diff --git a/Avalonia_Apps/AA15_Labyrinth/AA15_LabyrinthTests/AA15_LabyrinthTests.csproj b/Avalonia_Apps/AA15_Labyrinth/AA15_LabyrinthTests/AA15_LabyrinthTests.csproj
index 5d0860a91..47341c74d 100644
--- a/Avalonia_Apps/AA15_Labyrinth/AA15_LabyrinthTests/AA15_LabyrinthTests.csproj
+++ b/Avalonia_Apps/AA15_Labyrinth/AA15_LabyrinthTests/AA15_LabyrinthTests.csproj
@@ -24,9 +24,4 @@
-
-
-
-
-
diff --git a/Avalonia_Apps/AA15_Labyrinth/AA15a_Treppen/AA15a_Treppen.csproj b/Avalonia_Apps/AA15_Labyrinth/AA15a_Treppen/AA15a_Treppen.csproj
index bc98e7507..c3558789b 100644
--- a/Avalonia_Apps/AA15_Labyrinth/AA15a_Treppen/AA15a_Treppen.csproj
+++ b/Avalonia_Apps/AA15_Labyrinth/AA15a_Treppen/AA15a_Treppen.csproj
@@ -37,12 +37,4 @@
-
-
-
-
-
-
-
-
diff --git a/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol1/Directory.Packages.props b/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol1/Directory.Packages.props
index 921a6da2f..d9e976c52 100644
--- a/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol1/Directory.Packages.props
+++ b/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol1/Directory.Packages.props
@@ -3,13 +3,13 @@
true
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol2/AA16_UserControl2.csproj b/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol2/AA16_UserControl2.csproj
index ed77aa851..aeb7c33fb 100644
--- a/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol2/AA16_UserControl2.csproj
+++ b/Avalonia_Apps/AA16_UserControl/AA16_Usercontrol2/AA16_UserControl2.csproj
@@ -25,11 +25,4 @@
-
-
-
-
-
-
-
diff --git a/Avalonia_Apps/AA18_MultiConverter/AA18_MultiConverters/AA18_MultiConverters.csproj b/Avalonia_Apps/AA18_MultiConverter/AA18_MultiConverters/AA18_MultiConverters.csproj
index 1c16896a3..0d373bb9a 100644
--- a/Avalonia_Apps/AA18_MultiConverter/AA18_MultiConverters/AA18_MultiConverters.csproj
+++ b/Avalonia_Apps/AA18_MultiConverter/AA18_MultiConverters/AA18_MultiConverters.csproj
@@ -25,11 +25,4 @@
-
-
-
-
-
-
-
diff --git a/Avalonia_Apps/AA19_FilterLists/AA19_FilterLists/AA19_FilterLists.csproj b/Avalonia_Apps/AA19_FilterLists/AA19_FilterLists/AA19_FilterLists.csproj
index daf30f25c..7a4043932 100644
--- a/Avalonia_Apps/AA19_FilterLists/AA19_FilterLists/AA19_FilterLists.csproj
+++ b/Avalonia_Apps/AA19_FilterLists/AA19_FilterLists/AA19_FilterLists.csproj
@@ -61,11 +61,4 @@
-
-
-
-
-
-
-
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/AA20a_CommonDialogs.csproj b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/AA20a_CommonDialogs.csproj
new file mode 100644
index 000000000..b1b9f92ee
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/AA20a_CommonDialogs.csproj
@@ -0,0 +1,43 @@
+
+
+
+
+ WinExe
+ net8.0
+ enable
+ enable
+ true
+ AA20a_CommonDialogs
+
+
+
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/App.axaml b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/App.axaml
new file mode 100644
index 000000000..ab42778ea
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/App.axaml
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/App.axaml.cs b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/App.axaml.cs
new file mode 100644
index 000000000..ed5c5ef0d
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/App.axaml.cs
@@ -0,0 +1,50 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using Avalonia.Controls;
+using Avln_CommonDialogs.Avalonia;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AA20a_CommonDialogs;
+
+public sealed partial class App : Application
+{
+ public IServiceProvider Services { get; private set; } = default!;
+
+ public override void Initialize()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+
+ public override void OnFrameworkInitializationCompleted()
+ {
+ Services = ConfigureServices();
+
+ if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ {
+ desktop.MainWindow = Services.GetRequiredService();
+ }
+
+ base.OnFrameworkInitializationCompleted();
+ }
+
+ private IServiceProvider ConfigureServices()
+ {
+ var services = new ServiceCollection();
+
+ var topLevelAccessor = new TopLevelAccessor();
+ services.AddSingleton(topLevelAccessor);
+
+ services.AddSingleton();
+ services.AddSingleton();
+
+ services.AddAvaloniaCommonDialogs(() => topLevelAccessor.Current);
+
+ return services.BuildServiceProvider();
+ }
+}
+
+public sealed class TopLevelAccessor
+{
+ public TopLevel? Current { get; set; }
+}
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindow.axaml b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindow.axaml
new file mode 100644
index 000000000..7d34efab3
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindow.axaml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindow.axaml.cs b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindow.axaml.cs
new file mode 100644
index 000000000..b6980e600
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindow.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia.Controls;
+
+namespace AA20a_CommonDialogs;
+
+public sealed partial class MainWindow : Window
+{
+ public MainWindow(MainWindowViewModel vm, TopLevelAccessor tla)
+ {
+ InitializeComponent();
+ DataContext = vm;
+ tla.Current = this;
+ }
+}
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindowViewModel.cs b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindowViewModel.cs
new file mode 100644
index 000000000..762af9cf8
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/MainWindowViewModel.cs
@@ -0,0 +1,69 @@
+using System.Text;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Avln_CommonDialogs.Base.Interfaces;
+
+namespace AA20a_CommonDialogs;
+
+public partial class MainWindowViewModel : ObservableObject
+{
+ private readonly IOpenFileDialog _open;
+ private readonly ISaveFileDialog _save;
+ private readonly IColorDialog _color;
+ private readonly IFontDialog _font;
+
+ public MainWindowViewModel(
+ IOpenFileDialog open,
+ ISaveFileDialog save,
+ IColorDialog color,
+ IFontDialog font)
+ {
+ _open = open;
+ _save = save;
+ _color = color;
+ _font = font;
+
+ _open.Title = "Open";
+ _open.AllowMultiple = true;
+ (_open as dynamic).MutableFilters?.Add(new FileTypeFilter("Text", new[] { ".txt", ".md" }));
+
+ _save.Title = "Save";
+ _save.DefaultExtension = "txt";
+ (_save as dynamic).MutableFilters?.Add(new FileTypeFilter("Text", new[] { ".txt" }));
+ }
+
+ [ObservableProperty]
+ private string result = string.Empty;
+
+ [RelayCommand]
+ private async Task OpenFileAsync()
+ {
+ var files = await _open.ShowAsync();
+ var sb = new StringBuilder();
+ sb.AppendLine("OpenFile:");
+ foreach (var f in files)
+ sb.AppendLine(f);
+ Result = sb.ToString();
+ }
+
+ [RelayCommand]
+ private async Task SaveFileAsync()
+ {
+ var file = await _save.ShowAsync();
+ Result = $"SaveFile: {file}";
+ }
+
+ [RelayCommand]
+ private async Task ColorAsync()
+ {
+ var ok = await _color.ShowAsync();
+ Result = $"ColorDialog: {ok}, Color={_color.Color}";
+ }
+
+ [RelayCommand]
+ private async Task FontAsync()
+ {
+ var ok = await _font.ShowAsync();
+ Result = $"FontDialog: {ok}, Font={_font.Font}";
+ }
+}
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/Program.cs b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/Program.cs
new file mode 100644
index 000000000..d34e6c303
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/Program.cs
@@ -0,0 +1,17 @@
+using Avalonia;
+using System;
+
+namespace AA20a_CommonDialogs;
+
+internal static class Program
+{
+ [STAThread]
+ public static void Main(string[] args)
+ => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+ public static AppBuilder BuildAvaloniaApp()
+ => AppBuilder.Configure()
+ .UsePlatformDetect()
+ .WithInterFont()
+ .LogToTrace();
+}
diff --git a/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/ViewLocator.cs b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/ViewLocator.cs
new file mode 100644
index 000000000..56c2e930c
--- /dev/null
+++ b/Avalonia_Apps/AA20_SysDialogs/AA20a_CommonDialogs/ViewLocator.cs
@@ -0,0 +1,5 @@
+namespace AA20a_CommonDialogs;
+
+internal static class ViewLocator
+{
+}
diff --git a/Avalonia_Apps/AA21_Buttons/Directory.Packages.props b/Avalonia_Apps/AA21_Buttons/Directory.Packages.props
index 6ffd9eac8..b4e283877 100644
--- a/Avalonia_Apps/AA21_Buttons/Directory.Packages.props
+++ b/Avalonia_Apps/AA21_Buttons/Directory.Packages.props
@@ -6,15 +6,15 @@
-
+
-
-
+
+
-
+
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/Avalonia_Apps/AA22_AvlnCap/AA22_AvlnCap/AA22_AvlnCap.csproj b/Avalonia_Apps/AA22_AvlnCap/AA22_AvlnCap/AA22_AvlnCap.csproj
index 75b089aa5..c78a700b7 100644
--- a/Avalonia_Apps/AA22_AvlnCap/AA22_AvlnCap/AA22_AvlnCap.csproj
+++ b/Avalonia_Apps/AA22_AvlnCap/AA22_AvlnCap/AA22_AvlnCap.csproj
@@ -52,12 +52,5 @@
Settings.Designer.cs
-
-
-
-
-
-
-
diff --git a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/AA25_RichTextEdit.csproj b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/AA25_RichTextEdit.csproj
index be0084342..25fe431f1 100644
--- a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/AA25_RichTextEdit.csproj
+++ b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/AA25_RichTextEdit.csproj
@@ -21,6 +21,7 @@
+
@@ -38,7 +39,9 @@
-
+
+
+
@@ -71,4 +74,7 @@
Settings.Designer.cs
+
+
+
diff --git a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/App.axaml.cs b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/App.axaml.cs
index 81e1e2ed9..cdd99c9cc 100644
--- a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/App.axaml.cs
+++ b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/App.axaml.cs
@@ -1,9 +1,11 @@
+using AA25_RichTextEdit.ViewModels;
using Avalonia;
+using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
+using Avln_CommonDialogs.Avalonia;
using Microsoft.Extensions.DependencyInjection;
using System;
-using AA25_RichTextEdit.ViewModels;
namespace AA25_RichTextEdit;
@@ -28,8 +30,16 @@ public override void OnFrameworkInitializationCompleted()
private static void ConfigureServices(IServiceCollection services)
{
+ var topLevelAccessor = new TopLevelAccessor();
+ services.AddSingleton(topLevelAccessor);
services.AddSingleton();
services.AddTransient();
services.AddTransient();
+ services.AddAvaloniaCommonDialogs(() => topLevelAccessor.Current);
}
}
+
+public sealed class TopLevelAccessor
+{
+ public TopLevel? Current { get; set; }
+}
diff --git a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.Designer.cs b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.Designer.cs
index b8b28bd63..ef5dcbd6d 100644
--- a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.Designer.cs
+++ b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.Designer.cs
@@ -8,111 +8,112 @@
//
//------------------------------------------------------------------------------
-namespace AA25_RichTextEdit.Properties;
-using System;
-
-
-///
-/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-///
-// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-public class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
+namespace AA25_RichTextEdit.Properties {
+ using System;
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
///
- /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+ /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- public static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AA25_RichTextEdit.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
+ // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+ // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+ // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+ // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
}
- }
-
- ///
- /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
- /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- public static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
+
+ ///
+ /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AA25_RichTextEdit.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
}
- set {
- resourceCulture = value;
+
+ ///
+ /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+ /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
}
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die MVVM-RichTextEdit using Community-Toolkit ähnelt.
- ///
- public static string Description {
- get {
- return ResourceManager.GetString("Description", resourceCulture);
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die MVVM-RichTextEdit using Community-Toolkit ähnelt.
+ ///
+ public static string Description {
+ get {
+ return ResourceManager.GetString("Description", resourceCulture);
+ }
}
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die <Page
- /// xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- /// xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- /// xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- /// xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- /// xmlns:local="clr-namespace:AA25_RichTextEdit.Views"
- /// xmlns:p="clr-namespace:AA25_RichTextEdit.Properties"
- /// xmlns:vc="clr-namespace:AA25_RichTextEdit.ValueConverter"
- /// xmlns:mvvm="clr-namespace: [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
- ///
- public static string RichTextEditView {
- get {
- return ResourceManager.GetString("RichTextEditView", resourceCulture);
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die <UserControl x:Class="AA25_RichTextEdit.Views.RichTextEditView"
+ /// xmlns="https://github.com/avaloniaui"
+ /// xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ /// xmlns:avrichtextbox="using:AvRichTextBox"
+ /// xmlns:vmi="clr-namespace:AA25_RichTextEdit.ViewModels.Interfaces"
+ /// x:DataType="vmi:IRichTextEditViewModel">
+ /// <DockPanel Background="Silver">
+ /// <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Spacing="4" FlowDirection="LeftToRight [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
+ ///
+ public static string RichTextEditView {
+ get {
+ return ResourceManager.GetString("RichTextEditView", resourceCulture);
+ }
}
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die // ***********************************************************************
- ///// Assembly : AA25_RichTextEdit
- ///// Author : Mir
- ///// Created : 08-11-2022
- /////
- ///// Last Modified By : Mir
- ///// Last Modified On : 08-24-2022
- ///// ***********************************************************************
- ///// <copyright file="MainWindowViewModel.cs" company="JC-Soft">
- ///// Copyright © JC-Soft 2022
- ///// </copyright>
- ///// <summary></summary>
- ///// ************************************************** [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
- ///
- public static string RichTextEditViewModel {
- get {
- return ResourceManager.GetString("RichTextEditViewModel", resourceCulture);
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die // ***********************************************************************
+ ///// Assembly : AA25_RichTextEdit
+ ///// Author : Mir
+ ///// ***********************************************************************
+ ///using CommunityToolkit.Mvvm.ComponentModel;
+ ///using CommunityToolkit.Mvvm.Input;
+ ///using BaseLib.Helper;
+ ///using AA25_RichTextEdit.Models;
+ ///using System;
+ ///using System.ComponentModel;
+ ///using System.IO;
+ ///using System.Reflection;
+ ///using AA25_RichTextEdit.ViewModels.Interfaces;
+ ///using Avalonia.Vie [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt.
+ ///
+ public static string RichTextEditViewModel {
+ get {
+ return ResourceManager.GetString("RichTextEditViewModel", resourceCulture);
+ }
}
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die CT-RichTextEdit-View ähnelt.
- ///
- public static string Title {
- get {
- return ResourceManager.GetString("Title", resourceCulture);
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die CT-RichTextEdit-View ähnelt.
+ ///
+ public static string Title {
+ get {
+ return ResourceManager.GetString("Title", resourceCulture);
+ }
}
}
}
diff --git a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.resx b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.resx
index d388d764d..76edafd87 100644
--- a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.resx
+++ b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Properties/Resources.resx
@@ -122,7 +122,7 @@
- ..\Views\RichTextEditView.xaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+ ..\Views\RichTextEditView.axaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
..\ViewModels\RichTextEditViewModel.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
diff --git a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/ViewModels/Helper/RichTextboxHelper.cs b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/ViewModels/Helper/RichTextboxHelper.cs
index a94f94034..91e282c7b 100644
--- a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/ViewModels/Helper/RichTextboxHelper.cs
+++ b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/ViewModels/Helper/RichTextboxHelper.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading;
using System.Windows;
-using System.Windows.Markup;
+using Avalonia.Markup;
namespace AA25_RichTextEdit.ViewModels.Helper;
diff --git a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Views/RichTextEditView.axaml.cs b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Views/RichTextEditView.axaml.cs
index fb78c11c1..e70c8e5ba 100644
--- a/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Views/RichTextEditView.axaml.cs
+++ b/Avalonia_Apps/AA25_RichTextEdit/AA25_RichTextEdit/Views/RichTextEditView.axaml.cs
@@ -1,7 +1,7 @@
using Avalonia.Controls;
using System;
-using CommonDialogs.Interfaces;
using AA25_RichTextEdit.ViewModels;
+using Avln_CommonDialogs.Base.Interfaces;
namespace AA25_RichTextEdit.Views;
@@ -35,10 +35,11 @@ private void RichTextEditView_AttachedToVisualTree(object? sender, Avalonia.Visu
private bool? DoPrintDialog(IPrintDialog par, Action? onPrint)
{
- bool? result = par.ShowDialog();
+ bool? result = par.ShowAsync().GetAwaiter().GetResult();
+
if (result ?? false) onPrint?.Invoke(par, null); // Avalonia placeholder
return result;
}
- private void DoClose() => (this.GetVisualRoot() as Window)?.Close();
+ private void DoClose() => (this)?.Close();
}
diff --git a/Avalonia_Apps/Avalonia_Apps.sln b/Avalonia_Apps/Avalonia_Apps.sln
index f87d8f366..4b33baac8 100644
--- a/Avalonia_Apps/Avalonia_Apps.sln
+++ b/Avalonia_Apps/Avalonia_Apps.sln
@@ -237,6 +237,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avln_RichTextEdit", "AA25_R
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Document.Flow", "AA25_RichTextEdit\Document.Flow\Document.Flow.csproj", "{167E435C-6598-F86F-1743-AF5C3B274E13}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AA20a_CommonDialogs", "AA20_SysDialogs\AA20a_CommonDialogs\AA20a_CommonDialogs.csproj", "{9F873885-C33A-C49F-95B8-D0D1A5BE6968}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avln_CommonDialogs.Base", "Libraries\Avln_CommonDialogs.Base\Avln_CommonDialogs.Base.csproj", "{C0C89947-CE7A-36DC-EADF-2C2255AC1D78}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avln_CommonDialogs.Avalonia", "Libraries\Avln_CommonDialogs.Avalonia\Avln_CommonDialogs.Avalonia.csproj", "{D94D599F-6B68-AB23-FF20-0FBD684A1FE7}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -447,6 +453,18 @@ Global
{167E435C-6598-F86F-1743-AF5C3B274E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
{167E435C-6598-F86F-1743-AF5C3B274E13}.Release|Any CPU.ActiveCfg = Release|Any CPU
{167E435C-6598-F86F-1743-AF5C3B274E13}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9F873885-C33A-C49F-95B8-D0D1A5BE6968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9F873885-C33A-C49F-95B8-D0D1A5BE6968}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9F873885-C33A-C49F-95B8-D0D1A5BE6968}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9F873885-C33A-C49F-95B8-D0D1A5BE6968}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C0C89947-CE7A-36DC-EADF-2C2255AC1D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C0C89947-CE7A-36DC-EADF-2C2255AC1D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C0C89947-CE7A-36DC-EADF-2C2255AC1D78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C0C89947-CE7A-36DC-EADF-2C2255AC1D78}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D94D599F-6B68-AB23-FF20-0FBD684A1FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D94D599F-6B68-AB23-FF20-0FBD684A1FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D94D599F-6B68-AB23-FF20-0FBD684A1FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D94D599F-6B68-AB23-FF20-0FBD684A1FE7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -502,6 +520,9 @@ Global
{9976096C-CC4E-5DDA-B34D-AA25D402703F} = {3DB34546-9932-4FDF-A61C-E42E9C1FFDC9}
{EFE04CA3-4C28-4D56-9AC3-B6C422C24626} = {3DB34546-9932-4FDF-A61C-E42E9C1FFDC9}
{167E435C-6598-F86F-1743-AF5C3B274E13} = {3DB34546-9932-4FDF-A61C-E42E9C1FFDC9}
+ {9F873885-C33A-C49F-95B8-D0D1A5BE6968} = {BE3C4175-29CB-4B10-A72B-45259D58A33C}
+ {C0C89947-CE7A-36DC-EADF-2C2255AC1D78} = {FBC48B38-56FA-4530-850A-8A68B3A959CF}
+ {D94D599F-6B68-AB23-FF20-0FBD684A1FE7} = {FBC48B38-56FA-4530-850A-8A68B3A959CF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CCEB9146-C458-415E-BB4B-E073B0B24876}
diff --git a/Avalonia_Apps/AvlnSamples/Avln_AnimationTiming/Avln_AnimationTiming.csproj b/Avalonia_Apps/AvlnSamples/Avln_AnimationTiming/Avln_AnimationTiming.csproj
index 3f4006b73..21257cf41 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_AnimationTiming/Avln_AnimationTiming.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_AnimationTiming/Avln_AnimationTiming.csproj
@@ -38,13 +38,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_AnimationTimingTests/Avln_AnimationTimingTests.csproj b/Avalonia_Apps/AvlnSamples/Avln_AnimationTimingTests/Avln_AnimationTimingTests.csproj
index e8623ad95..cae31cbef 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_AnimationTimingTests/Avln_AnimationTimingTests.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_AnimationTimingTests/Avln_AnimationTimingTests.csproj
@@ -9,9 +9,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Avalonia_Apps/AvlnSamples/Avln_Brushes/Avln_Brushes.csproj b/Avalonia_Apps/AvlnSamples/Avln_Brushes/Avln_Brushes.csproj
index 3b20b6f46..b3b35d7a1 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_Brushes/Avln_Brushes.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_Brushes/Avln_Brushes.csproj
@@ -23,12 +23,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_Complex_Layout/Avln_Complex_Layout.csproj b/Avalonia_Apps/AvlnSamples/Avln_Complex_Layout/Avln_Complex_Layout.csproj
index 10b9ea2f9..bd84dad7f 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_Complex_Layout/Avln_Complex_Layout.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_Complex_Layout/Avln_Complex_Layout.csproj
@@ -18,14 +18,14 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_Complex_LayoutTests/Avln_Complex_LayoutTests.csproj b/Avalonia_Apps/AvlnSamples/Avln_Complex_LayoutTests/Avln_Complex_LayoutTests.csproj
index fd12911bc..4ff71aaa1 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_Complex_LayoutTests/Avln_Complex_LayoutTests.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_Complex_LayoutTests/Avln_Complex_LayoutTests.csproj
@@ -4,10 +4,10 @@
false
-
-
+
+
-
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_CustomAnimation/Avln_CustomAnimation.csproj b/Avalonia_Apps/AvlnSamples/Avln_CustomAnimation/Avln_CustomAnimation.csproj
index 812caff42..da3ae96b1 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_CustomAnimation/Avln_CustomAnimation.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_CustomAnimation/Avln_CustomAnimation.csproj
@@ -12,12 +12,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_Geometry/Avln_Geometry.csproj b/Avalonia_Apps/AvlnSamples/Avln_Geometry/Avln_Geometry.csproj
index 64e26ba81..2fdd96f36 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_Geometry/Avln_Geometry.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_Geometry/Avln_Geometry.csproj
@@ -25,12 +25,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_Hello_World/Avln_Hello_World.csproj b/Avalonia_Apps/AvlnSamples/Avln_Hello_World/Avln_Hello_World.csproj
index ca12d3155..e6662ed76 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_Hello_World/Avln_Hello_World.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_Hello_World/Avln_Hello_World.csproj
@@ -18,13 +18,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_Hello_WorldTests/Avln_Hello_WorldTests.csproj b/Avalonia_Apps/AvlnSamples/Avln_Hello_WorldTests/Avln_Hello_WorldTests.csproj
index 98f11b678..fabea28f5 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_Hello_WorldTests/Avln_Hello_WorldTests.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_Hello_WorldTests/Avln_Hello_WorldTests.csproj
@@ -9,13 +9,13 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_ImageView/Avln_ImageView.csproj b/Avalonia_Apps/AvlnSamples/Avln_ImageView/Avln_ImageView.csproj
index 9f7603ab8..605326e7d 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_ImageView/Avln_ImageView.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_ImageView/Avln_ImageView.csproj
@@ -13,13 +13,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_IntegrationTestApp/Avln_IntegrationTestApp.csproj b/Avalonia_Apps/AvlnSamples/Avln_IntegrationTestApp/Avln_IntegrationTestApp.csproj
index 903f33c19..4c455362c 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_IntegrationTestApp/Avln_IntegrationTestApp.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_IntegrationTestApp/Avln_IntegrationTestApp.csproj
@@ -22,13 +22,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_MoveWindow/Avln_MoveWindow.csproj b/Avalonia_Apps/AvlnSamples/Avln_MoveWindow/Avln_MoveWindow.csproj
index 4ab714f8b..e2a0ee05b 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_MoveWindow/Avln_MoveWindow.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_MoveWindow/Avln_MoveWindow.csproj
@@ -18,13 +18,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_MoveWindowTests/Avln_MoveWindowTests.csproj b/Avalonia_Apps/AvlnSamples/Avln_MoveWindowTests/Avln_MoveWindowTests.csproj
index 0be2e2957..ccc38fe44 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_MoveWindowTests/Avln_MoveWindowTests.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_MoveWindowTests/Avln_MoveWindowTests.csproj
@@ -9,13 +9,13 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_RenderDemo/Avln_RenderDemo.csproj b/Avalonia_Apps/AvlnSamples/Avln_RenderDemo/Avln_RenderDemo.csproj
index 131e0d148..2ca3d63f7 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_RenderDemo/Avln_RenderDemo.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_RenderDemo/Avln_RenderDemo.csproj
@@ -13,13 +13,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_Sample_Template/Avln_Sample_Template.csproj b/Avalonia_Apps/AvlnSamples/Avln_Sample_Template/Avln_Sample_Template.csproj
index 2264d5e57..b8cb57a02 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_Sample_Template/Avln_Sample_Template.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_Sample_Template/Avln_Sample_Template.csproj
@@ -18,13 +18,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/Avalonia_Apps/AvlnSamples/Avln_TextTestApp/Avln_TextTestApp.csproj b/Avalonia_Apps/AvlnSamples/Avln_TextTestApp/Avln_TextTestApp.csproj
index 2b7096ffe..341fbf652 100644
--- a/Avalonia_Apps/AvlnSamples/Avln_TextTestApp/Avln_TextTestApp.csproj
+++ b/Avalonia_Apps/AvlnSamples/Avln_TextTestApp/Avln_TextTestApp.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/SampleControls/ControlSamples.Pack.csproj b/Avalonia_Apps/AvlnSamples/SampleControls/ControlSamples.Pack.csproj
new file mode 100644
index 000000000..33f8a20eb
--- /dev/null
+++ b/Avalonia_Apps/AvlnSamples/SampleControls/ControlSamples.Pack.csproj
@@ -0,0 +1,29 @@
+
+
+
+ net8.0;net9.0
+ enable
+ true
+ ControlSamples
+ 0.1.0-local
+ Samples
+ Reusable sample controls for Avalonia demos.
+ $(SolutionDir).packages
+ false
+ ControlSamples
+
+
+
+
+ %(Filename)
+
+
+ Designer
+
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/SampleControls/ControlSamples.csproj b/Avalonia_Apps/AvlnSamples/SampleControls/ControlSamples.csproj
new file mode 100644
index 000000000..240b4adce
--- /dev/null
+++ b/Avalonia_Apps/AvlnSamples/SampleControls/ControlSamples.csproj
@@ -0,0 +1,30 @@
+
+
+
+ net8.0;net9.0
+ enable
+ true
+ ControlSamples
+ 0.1.0-local
+ Samples
+ Reusable sample controls for Avalonia demos.
+ $(SolutionDir).packages
+ false
+
+
+
+
+ %(Filename)
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/AvlnSamples/SampleControls/HamburgerMenu/HamburgerMenu.cs b/Avalonia_Apps/AvlnSamples/SampleControls/HamburgerMenu/HamburgerMenu.cs
new file mode 100644
index 000000000..57f8a138a
--- /dev/null
+++ b/Avalonia_Apps/AvlnSamples/SampleControls/HamburgerMenu/HamburgerMenu.cs
@@ -0,0 +1,84 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Media;
+
+namespace ControlSamples
+{
+ public class HamburgerMenu : TabControl
+ {
+ private SplitView? _splitView;
+
+ public static readonly StyledProperty PaneBackgroundProperty =
+ SplitView.PaneBackgroundProperty.AddOwner();
+
+ public IBrush? PaneBackground
+ {
+ get => GetValue(PaneBackgroundProperty);
+ set => SetValue(PaneBackgroundProperty, value);
+ }
+
+ public static readonly StyledProperty ContentBackgroundProperty =
+ AvaloniaProperty.Register(nameof(ContentBackground));
+
+ public IBrush? ContentBackground
+ {
+ get => GetValue(ContentBackgroundProperty);
+ set => SetValue(ContentBackgroundProperty, value);
+ }
+
+ public static readonly StyledProperty ExpandedModeThresholdWidthProperty =
+ AvaloniaProperty.Register(nameof(ExpandedModeThresholdWidth), 1008);
+
+ public int ExpandedModeThresholdWidth
+ {
+ get => GetValue(ExpandedModeThresholdWidthProperty);
+ set => SetValue(ExpandedModeThresholdWidthProperty, value);
+ }
+
+ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+ {
+ base.OnApplyTemplate(e);
+
+ _splitView = e.NameScope.Find("PART_NavigationPane");
+ }
+
+ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+ {
+ base.OnPropertyChanged(change);
+
+ if (change.Property == BoundsProperty && _splitView is not null)
+ {
+ var (oldBounds, newBounds) = change.GetOldAndNewValue();
+ EnsureSplitViewMode(oldBounds, newBounds);
+ }
+
+ if (change.Property == SelectedItemProperty)
+ {
+ if (_splitView is not null && _splitView.DisplayMode == SplitViewDisplayMode.Overlay)
+ {
+ _splitView.SetCurrentValue(SplitView.IsPaneOpenProperty, false);
+ }
+ }
+ }
+
+ private void EnsureSplitViewMode(Rect oldBounds, Rect newBounds)
+ {
+ if (_splitView is not null)
+ {
+ var threshold = ExpandedModeThresholdWidth;
+
+ if (newBounds.Width >= threshold)
+ {
+ _splitView.DisplayMode = SplitViewDisplayMode.Inline;
+ _splitView.IsPaneOpen = true;
+ }
+ else if (newBounds.Width < threshold)
+ {
+ _splitView.DisplayMode = SplitViewDisplayMode.Overlay;
+ _splitView.IsPaneOpen = false;
+ }
+ }
+ }
+ }
+}
diff --git a/Avalonia_Apps/AvlnSamples/SampleControls/HamburgerMenu/HamburgerMenu.xaml b/Avalonia_Apps/AvlnSamples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
new file mode 100644
index 000000000..4ab09e958
--- /dev/null
+++ b/Avalonia_Apps/AvlnSamples/SampleControls/HamburgerMenu/HamburgerMenu.xaml
@@ -0,0 +1,276 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #99FFFFFF
+ #FF1F1F1F
+ #FF000000
+ #FF171717
+
+
+ #99000000
+ #FFE6E6E6
+ #FFFFFFFF
+ #FFF2F2F2
+
+
+
+ 40
+ 220
+ 36
+ 36
+ 32
+ 12,0,0,0
+ 52,0,0,0
+ 212,0,0,0
+ 1 1 1 1 #2000, 0 0 1 1 #2fff
+ 0 0 1 1 #2000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/BenchmarkSuite1/BenchmarkSuite1.csproj b/Avalonia_Apps/BenchmarkSuite1/BenchmarkSuite1.csproj
index ec0e7cb39..1556596f7 100644
--- a/Avalonia_Apps/BenchmarkSuite1/BenchmarkSuite1.csproj
+++ b/Avalonia_Apps/BenchmarkSuite1/BenchmarkSuite1.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/Avalonia_Apps/Libraries/Avln_BaseLib/Avln_BaseLib.csproj b/Avalonia_Apps/Libraries/Avln_BaseLib/Avln_BaseLib.csproj
index 228b64b39..cfa2854a4 100644
--- a/Avalonia_Apps/Libraries/Avln_BaseLib/Avln_BaseLib.csproj
+++ b/Avalonia_Apps/Libraries/Avln_BaseLib/Avln_BaseLib.csproj
@@ -26,10 +26,10 @@
-
-
-
-
+
+
+
+
diff --git a/Avalonia_Apps/Libraries/Avln_BaseLibTests/Avln_BaseLibTests.csproj b/Avalonia_Apps/Libraries/Avln_BaseLibTests/Avln_BaseLibTests.csproj
index e35c3cdfd..b24aa4ce8 100644
--- a/Avalonia_Apps/Libraries/Avln_BaseLibTests/Avln_BaseLibTests.csproj
+++ b/Avalonia_Apps/Libraries/Avln_BaseLibTests/Avln_BaseLibTests.csproj
@@ -15,15 +15,15 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Avln_CommonDialogs.Avalonia.csproj b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Avln_CommonDialogs.Avalonia.csproj
new file mode 100644
index 000000000..8ea65432d
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Avln_CommonDialogs.Avalonia.csproj
@@ -0,0 +1,20 @@
+
+
+
+ net8.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaColorDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaColorDialog.cs
new file mode 100644
index 000000000..f1235e99b
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaColorDialog.cs
@@ -0,0 +1,80 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avln_CommonDialogs.Base.Interfaces;
+
+namespace Avln_CommonDialogs.Avalonia.Dialogs;
+
+public sealed class AvaloniaColorDialog : IColorDialog
+{
+ private readonly Func _topLevelProvider;
+
+ public AvaloniaColorDialog(Func topLevelProvider)
+ {
+ _topLevelProvider = topLevelProvider;
+ }
+
+ public bool AllowAlpha { get; set; } = true;
+
+ // expects/returns Avalonia.Media.Color (kept as object for base agnostic interface)
+ public object? Color { get; set; }
+
+ public ValueTask ShowAsync(object owner)
+ => ShowInternalAsync(TopLevelOwner.From(owner));
+
+ public ValueTask ShowAsync()
+ => ShowInternalAsync(_topLevelProvider());
+
+ private async ValueTask ShowInternalAsync(TopLevel? owner)
+ {
+ var ownerWindow = owner as Window;
+
+ var picker = new global::Avalonia.Controls.ColorPicker
+ {
+ IsAlphaEnabled = AllowAlpha,
+ Color = Color is Color c ? c : Colors.Black
+ };
+
+ var ok = new Button { Content = "OK", IsDefault = true };
+ var cancel = new Button { Content = "Cancel", IsCancel = true };
+
+ var buttons = new StackPanel
+ {
+ Orientation = global::Avalonia.Layout.Orientation.Horizontal,
+ HorizontalAlignment = global::Avalonia.Layout.HorizontalAlignment.Right,
+ Spacing = 8,
+ Children = { ok, cancel }
+ };
+
+ var root = new DockPanel
+ {
+ LastChildFill = true,
+ Children = { buttons, picker }
+ };
+
+ DockPanel.SetDock(buttons, Dock.Bottom);
+
+ var dlg = new Window
+ {
+ Title = "Color",
+ Width = 520,
+ Height = 420,
+ Content = root,
+ WindowStartupLocation = ownerWindow is null
+ ? WindowStartupLocation.CenterScreen
+ : WindowStartupLocation.CenterOwner
+ };
+
+ var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+ ok.Click += (_, _) => { Color = picker.Color; tcs.TrySetResult(true); dlg.Close(); };
+ cancel.Click += (_, _) => { tcs.TrySetResult(false); dlg.Close(); };
+ dlg.Closed += (_, _) => tcs.TrySetResult(null);
+
+ if (ownerWindow is not null)
+ await dlg.ShowDialog(ownerWindow).ConfigureAwait(false);
+ else
+ dlg.Show();
+
+ return await tcs.Task.ConfigureAwait(false);
+ }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaFontDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaFontDialog.cs
new file mode 100644
index 000000000..d4780964d
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaFontDialog.cs
@@ -0,0 +1,84 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avln_CommonDialogs.Base.Interfaces;
+
+namespace Avln_CommonDialogs.Avalonia.Dialogs;
+
+public sealed class AvaloniaFontDialog : IFontDialog
+{
+ private readonly Func _topLevelProvider;
+
+ public AvaloniaFontDialog(Func topLevelProvider)
+ {
+ _topLevelProvider = topLevelProvider;
+ }
+
+ // expects/returns Avalonia.Media.FontFamily (kept as object for base agnostic interface)
+ public object? Font { get; set; }
+
+ public ValueTask ShowAsync(object owner)
+ => ShowInternalAsync(TopLevelOwner.From(owner));
+
+ public ValueTask ShowAsync()
+ => ShowInternalAsync(_topLevelProvider());
+
+ private async ValueTask ShowInternalAsync(TopLevel? owner)
+ {
+ var ownerWindow = owner as Window;
+
+ var families = FontManager.Current.SystemFonts
+ .OrderBy(f => f.Name)
+ .ToArray();
+
+ var list = new ListBox
+ {
+ ItemsSource = families
+ };
+
+ if (Font is FontFamily current)
+ list.SelectedItem = families.FirstOrDefault(f => f.Name == current.Name);
+
+ var ok = new Button { Content = "OK", IsDefault = true };
+ var cancel = new Button { Content = "Cancel", IsCancel = true };
+
+ var buttons = new StackPanel
+ {
+ Orientation = global::Avalonia.Layout.Orientation.Horizontal,
+ HorizontalAlignment = global::Avalonia.Layout.HorizontalAlignment.Right,
+ Spacing = 8,
+ Children = { ok, cancel }
+ };
+
+ var root = new DockPanel
+ {
+ LastChildFill = true,
+ Children = { buttons, list }
+ };
+
+ DockPanel.SetDock(buttons, Dock.Bottom);
+
+ var dlg = new Window
+ {
+ Title = "Font",
+ Width = 700,
+ Height = 520,
+ Content = root,
+ WindowStartupLocation = ownerWindow is null
+ ? WindowStartupLocation.CenterScreen
+ : WindowStartupLocation.CenterOwner
+ };
+
+ var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+ ok.Click += (_, _) => { Font = list.SelectedItem as FontFamily; tcs.TrySetResult(true); dlg.Close(); };
+ cancel.Click += (_, _) => { tcs.TrySetResult(false); dlg.Close(); };
+ dlg.Closed += (_, _) => tcs.TrySetResult(null);
+
+ if (ownerWindow is not null)
+ await dlg.ShowDialog(ownerWindow).ConfigureAwait(false);
+ else
+ dlg.Show();
+
+ return await tcs.Task.ConfigureAwait(false);
+ }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaOpenFileDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaOpenFileDialog.cs
new file mode 100644
index 000000000..3743f40ac
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaOpenFileDialog.cs
@@ -0,0 +1,93 @@
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avln_CommonDialogs.Base.Interfaces;
+
+namespace Avln_CommonDialogs.Avalonia.Dialogs;
+
+public sealed class AvaloniaOpenFileDialog : IOpenFileDialog
+{
+ private readonly Func _topLevelProvider;
+
+ public AvaloniaOpenFileDialog(Func topLevelProvider)
+ {
+ _topLevelProvider = topLevelProvider;
+ }
+
+ public string? Title { get; set; }
+ public string? InitialDirectory { get; set; }
+ public bool RestoreDirectory { get; set; }
+ public bool AddExtension { get; set; }
+ public bool CheckFileExists { get; set; }
+ public string? DefaultExtension { get; set; }
+
+ public bool AllowMultiple { get; set; }
+
+ public IList MutableFilters { get; } = new List();
+ public IReadOnlyList Filters => MutableFilters as IReadOnlyList;
+
+ public ValueTask> ShowAsync(object owner)
+ => ShowInternalAsync(TopLevelOwner.From(owner));
+
+ public ValueTask> ShowAsync()
+ => ShowInternalAsync(_topLevelProvider());
+
+ private async ValueTask> ShowInternalAsync(TopLevel? topLevel)
+ {
+ if (topLevel?.StorageProvider is not { } sp)
+ return Array.Empty();
+
+ var options = new FilePickerOpenOptions
+ {
+ Title = Title,
+ AllowMultiple = AllowMultiple,
+ FileTypeFilter = ConvertFilters(MutableFilters)
+ };
+
+ if (!string.IsNullOrWhiteSpace(InitialDirectory))
+ {
+ try
+ {
+ options.SuggestedStartLocation = await sp.TryGetFolderFromPathAsync(InitialDirectory).ConfigureAwait(false);
+ }
+ catch
+ {
+ // ignore invalid paths
+ }
+ }
+
+ var files = await sp.OpenFilePickerAsync(options).ConfigureAwait(false);
+ return files.Select(f => f.Path.LocalPath).ToArray();
+ }
+
+ private static IReadOnlyList? ConvertFilters(IEnumerable filters)
+ {
+ var list = new List();
+
+ foreach (var f in filters)
+ {
+ var patterns = f.Patterns
+ .Where(p => !string.IsNullOrWhiteSpace(p))
+ .Select(NormalizePattern)
+ .ToArray();
+
+ list.Add(new FilePickerFileType(f.Name)
+ {
+ Patterns = patterns.Length == 0 ? null : patterns
+ });
+ }
+
+ return list.Count == 0 ? null : list;
+ }
+
+ private static string NormalizePattern(string pattern)
+ {
+ pattern = pattern.Trim();
+ if (pattern.StartsWith("*.", StringComparison.Ordinal) || pattern.StartsWith("*", StringComparison.Ordinal))
+ return pattern;
+
+ if (pattern.StartsWith(".", StringComparison.Ordinal))
+ return "*" + pattern;
+
+ return "*." + pattern;
+ }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaSaveFileDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaSaveFileDialog.cs
new file mode 100644
index 000000000..088465862
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Dialogs/AvaloniaSaveFileDialog.cs
@@ -0,0 +1,95 @@
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avln_CommonDialogs.Base.Interfaces;
+
+namespace Avln_CommonDialogs.Avalonia.Dialogs;
+
+public sealed class AvaloniaSaveFileDialog : ISaveFileDialog
+{
+ private readonly Func _topLevelProvider;
+
+ public AvaloniaSaveFileDialog(Func topLevelProvider)
+ {
+ _topLevelProvider = topLevelProvider;
+ }
+
+ public string? Title { get; set; }
+ public string? InitialDirectory { get; set; }
+ public bool RestoreDirectory { get; set; }
+ public bool AddExtension { get; set; }
+ public bool CheckFileExists { get; set; }
+ public string? DefaultExtension { get; set; }
+
+ public string? InitialFileName { get; set; }
+ public bool OverwritePrompt { get; set; }
+
+ public IList MutableFilters { get; } = new List();
+ public IReadOnlyList Filters => MutableFilters as IReadOnlyList;
+
+ public ValueTask ShowAsync(object owner)
+ => ShowInternalAsync(TopLevelOwner.From(owner));
+
+ public ValueTask ShowAsync()
+ => ShowInternalAsync(_topLevelProvider());
+
+ private async ValueTask ShowInternalAsync(TopLevel? topLevel)
+ {
+ if (topLevel?.StorageProvider is not { } sp)
+ return null;
+
+ var options = new FilePickerSaveOptions
+ {
+ Title = Title,
+ SuggestedFileName = InitialFileName,
+ DefaultExtension = DefaultExtension,
+ FileTypeChoices = ConvertFilters(MutableFilters)
+ };
+
+ if (!string.IsNullOrWhiteSpace(InitialDirectory))
+ {
+ try
+ {
+ options.SuggestedStartLocation = await sp.TryGetFolderFromPathAsync(InitialDirectory).ConfigureAwait(false);
+ }
+ catch
+ {
+ // ignore invalid paths
+ }
+ }
+
+ var file = await sp.SaveFilePickerAsync(options).ConfigureAwait(false);
+ return file?.Path.LocalPath;
+ }
+
+ private static IReadOnlyList? ConvertFilters(IEnumerable filters)
+ {
+ var list = new List();
+
+ foreach (var f in filters)
+ {
+ var patterns = f.Patterns
+ .Where(p => !string.IsNullOrWhiteSpace(p))
+ .Select(NormalizePattern)
+ .ToArray();
+
+ list.Add(new FilePickerFileType(f.Name)
+ {
+ Patterns = patterns.Length == 0 ? null : patterns
+ });
+ }
+
+ return list.Count == 0 ? null : list;
+ }
+
+ private static string NormalizePattern(string pattern)
+ {
+ pattern = pattern.Trim();
+ if (pattern.StartsWith("*.", StringComparison.Ordinal) || pattern.StartsWith("*", StringComparison.Ordinal))
+ return pattern;
+
+ if (pattern.StartsWith(".", StringComparison.Ordinal))
+ return "*" + pattern;
+
+ return "*." + pattern;
+ }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Directory.Packages.props b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Directory.Packages.props
new file mode 100644
index 000000000..ae5ae426a
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Directory.Packages.props
@@ -0,0 +1,3 @@
+
+
+
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Printing/NotSupportedPrintDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Printing/NotSupportedPrintDialog.cs
new file mode 100644
index 000000000..a44fc4617
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/Printing/NotSupportedPrintDialog.cs
@@ -0,0 +1,23 @@
+using Avln_CommonDialogs.Base.Interfaces;
+
+namespace Avln_CommonDialogs.Avalonia.Printing;
+
+public sealed class NotSupportedPrintDialog : IPrintDialog
+{
+ public string? Title { get; set; }
+
+ public uint MinPage { get; set; } = 1;
+ public uint MaxPage { get; set; } = 1;
+
+ public bool AllowCurrentPage { get; set; }
+ public bool AllowSelectedPages { get; set; }
+ public bool AllowPageRange { get; set; } = true;
+
+ public PrintPageRange? PageRange { get; set; }
+
+ public ValueTask ShowAsync(object owner)
+ => new((IPrintSession?)null);
+
+ public ValueTask ShowAsync()
+ => new((IPrintSession?)null);
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/ServiceCollectionExtensions.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/ServiceCollectionExtensions.cs
new file mode 100644
index 000000000..71e8e4826
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/ServiceCollectionExtensions.cs
@@ -0,0 +1,32 @@
+using Avln_CommonDialogs.Avalonia.Dialogs;
+using Avln_CommonDialogs.Avalonia.Printing;
+using Avln_CommonDialogs.Base.Interfaces;
+using Avalonia.Controls;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Avln_CommonDialogs.Avalonia;
+
+public static class ServiceCollectionExtensions
+{
+ ///
+ /// Registers Avalonia-based dialog implementations.
+ ///
+ /// The is used for parameterless ShowAsync() calls.
+ /// If you always call the owner overloads, you can pass () => null.
+ ///
+ public static IServiceCollection AddAvaloniaCommonDialogs(
+ this IServiceCollection services,
+ Func topLevelProvider)
+ {
+ services.AddTransient(_ => new AvaloniaOpenFileDialog(topLevelProvider));
+ services.AddTransient(_ => new AvaloniaSaveFileDialog(topLevelProvider));
+ services.AddTransient(_ => new AvaloniaColorDialog(topLevelProvider));
+ services.AddTransient(_ => new AvaloniaFontDialog(topLevelProvider));
+
+ // Printing is not provided cross-platform by Avalonia out of the box.
+ // Register a placeholder so consumers can still resolve IPrintDialog.
+ services.AddTransient();
+
+ return services;
+ }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/TopLevelOwner.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/TopLevelOwner.cs
new file mode 100644
index 000000000..f9793988d
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Avalonia/TopLevelOwner.cs
@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+
+namespace Avln_CommonDialogs.Avalonia;
+
+public static class TopLevelOwner
+{
+ public static TopLevel? From(object? owner)
+ {
+ if (owner is null)
+ return null;
+
+ if (owner is TopLevel tl)
+ return tl;
+
+ if (owner is Control c)
+ return TopLevel.GetTopLevel(c);
+
+ return null;
+ }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Avln_CommonDialogs.Base.csproj b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Avln_CommonDialogs.Base.csproj
new file mode 100644
index 000000000..fa71b7ae6
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Avln_CommonDialogs.Base.csproj
@@ -0,0 +1,9 @@
+
+
+
+ net8.0
+ enable
+ enable
+
+
+
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Directory.Packages.props b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Directory.Packages.props
new file mode 100644
index 000000000..ae5ae426a
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Directory.Packages.props
@@ -0,0 +1,3 @@
+
+
+
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/FileTypeFilter.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/FileTypeFilter.cs
new file mode 100644
index 000000000..c66aef74b
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/FileTypeFilter.cs
@@ -0,0 +1,3 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public sealed record FileTypeFilter(string Name, IReadOnlyList Patterns);
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IColorDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IColorDialog.cs
new file mode 100644
index 000000000..d4d263f8b
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IColorDialog.cs
@@ -0,0 +1,10 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface IColorDialog
+{
+ bool AllowAlpha { get; set; }
+ object? Color { get; set; }
+
+ ValueTask ShowAsync(object owner);
+ ValueTask ShowAsync();
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IFileDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IFileDialog.cs
new file mode 100644
index 000000000..ae2ff084b
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IFileDialog.cs
@@ -0,0 +1,13 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface IFileDialog
+{
+ string? Title { get; set; }
+ string? InitialDirectory { get; set; }
+ bool RestoreDirectory { get; set; }
+ bool AddExtension { get; set; }
+ bool CheckFileExists { get; set; }
+ string? DefaultExtension { get; set; }
+
+ IReadOnlyList Filters { get; }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IFontDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IFontDialog.cs
new file mode 100644
index 000000000..6f2cef2ba
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IFontDialog.cs
@@ -0,0 +1,9 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface IFontDialog
+{
+ object? Font { get; set; }
+
+ ValueTask ShowAsync(object owner);
+ ValueTask ShowAsync();
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IOpenFileDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IOpenFileDialog.cs
new file mode 100644
index 000000000..a393feae7
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IOpenFileDialog.cs
@@ -0,0 +1,11 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface IOpenFileDialog : IFileDialog
+{
+ bool AllowMultiple { get; set; }
+
+ IList MutableFilters { get; }
+
+ ValueTask> ShowAsync(object owner);
+ ValueTask> ShowAsync();
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintDialog.cs
new file mode 100644
index 000000000..86c56fe52
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintDialog.cs
@@ -0,0 +1,18 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface IPrintDialog
+{
+ string? Title { get; set; }
+
+ uint MinPage { get; set; }
+ uint MaxPage { get; set; }
+
+ bool AllowCurrentPage { get; set; }
+ bool AllowSelectedPages { get; set; }
+ bool AllowPageRange { get; set; }
+
+ PrintPageRange? PageRange { get; set; }
+
+ ValueTask ShowAsync(object owner);
+ ValueTask ShowAsync();
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintPageCanvas.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintPageCanvas.cs
new file mode 100644
index 000000000..af15f94da
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintPageCanvas.cs
@@ -0,0 +1,13 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface IPrintPageCanvas
+{
+ double Width { get; }
+ double Height { get; }
+
+ ///
+ /// Underlying platform-specific drawing target.
+ /// Implementations may expose an Avalonia DrawingContext, SKCanvas, etc.
+ ///
+ object Target { get; }
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintSession.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintSession.cs
new file mode 100644
index 000000000..0f8d4c5b3
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/IPrintSession.cs
@@ -0,0 +1,17 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface IPrintSession : IAsyncDisposable
+{
+ PrintDocumentInfo DocumentInfo { get; }
+
+ ///
+ /// Begins a new page and returns a canvas-like target to draw onto.
+ /// Caller owns the lifetime of the returned object only until .
+ ///
+ ValueTask BeginPageAsync(CancellationToken cancellationToken = default);
+
+ ValueTask EndPageAsync(CancellationToken cancellationToken = default);
+
+ ValueTask CommitAsync(CancellationToken cancellationToken = default);
+ ValueTask CancelAsync(CancellationToken cancellationToken = default);
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/ISaveFileDialog.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/ISaveFileDialog.cs
new file mode 100644
index 000000000..c4442c51a
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/ISaveFileDialog.cs
@@ -0,0 +1,12 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public interface ISaveFileDialog : IFileDialog
+{
+ string? InitialFileName { get; set; }
+ bool OverwritePrompt { get; set; }
+
+ IList MutableFilters { get; }
+
+ ValueTask ShowAsync(object owner);
+ ValueTask ShowAsync();
+}
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/PrintDocumentInfo.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/PrintDocumentInfo.cs
new file mode 100644
index 000000000..3efc01b4f
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/PrintDocumentInfo.cs
@@ -0,0 +1,7 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public sealed record PrintDocumentInfo(
+ double PrintableAreaWidth,
+ double PrintableAreaHeight,
+ double DpiX,
+ double DpiY);
diff --git a/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/PrintPageRange.cs b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/PrintPageRange.cs
new file mode 100644
index 000000000..6977aa366
--- /dev/null
+++ b/Avalonia_Apps/Libraries/Avln_CommonDialogs.Base/Interfaces/PrintPageRange.cs
@@ -0,0 +1,3 @@
+namespace Avln_CommonDialogs.Base.Interfaces;
+
+public readonly record struct PrintPageRange(uint From, uint To);
diff --git a/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj b/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj
index db46080b4..c6fd681ff 100644
--- a/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj
+++ b/Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj
@@ -3,6 +3,7 @@
Library
net6.0;net7.0;net8.0;net481;net48;net472;net462
+ AnyCPU;x64
@@ -29,7 +30,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/Avalonia_Apps/Libraries/BaseLib/Helper/ListHelper.cs b/Avalonia_Apps/Libraries/BaseLib/Helper/ListHelper.cs
index 6a274e268..432f0175c 100644
--- a/Avalonia_Apps/Libraries/BaseLib/Helper/ListHelper.cs
+++ b/Avalonia_Apps/Libraries/BaseLib/Helper/ListHelper.cs
@@ -9,26 +9,72 @@
//
// Copyright © JC-Soft 2023
//
-//
+//
+// Provides extension methods for working with generic lists and arrays,
+// including item manipulation, swapping, and range generation utilities.
+//
// ***********************************************************************
using System;
using System.Collections.Generic;
///
-/// The Helper namespace.
+/// The Helper namespace contains utility classes and extension methods
+/// that provide common functionality across the BaseLib library.
///
namespace BaseLib.Helper;
///
-/// Class ListHelper.
+/// Provides static extension methods for manipulating generic lists and generating arrays.
+/// This class contains helper methods for common list operations such as moving items,
+/// swapping elements, and creating ranges of values.
///
+///
+/// All methods in this class are implemented as extension methods, allowing them to be
+/// called directly on instances or value types.
+///
+///
+///
+/// // Moving an item in a list
+/// var list = new List<string> { "A", "B", "C", "D" };
+/// list.MoveItem(0, 3); // Result: { "B", "C", "A", "D" }
+///
+/// // Swapping items
+/// list.Swap(0, 2); // Swaps items at index 0 and 2
+///
+/// // Creating a range
+/// int[] range = 1.To(5); // Result: { 1, 2, 3, 4, 5 }
+///
+///
public static class ListHelper
{
- /// Moves the item from source to target.
- /// The generic type of the list
- /// The list to change.
- /// The index of the source.
- /// The index of the destination.
+ ///
+ /// Moves an item from a source index to a destination index within the list.
+ ///
+ /// The type of elements in the list.
+ /// The list in which to move the item.
+ /// The zero-based index of the item to move.
+ /// The zero-based destination index where the item should be placed.
+ ///
+ ///
+ /// If the source and destination indices are equal, no operation is performed.
+ ///
+ ///
+ /// The method handles the index shift that occurs when removing an item before
+ /// the destination index. If an exception occurs during insertion, the item
+ /// is restored to its original position before re-throwing the exception.
+ ///
+ ///
+ ///
+ /// Thrown when or is outside
+ /// the valid range of indices for the list.
+ ///
+ ///
+ ///
+ /// var list = new List<int> { 1, 2, 3, 4, 5 };
+ /// list.MoveItem(0, 4); // Moves element at index 0 to index 4
+ /// // Result: { 2, 3, 4, 1, 5 }
+ ///
+ ///
public static void MoveItem(this IList list, int iSrc, int iDst)
{
if (iSrc == iDst) return;
@@ -46,18 +92,59 @@ public static void MoveItem(this IList list, int iSrc, int iDst)
}
///
- /// Exchanges the items.
+ /// Exchanges (swaps) the positions of two items in the list.
///
- /// The generic type of the list
- /// The list to change.
- /// The index of the first item.
- /// The index of the second item.
+ /// The type of elements in the list.
+ /// The list containing the items to swap.
+ /// The zero-based index of the first item to swap.
+ /// The zero-based index of the second item to swap.
+ ///
+ /// If both indices are equal, no operation is performed.
+ /// Uses tuple deconstruction for efficient in-place swapping.
+ ///
+ ///
+ /// Thrown when or is outside
+ /// the valid range of indices for the list.
+ ///
+ ///
+ ///
+ /// var list = new List<string> { "A", "B", "C" };
+ /// list.Swap(0, 2); // Swaps "A" and "C"
+ /// // Result: { "C", "B", "A" }
+ ///
+ ///
public static void Swap(this IList list, int iItm1, int iItm2)
{
if (iItm1 == iItm2) return;
- (list[iItm1], list[iItm2]) = (list[iItm2],list[iItm1]);
+ (list[iItm1], list[iItm2]) = (list[iItm2], list[iItm1]);
}
+ ///
+ /// Creates an array containing a range of values from to inclusive.
+ ///
+ ///
+ /// A value type that implements and can be converted to and from .
+ ///
+ ///
+ /// The instance used as an extension method anchor. This parameter is not used.
+ ///
+ /// The starting value of the range (inclusive).
+ /// The ending value of the range (inclusive).
+ ///
+ /// An array of type containing all values from
+ /// to inclusive. Returns an empty array if
+ /// is greater than .
+ ///
+ ///
+ /// This method uses internally, so it works best
+ /// with numeric types that can be represented as integers.
+ ///
+ ///
+ ///
+ /// int[] range = typeof(int).Range(1, 5); // Result: { 1, 2, 3, 4, 5 }
+ /// int[] empty = typeof(int).Range(5, 1); // Result: empty array
+ ///
+ ///
public static T[] Range(this Type _, T v1, T v2) where T : struct, IComparable
{
if (v1.CompareTo(v2) > 0)
@@ -67,6 +154,37 @@ public static T[] Range(this Type _, T v1, T v2) where T : struct, IComparabl
result[i] = (T)Convert.ChangeType(Convert.ToInt32(v1) + i, typeof(T));
return result;
}
+
+ ///
+ /// Creates an array containing a range of values from the current value to the specified end value inclusive.
+ ///
+ ///
+ /// A value type that implements and can be converted to and from .
+ ///
+ /// The starting value of the range (inclusive).
+ /// The ending value of the range (inclusive).
+ ///
+ /// An array of type containing all values from
+ /// to inclusive. Returns an empty array if
+ /// is greater than .
+ ///
+ ///
+ ///
+ /// This extension method provides a fluent syntax for creating ranges directly from a value.
+ ///
+ ///
+ /// This method uses internally, so it works best
+ /// with numeric types that can be represented as integers (e.g., ,
+ /// , ).
+ ///
+ ///
+ ///
+ ///
+ /// int[] range = 1.To(5); // Result: { 1, 2, 3, 4, 5 }
+ /// byte[] bytes = ((byte)0).To((byte)3); // Result: { 0, 1, 2, 3 }
+ /// int[] empty = 10.To(5); // Result: empty array
+ ///
+ ///
public static T[] To(this T v1, T v2) where T : struct, IComparable
{
if (v1.CompareTo(v2) > 0)
@@ -76,5 +194,4 @@ public static T[] To(this T v1, T v2) where T : struct, IComparable
result[i] = (T)Convert.ChangeType(Convert.ToInt32(v1) + i, typeof(T));
return result;
}
-
}
diff --git a/Avalonia_Apps/Libraries/BaseLib/Helper/ObjectHelper.cs b/Avalonia_Apps/Libraries/BaseLib/Helper/ObjectHelper.cs
index 04832da4d..686e531de 100644
--- a/Avalonia_Apps/Libraries/BaseLib/Helper/ObjectHelper.cs
+++ b/Avalonia_Apps/Libraries/BaseLib/Helper/ObjectHelper.cs
@@ -1,4 +1,16 @@
-
+// ***********************************************************************
+// Assembly : BaseLib
+// Author : Mir
+// Created : 03-27-2023
+//
+// Last Modified By : Mir
+// Last Modified On : 03-27-2023
+// ***********************************************************************
+//
+// Copyright © JC-Soft 2025
+//
+//
+// ***********************************************************************
using BaseLib.Interfaces;
using System;
using System.Collections.Generic;
@@ -9,8 +21,54 @@
namespace BaseLib.Helper;
+///
+/// Provides extension methods for safe type conversion of instances to various primitive and common types.
+///
+///
+///
+/// This static class contains a collection of extension methods that facilitate the conversion of objects
+/// to specific types such as , , , ,
+/// , , and .
+///
+///
+/// Each conversion method handles various input types including:
+///
+/// - Direct type matches (returns the value as-is)
+/// - String parsing with appropriate format providers
+/// - interface implementations for recursive value extraction
+/// - and values (returns default)
+/// - implementations for standard .NET type conversions
+///
+///
+///
public static class ObjectHelper
{
+ ///
+ /// Converts an object to a 32-bit signed integer.
+ ///
+ /// The object to convert. Can be .
+ /// The default value to return when conversion fails. Defaults to 0.
+ ///
+ /// The converted value, or if conversion is not possible.
+ ///
+ ///
+ /// The conversion is performed using the following priority:
+ ///
+ /// - If is already an , returns it directly.
+ /// - If is a , performs an unchecked cast to .
+ /// - If is a , attempts to parse it as an integer.
+ /// - If implements , recursively converts its .
+ /// - If is or , returns .
+ /// - If implements , uses with .
+ ///
+ ///
+ ///
+ ///
+ /// int result1 = "42".AsInt(); // Returns 42
+ /// int result2 = ((object)null).AsInt(); // Returns 0
+ /// int result3 = "invalid".AsInt(-1); // Returns -1
+ ///
+ ///
public static int AsInt(this object? obj, int def = default) => obj switch
{
int i => i,
@@ -23,6 +81,31 @@ public static class ObjectHelper
_ => def
};
+ ///
+ /// Converts an object to a 64-bit signed integer.
+ ///
+ /// The object to convert. Can be .
+ /// The default value to return when conversion fails. Defaults to 0.
+ ///
+ /// The converted value, or if conversion is not possible.
+ ///
+ ///
+ /// The conversion is performed using the following priority:
+ ///
+ /// - If is already a , returns it directly.
+ /// - If is a , performs an unchecked cast to .
+ /// - If is a , attempts to parse it as a long integer.
+ /// - If implements , recursively converts its .
+ /// - If is or , returns .
+ /// - If implements , uses with .
+ ///
+ ///
+ ///
+ ///
+ /// long result1 = "9223372036854775807".AsLong(); // Returns long.MaxValue
+ /// long result2 = ((object)null).AsLong(); // Returns 0
+ ///
+ ///
public static long AsLong(this object? obj, int def = default) => obj switch
{
long i => i,
@@ -35,7 +118,34 @@ public static class ObjectHelper
_ => def
};
-
+ ///
+ /// Converts an object to an enumeration value of the specified type.
+ ///
+ /// The enumeration type to convert to. Must be a value type and an .
+ /// The object to convert. Can be .
+ ///
+ /// The converted enumeration value of type , or if conversion is not possible.
+ ///
+ ///
+ /// The conversion is performed using the following priority:
+ ///
+ /// - If is already of type , returns it directly.
+ /// - If is an within the valid enum range, converts it to the enum value.
+ /// - If is a , attempts to parse it as an enum name.
+ /// - If implements , recursively converts its .
+ /// - If is or , returns .
+ /// - If is a , performs an unchecked cast and converts to enum.
+ /// - If implements , converts to first, then to enum.
+ ///
+ ///
+ ///
+ ///
+ /// enum Color { Red, Green, Blue }
+ /// Color result1 = "Green".AsEnum<Color>(); // Returns Color.Green
+ /// Color result2 = 1.AsEnum<Color>(); // Returns Color.Green
+ /// Color result3 = "Invalid".AsEnum<Color>(); // Returns Color.Red (default)
+ ///
+ ///
public static T AsEnum(this object? obj) where T : struct, Enum => obj switch
{
T t => t,
@@ -51,6 +161,37 @@ string s when Enum.TryParse(s, out var t) => t,
_ => default
};
+ ///
+ /// Converts an object to a value.
+ ///
+ /// The object to convert. Can be .
+ ///
+ /// The converted value, or if conversion is not possible.
+ ///
+ ///
+ /// The conversion is performed using the following priority:
+ ///
+ /// - If is already a , returns it directly.
+ /// - If is an in the format YYYYMMDD (e.g., 20231225), parses it as a date.
+ /// - If is an that is 0 or greater than 10000000, returns .
+ /// - If implements , recursively converts its .
+ /// - If is a without dots, attempts to parse using .
+ /// - If is a with dots, attempts to parse using .
+ /// - If is a representing a numeric date (YYYYMMDD), parses accordingly.
+ /// - If is a , treats it as ticks for .
+ /// - If is a , converts from OLE Automation date format.
+ /// - If is a , creates a date with year = char value + 1900.
+ /// - If is , returns .
+ /// - If implements , converts from OLE Automation date format.
+ ///
+ ///
+ ///
+ ///
+ /// DateTime result1 = "2023-12-25".AsDate(); // Returns December 25, 2023
+ /// DateTime result2 = 20231225.AsDate(); // Returns December 25, 2023
+ /// DateTime result3 = ((object)null).AsDate(); // Returns DateTime.MinValue
+ ///
+ ///
public static DateTime AsDate(this object? obj) => obj switch
{
DateTime dt => dt,
@@ -69,6 +210,35 @@ string s when DateTime.TryParse(s, CultureInfo.CurrentUICulture, DateTimeStyles.
_ => default,
};
+ ///
+ /// Converts an object to a double-precision floating-point number.
+ ///
+ /// The object to convert. Can be .
+ ///
+ /// The culture-specific formatting information to use for parsing strings.
+ /// If , is used.
+ ///
+ ///
+ /// The converted value, or 0.0 if conversion is not possible.
+ ///
+ ///
+ /// The conversion is performed using the following priority:
+ ///
+ /// - If is already a , returns it directly.
+ /// - If is a , attempts to parse it using and the specified culture.
+ /// - If implements , recursively converts its .
+ /// - If is or , returns (0.0).
+ /// - If is a , returns its numeric value.
+ /// - If implements , uses .
+ ///
+ ///
+ ///
+ ///
+ /// double result1 = "3.14".AsDouble(); // Returns 3.14
+ /// double result2 = "3,14".AsDouble(CultureInfo.GetCultureInfo("de-DE")); // Returns 3.14
+ /// double result3 = ((object)null).AsDouble(); // Returns 0.0
+ ///
+ ///
public static double AsDouble(this object? obj, CultureInfo? culture = null) => obj switch
{
double d => d,
@@ -82,6 +252,33 @@ string s when double.TryParse(s, NumberStyles.Float, culture ?? CultureInfo.Inva
_ => default
};
+ ///
+ /// Converts an object to a Boolean value.
+ ///
+ /// The object to convert. Can be .
+ ///
+ /// The converted value, or if conversion is not possible.
+ ///
+ ///
+ /// The conversion is performed using the following priority:
+ ///
+ /// - If is already a , returns it directly.
+ /// - If implements , recursively converts its .
+ /// - If is or , returns .
+ /// - If is a , attempts to parse it using .
+ /// - If is a equal to "1", returns ; otherwise .
+ /// - If is a , returns for '1', 'T', or 't'.
+ /// - If implements , returns if not equal to 0.
+ ///
+ ///
+ ///
+ ///
+ /// bool result1 = "true".AsBool(); // Returns true
+ /// bool result2 = "1".AsBool(); // Returns true
+ /// bool result3 = 'T'.AsBool(); // Returns true
+ /// bool result4 = ((object)null).AsBool(); // Returns false
+ ///
+ ///
public static bool AsBool(this object? obj) => obj switch
{
bool x => x,
@@ -95,6 +292,32 @@ string s when bool.TryParse(s, out var b) => b,
_ => default
};
+ ///
+ /// Converts an object to a value.
+ ///
+ /// The object to convert. Can be .
+ ///
+ /// The converted value, or if conversion is not possible.
+ ///
+ ///
+ /// The conversion is performed using the following priority:
+ ///
+ /// - If is already a , returns it directly.
+ /// - If implements , recursively converts its .
+ /// - If is or , returns .
+ /// - If is a , attempts to parse it as a GUID.
+ /// - If is a representing an integer, creates a GUID with that integer as the first component.
+ /// - If is a , creates a GUID with that value as the first component.
+ /// - If implements , converts to and creates a GUID with that as the first component.
+ ///
+ ///
+ ///
+ ///
+ /// Guid result1 = "550e8400-e29b-41d4-a716-446655440000".AsGUID(); // Returns the parsed GUID
+ /// Guid result2 = 42.AsGUID(); // Returns GUID with first component = 42
+ /// Guid result3 = ((object)null).AsGUID(); // Returns Guid.Empty
+ ///
+ ///
public static Guid AsGUID(this object? obj) => obj switch
{
Guid g => g,
@@ -109,22 +332,137 @@ string s when Guid.TryParse(s, out var g) => g,
_ => default
};
+ ///
+ /// Executes an action on an object and returns a specified value.
+ ///
+ /// The type of the return value.
+ /// The type of the object on which the action is performed.
+ /// The object on which to perform the action.
+ /// The action to perform on .
+ /// The value to return after the action is executed.
+ /// The value after executing the action.
+ ///
+ /// This method is useful for performing side effects on an object while returning
+ /// a value in a fluent or expression-based context.
+ ///
+ ///
+ ///
+ /// var list = new List<int>();
+ /// int count = list.SetRet(l => l.Add(42), 1); // Adds 42 to list, returns 1
+ ///
+ ///
public static T SetRet(this T2 obj, Action action, T v)
{
action(obj);
return v;
}
}
+
+///
+/// Provides extension methods for dictionary operations with 1-based indexing.
+///
+///
+/// This static class contains helper methods for
+/// that use 1-based indexing internally while accepting 0-based index parameters.
+/// This is useful for compatibility with legacy VB6-style control arrays.
+///
public static class ObjectHelper2
{
+ ///
+ /// Sets a value in the dictionary at a 1-based internal index corresponding to the given 0-based index.
+ ///
+ /// The type of the values in the dictionary.
+ /// The dictionary to modify.
+ /// The value to set.
+ /// The 0-based index. Internally stored at + 1.
+ ///
+ /// This method stores the value at key ( + 1) to maintain
+ /// compatibility with 1-based indexing systems.
+ ///
+ ///
+ ///
+ /// var dic = new Dictionary<int, string>();
+ /// dic.SetIndex("Hello", 0); // Stores "Hello" at key 1
+ ///
+ ///
public static void SetIndex(this Dictionary dic, T value, int index) => dic[index + 1] = value;
+
+ ///
+ /// Gets the 0-based index of a value in the dictionary.
+ ///
+ /// The type of the values in the dictionary.
+ /// The dictionary to search.
+ /// The value to find.
+ ///
+ /// The 0-based index of the value (internal key - 1), or -1 if the value is not found.
+ ///
+ ///
+ /// This method searches for the value using
+ /// and returns the corresponding 0-based index.
+ ///
+ ///
+ ///
+ /// var dic = new Dictionary<int, string> { { 1, "Hello" }, { 2, "World" } };
+ /// int index = dic.GetIndex("World"); // Returns 1 (key 2 - 1)
+ ///
+ ///
public static int GetIndex(this Dictionary dic, T value) => dic.Where((itm) => itm.Value?.Equals(value) ?? false)
.FirstOrDefault().Key - 1;
}
+
+///
+/// Represents a generic control array that uses 0-based external indexing with 1-based internal storage.
+///
+/// The type of elements in the control array.
+///
+///
+/// This class extends to provide functionality
+/// similar to Visual Basic 6 control arrays. The external indexer uses 0-based indexing,
+/// but values are stored internally with 1-based keys.
+///
+///
+/// The class implements to support designer initialization
+/// scenarios, though the implementation is empty.
+///
+///
+///
+///
+/// var controls = new ControlArray<Button>();
+/// controls[1] = new Button(); // Stored at key 2
+/// var button = controls[0]; // Retrieves from key 1
+///
+///
public class ControlArray : Dictionary, ISupportInitialize
{
+ ///
+ /// Signals the object that initialization is starting.
+ ///
+ ///
+ /// This method is part of the interface
+ /// and is intentionally left empty as no special initialization logic is required.
+ ///
public void BeginInit() { }
+
+ ///
+ /// Signals the object that initialization is complete.
+ ///
+ ///
+ /// This method is part of the interface
+ /// and is intentionally left empty as no special finalization logic is required.
+ ///
public void EndInit() { }
+ ///
+ /// Gets the element at the specified 0-based index.
+ ///
+ /// The 0-based index of the element to retrieve.
+ /// The element stored at the internal key ( + 1).
+ ///
+ /// Thrown when no element exists at the specified index.
+ ///
+ ///
+ /// This indexer provides 0-based access while internally using 1-based keys,
+ /// maintaining compatibility with VB6-style control arrays.
+ ///
public new T this[int i] => base[i+1];
}
diff --git a/Avalonia_Apps/Libraries/BaseLib/Helper/StringUtils.cs b/Avalonia_Apps/Libraries/BaseLib/Helper/StringUtils.cs
index d2a7396a4..ccc56783a 100644
--- a/Avalonia_Apps/Libraries/BaseLib/Helper/StringUtils.cs
+++ b/Avalonia_Apps/Libraries/BaseLib/Helper/StringUtils.cs
@@ -9,34 +9,109 @@
//
// Copyright JC-Soft 2023
//
-//
+//
+// Provides a collection of utility extension methods for string manipulation,
+// including quoting/unquoting, splitting, formatting, validation, and substring operations.
+//
// ***********************************************************************
-using System.Collections.Generic;
+using BaseLib.Interfaces;
using System;
+using System.Collections.Generic;
using System.Linq;
-using BaseLib.Interfaces;
+using System.Runtime.InteropServices;
namespace BaseLib.Helper;
-/// A static class with useful string-routines.
+///
+/// A static class providing a comprehensive set of utility extension methods for string manipulation.
+///
+///
+///
+/// This class contains various helper methods for common string operations such as:
+///
+///
+/// - Quoting and unquoting strings (escaping/unescaping special characters)
+/// - String formatting with parameters
+/// - Splitting strings by separators with support for quoted sections
+/// - Tab padding and normalization
+/// - Substring extraction (Left, Right)
+/// - Identifier validation
+/// - Pattern matching (StartswithAny, EndswithAny, ContainsAny)
+///
+///
+/// All methods are implemented as extension methods on or related types,
+/// allowing for fluent method chaining syntax.
+///
+///
+///
+///
+/// // Quoting a multi-line string
+/// string quoted = "Hello\nWorld".Quote(); // Returns "Hello\\nWorld"
+///
+/// // Getting the first part of a string
+/// string first = "Hello World".SFirst(); // Returns "Hello"
+///
+/// // Checking if a string is a valid identifier
+/// bool valid = "MyVariable".IsValidIdentifyer(); // Returns true
+///
+///
public static class StringUtils
{
- public const string AlphaUpper="ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- public const string AlphaLower="abcdefghijklmnopqrstuvwxyz";
- public const string Alpha=AlphaUpper+AlphaLower;
- public const string Numeric="0123456789";
- public const string AlphaNumeric=Alpha+Numeric;
+ ///
+ /// Contains all uppercase letters of the English alphabet (A-Z).
+ ///
+ /// The string "ABCDEFGHIJKLMNOPQRSTUVWXYZ".
+ public const string AlphaUpper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+ ///
+ /// Contains all lowercase letters of the English alphabet (a-z).
+ ///
+ /// The string "abcdefghijklmnopqrstuvwxyz".
+ public const string AlphaLower = "abcdefghijklmnopqrstuvwxyz";
+
+ ///
+ /// Contains all letters of the English alphabet, both uppercase and lowercase.
+ ///
+ /// The concatenation of and .
+ public const string Alpha = AlphaUpper + AlphaLower;
+
+ ///
+ /// Contains all numeric digits (0-9).
+ ///
+ /// The string "0123456789".
+ public const string Numeric = "0123456789";
///
- ///
- /// Makes the specified string quotable.
-> by escaping special Characters (Linefeed, NewLine, Tab ...)
- ///
- ///
- ///
+ /// Contains all alphanumeric characters (letters and digits).
///
- /// the string .
- /// Quoted/escaped string
- /// Does the opposite of
In other words: Puts a given text into one line of text.
+ /// The concatenation of and .
+ public const string AlphaNumeric = Alpha + Numeric;
+
+ ///
+ /// Escapes special characters in a string to make it suitable for single-line representation.
+ ///
+ /// The input string to quote. Can be null.
+ ///
+ /// A string with special characters escaped:
+ ///
+ /// - Backslash (\) becomes \\
+ /// - Tab (\t) becomes \t
+ /// - Carriage return (\r) becomes \r
+ /// - Line feed (\n) becomes \n
+ ///
+ /// Returns an empty string if the input is null or if an exception occurs.
+ ///
+ ///
+ /// This method is the inverse of .
+ /// It converts a multi-line text into a single-line representation by escaping control characters.
+ ///
+ ///
+ ///
+ /// string input = "Line1\nLine2\tTabbed";
+ /// string quoted = input.Quote(); // Returns "Line1\\nLine2\\tTabbed"
+ ///
+ ///
+ ///
public static string Quote(this string? aStr)
{
try
@@ -49,11 +124,38 @@ public static string Quote(this string? aStr)
}
catch { return ""; }
}
- /// Un-quotes the given string.
by un-escaping special characters (Linefeed, Newline, Tab ...)
- /// a string.
- /// the unquoted/un-escaped string
- /// Does the opposite of
In other words: Takes a given line of text and extracts the (original) text.
- public static string UnQuote(this string? aStr)
+
+ ///
+ /// Unescapes special character sequences in a string, restoring the original control characters.
+ ///
+ /// The input string to unquote. Can be null.
+ ///
+ /// A string with escape sequences converted back to their original characters:
+ ///
+ /// - \\ becomes backslash (\)
+ /// - \t becomes tab character
+ /// - \r becomes carriage return
+ /// - \n becomes line feed
+ ///
+ /// Returns an empty string if the input is null.
+ ///
+ ///
+ ///
+ /// This method is the inverse of .
+ /// It converts a single-line escaped representation back to its original multi-line form.
+ ///
+ ///
+ /// The method uses a temporary placeholder character (U+0001) to handle nested backslashes correctly.
+ ///
+ ///
+ ///
+ ///
+ /// string escaped = "Line1\\nLine2\\tTabbed";
+ /// string unquoted = escaped.UnQuote(); // Returns "Line1\nLine2\tTabbed"
+ ///
+ ///
+ ///
+ public static string UnQuote(this string? aStr)
=> (aStr ?? "")
.Replace("\\\\", "\\\u0001")
.Replace("\\t", "\t")
@@ -62,22 +164,50 @@ public static string UnQuote(this string? aStr)
.Replace("\\\u0001", "\\");
///
- /// Formats the specified string with par.
+ /// Formats a string using the specified parameters, similar to .
///
- /// a string.
- /// The par.
- /// System.String.
- ///
+ /// The format string containing placeholders like {0}, {1}, etc.
+ /// An array of objects to format into the string.
+ /// The formatted string with placeholders replaced by the corresponding parameter values.
+ ///
+ /// This is a convenience extension method that wraps ,
+ /// allowing for a more fluent syntax when formatting strings.
+ ///
+ ///
+ ///
+ /// string template = "Hello, {0}! You have {1} messages.";
+ /// string result = template.Format("John", 5); // Returns "Hello, John! You have 5 messages."
+ ///
+ ///
+ ///
+ /// Thrown when the format string is invalid or when there are more placeholders than parameters.
+ ///
public static string Format(this string aStr, params object[] par)
=> string.Format(aStr, par);
///
- /// Gets the first part of the string separated by the separator.
+ /// Extracts the first part of a string before the specified separator.
///
- /// The s.
- /// The sep.
- /// System.String.
- ///
+ /// The input string to split.
+ /// The separator string to search for. Defaults to a single space.
+ ///
+ /// The portion of the string before the first occurrence of the separator.
+ /// If the separator is not found, returns the entire original string.
+ ///
+ ///
+ /// This method is useful for parsing delimited strings when only the first element is needed.
+ /// For the remaining part after the separator, use .
+ ///
+ ///
+ ///
+ /// string input = "key=value";
+ /// string key = input.SFirst("="); // Returns "key"
+ ///
+ /// string words = "Hello World Today";
+ /// string firstWord = words.SFirst(); // Returns "Hello"
+ ///
+ ///
+ ///
public static string SFirst(this string s, string sep = " ")
{
if (!s.Contains(sep)) return s;
@@ -85,24 +215,61 @@ public static string SFirst(this string s, string sep = " ")
}
///
- /// Gets the other part of the string separated by the separator.
+ /// Extracts the remaining part of a string after the first occurrence of the specified separator.
///
- /// The s.
- /// The sep.
- /// System.String.
- ///
+ /// The input string to split.
+ /// The separator string to search for. Defaults to a single space.
+ ///
+ /// The portion of the string after the first occurrence of the separator.
+ /// If the separator is not found, returns an empty string.
+ ///
+ ///
+ /// This method complements for parsing delimited strings.
+ /// Together, they can be used to iterate through delimited elements.
+ ///
+ ///
+ ///
+ /// string input = "key=value=extra";
+ /// string rest = input.SRest("="); // Returns "value=extra"
+ ///
+ /// string words = "Hello World Today";
+ /// string remaining = words.SRest(); // Returns "World Today"
+ ///
+ ///
+ ///
public static string SRest(this string s, string sep = " ")
{
if (!s.Contains(sep)) return "";
return s.Substring(s.IndexOf(sep) + 1);
}
-
- /// Pads the tab of the string with spaces.
- /// The string.
- /// The offset from the start of the line.
- /// System.String.
- ///
+ ///
+ /// Replaces tab characters in a string with the appropriate number of spaces to align to tab stops.
+ ///
+ /// The input string containing tab characters.
+ ///
+ /// The offset from the start of the line to use for tab stop calculation.
+ /// Defaults to 0.
+ ///
+ ///
+ /// A string with all tab characters replaced by spaces, aligned to 8-character tab stops.
+ ///
+ ///
+ ///
+ /// Tab stops are calculated at every 8th character position, taking into account the current
+ /// position in the line plus the specified offset.
+ ///
+ ///
+ /// This is useful for converting tab-formatted text to fixed-width spacing for display
+ /// in environments that don't support tab characters.
+ ///
+ ///
+ ///
+ ///
+ /// string input = "Name\tAge\tCity";
+ /// string padded = input.PadTab(); // Returns "Name Age City" (aligned to 8-char tabs)
+ ///
+ ///
public static string PadTab(this string s, int offs = 0)
{
var _s = s.Split('\t');
@@ -119,19 +286,61 @@ public static string PadTab(this string s, int offs = 0)
static int TabLen(int l, int o) => l + o + (8 - (l + o) % 8) - o;
}
- /// Converts to "Normal" case. (first letter to upper- rest to lowercase)
- /// The string.
- /// System.String.
- /// e.G: pEtEr will be converted to Peter.
+ ///
+ /// Converts a string to "normal" case, where the first letter is uppercase and all subsequent letters are lowercase.
+ ///
+ /// The input string to convert.
+ ///
+ /// The string with the first character in uppercase and all remaining characters in lowercase.
+ /// Returns the original string unchanged if it is null or empty.
+ ///
+ ///
+ /// This method is useful for normalizing names or titles that may have inconsistent casing.
+ /// Only the first character is capitalized; all other characters are converted to lowercase.
+ ///
+ ///
+ ///
+ /// string name = "pEtEr";
+ /// string normalized = name.ToNormal(); // Returns "Peter"
+ ///
+ /// string allCaps = "HELLO";
+ /// string result = allCaps.ToNormal(); // Returns "Hello"
+ ///
+ ///
public static string ToNormal(this string s)
=> string.IsNullOrEmpty(s) ? s : s.Substring(0, 1).ToUpper() + s.Remove(0, 1).ToLower();
- /// Does a quoted split of the given string.
- /// The data.
- /// The separator.
- /// The quotation mark.
- /// List<System.String>.
- ///
+ ///
+ /// Splits a string by a separator while respecting quoted sections that may contain the separator.
+ ///
+ /// The input string to split.
+ /// The separator string to split by. Defaults to comma (",").
+ /// The quotation mark string that defines quoted sections. Defaults to double quote (").
+ ///
+ /// A of strings representing the split elements.
+ /// Quoted sections are preserved as single elements even if they contain the separator.
+ /// Leading and trailing whitespace is trimmed from each element.
+ ///
+ ///
+ ///
+ /// This method is particularly useful for parsing CSV data where fields may contain commas
+ /// enclosed in quotes. The quote marks themselves are removed from the resulting elements.
+ ///
+ ///
+ /// If a quoted section is not properly closed, the remaining content is added as a final element.
+ ///
+ ///
+ ///
+ ///
+ /// string csv = "John,\"Doe, Jr.\",25";
+ /// List<string> fields = csv.QuotedSplit();
+ /// // Returns: ["John", "Doe, Jr.", "25"]
+ ///
+ /// string data = "name='John Smith';age='30'";
+ /// List<string> parts = data.QuotedSplit(";", "'");
+ /// // Returns: ["name=John Smith", "age=30"]
+ ///
+ ///
public static List QuotedSplit(this string Data, string Separator = ",", string QuoteMark = "\"")
{
var arPreSplit = Data.Split(new string[] { Separator }, StringSplitOptions.None);
@@ -170,14 +379,59 @@ public static List QuotedSplit(this string Data, string Separator = ",",
return result;
}
- public static bool EndswithAny(this string s,params string[] strings)
+ ///
+ /// Determines whether the string ends with any of the specified suffixes.
+ ///
+ /// The string to check.
+ /// An array of suffix strings to test against.
+ ///
+ /// true if the string ends with any of the specified suffixes as a complete word boundary;
+ /// otherwise, false.
+ ///
+ ///
+ ///
+ /// This method checks for word-boundary endings by prepending a space to both the input string
+ /// and each suffix before comparison. This ensures that "test" does not match "contest" when
+ /// checking for "test" as an ending.
+ ///
+ ///
+ ///
+ ///
+ /// bool result1 = "Hello World".EndswithAny("World", "Test"); // Returns true
+ /// bool result2 = "contest".EndswithAny("test"); // Returns false (word boundary check)
+ ///
+ ///
+ ///
+ ///
+ public static bool EndswithAny(this string s, params string[] strings)
{
foreach (var item in strings)
- if ((" "+s).EndsWith(" "+item))
+ if ((" " + s).EndsWith(" " + item))
return true;
return false;
}
+ ///
+ /// Determines whether the string contains any of the specified substrings.
+ ///
+ /// The string to search in.
+ /// An array of substrings to search for.
+ ///
+ /// true if the string contains any of the specified substrings;
+ /// otherwise, false.
+ ///
+ ///
+ /// The search is case-sensitive. The method returns true as soon as
+ /// the first matching substring is found.
+ ///
+ ///
+ ///
+ /// bool hasKeyword = "The quick brown fox".ContainsAny("cat", "dog", "fox"); // Returns true
+ /// bool noMatch = "Hello World".ContainsAny("xyz", "123"); // Returns false
+ ///
+ ///
+ ///
+ ///
public static bool ContainsAny(this string s, params string[] strings)
{
foreach (var item in strings)
@@ -185,69 +439,193 @@ public static bool ContainsAny(this string s, params string[] strings)
return true;
return false;
}
+
+ ///
+ /// Determines whether the string starts with any of the specified prefixes.
+ ///
+ /// The string to check.
+ /// An array of prefix strings to test against.
+ ///
+ /// true if the string starts with any of the specified prefixes as a complete word boundary;
+ /// otherwise, false.
+ ///
+ ///
+ ///
+ /// This method checks for word-boundary beginnings by appending a space to both the input string
+ /// and each prefix before comparison. This ensures that "test" does not match "testing" when
+ /// checking for "test" as a beginning.
+ ///
+ ///
+ ///
+ ///
+ /// bool result1 = "Hello World".StartswithAny("Hello", "Hi"); // Returns true
+ /// bool result2 = "testing".StartswithAny("test"); // Returns false (word boundary check)
+ ///
+ ///
+ ///
+ ///
public static bool StartswithAny(this string s, params string[] strings)
{
foreach (var item in strings)
- if ((s+" ").StartsWith(item+" "))
+ if ((s + " ").StartsWith(item + " "))
return true;
return false;
}
-
+
///
- /// Prft, ob der angegebene String ein gltiger Bezeichner (Identifier) ist.
- /// Ein gltiger Bezeichner beginnt mit einem Grobuchstaben (A-Z) und enthlt nur Buchstaben, Ziffern oder Unterstriche.
- /// Leere oder nur aus Leerzeichen bestehende Strings sind ungltig.
+ /// Determines whether the specified string is a valid identifier according to specific naming rules.
///
- /// Der zu prfende String.
- /// True, wenn der String ein gltiger Bezeichner ist, sonst false.
+ /// The string to validate. Can be null.
+ ///
+ /// true if the string is a valid identifier; otherwise, false.
+ ///
+ ///
+ ///
+ /// A valid identifier must meet the following criteria:
+ ///
+ ///
+ /// - Cannot be null, empty, or contain only whitespace
+ /// - Must begin with an uppercase letter (A-Z)
+ /// - Can only contain letters (A-Z, a-z), digits (0-9), or underscores (_)
+ ///
+ ///
+ /// Note: The validation is case-insensitive for subsequent characters, but the first character
+ /// must be an alphabetic character (converted to uppercase for checking).
+ ///
+ ///
+ ///
+ ///
+ /// bool valid1 = "MyVariable".IsValidIdentifyer(); // Returns true
+ /// bool valid2 = "my_variable_123".IsValidIdentifyer(); // Returns true
+ /// bool invalid1 = "123Variable".IsValidIdentifyer(); // Returns false (starts with digit)
+ /// bool invalid2 = "my-variable".IsValidIdentifyer(); // Returns false (contains hyphen)
+ /// bool invalid3 = "".IsValidIdentifyer(); // Returns false (empty)
+ ///
+ ///
public static bool IsValidIdentifyer(this string? s)
{
if (string.IsNullOrWhiteSpace(s)) return false;
var _s = s!.ToUpper();
if (!AlphaUpper.Contains(_s[0])) return false;
foreach (var c in _s)
- if (!(AlphaNumeric+"_").Contains(c)) return false;
+ if (!(AlphaNumeric + "_").Contains(c)) return false;
return true;
}
///
- /// Gibt die ersten iCnt Zeichen des Strings zurck.
- /// Bei positivem iCnt werden die ersten iCnt Zeichen geliefert.
- /// Bei negativem iCnt werden alle bis auf die letzten |iCnt| Zeichen geliefert.
- /// Ist iCnt grer als die Lnge des Strings, wird der gesamte String zurckgegeben.
+ /// Returns the leftmost characters of a string up to the specified count.
///
- /// Der Eingabestring.
- /// Anzahl der gewnschten Zeichen (positiv: von links, negativ: bis auf die letzten |iCnt| Zeichen).
- /// Der entsprechend gekrzte String.
+ /// The input string.
+ ///
+ /// The number of characters to return.
+ ///
+ /// - Positive value: Returns the first characters from the left
+ /// - Negative value: Returns all characters except the last || characters
+ ///
+ ///
+ ///
+ /// A substring containing the specified number of leftmost characters.
+ /// If exceeds the string length, the entire string is returned.
+ /// If the result would be negative length, an empty string is returned.
+ ///
+ ///
+ /// This method provides Python-like string slicing behavior for the beginning of strings.
+ ///
+ ///
+ ///
+ /// string text = "Hello World";
+ ///
+ /// // Positive count - get first N characters
+ /// string first5 = text.Left(5); // Returns "Hello"
+ /// string first20 = text.Left(20); // Returns "Hello World" (entire string)
+ ///
+ /// // Negative count - exclude last N characters
+ /// string allButLast3 = text.Left(-3); // Returns "Hello Wo" (excludes "rld")
+ ///
+ ///
+ ///
public static string Left(this string data, int iCnt)
=> iCnt >= 0
? data.Substring(0, Math.Min(data.Length, iCnt))
: data.Substring(0, Math.Max(0, data.Length + iCnt));
///
- /// Gibt die letzten iCnt Zeichen des Strings zurck.
- /// Bei positivem iCnt werden die letzten iCnt Zeichen geliefert.
- /// Bei negativem iCnt werden die ersten |iCnt| Zeichen entfernt und der Rest geliefert.
- /// Ist iCnt grer als die Lnge des Strings, wird der gesamte String zurckgegeben.
+ /// Returns the rightmost characters of a string up to the specified count.
///
- /// Der Eingabestring.
- /// Anzahl der gewnschten Zeichen (positiv: von rechts, negativ: ab dem |iCnt|-ten Zeichen von links).
- /// Der entsprechend gekrzte String.
+ /// The input string.
+ ///
+ /// The number of characters to return.
+ ///
+ /// - Positive value: Returns the last characters from the right
+ /// - Negative value: Returns all characters starting from the ||th position
+ ///
+ ///
+ ///
+ /// A substring containing the specified number of rightmost characters.
+ /// If exceeds the string length, the entire string is returned.
+ ///
+ ///
+ /// This method provides Python-like string slicing behavior for the end of strings.
+ ///
+ ///
+ ///
+ /// string text = "Hello World";
+ ///
+ /// // Positive count - get last N characters
+ /// string last5 = text.Right(5); // Returns "World"
+ /// string last20 = text.Right(20); // Returns "Hello World" (entire string)
+ ///
+ /// // Negative count - skip first N characters
+ /// string skipFirst3 = text.Right(-3); // Returns "lo World" (skips "Hel")
+ ///
+ ///
+ ///
public static string Right(this string data, int iCnt)
=> iCnt >= 0
? data.Substring(Math.Max(0, data.Length - iCnt))
: data.Substring(Math.Min(data.Length, -iCnt));
///
- /// Gibt eine String-Reprsentation des Objekts zurck.
- /// Falls das Objekt ein String ist, wird es direkt zurckgegeben.
- /// Falls das Objekt das Interface IHasValue implementiert, wird dessen Value als String zurckgegeben.
- /// Bei null wird ein leerer String geliefert, ansonsten wird ToString() verwendet.
+ /// Converts an object to its string representation with special handling for certain types.
///
- /// The data.
- /// The format.(optional)
- /// System.String.
- public static string AsString(this object? data,string? format =null)
+ /// The object to convert. Can be null.
+ ///
+ /// An optional format string. Currently unused but reserved for future implementation.
+ ///
+ ///
+ /// A string representation of the object according to the following rules:
+ ///
+ /// - If is a , it is returned directly
+ /// - If implements , the Value property's string representation is returned
+ /// - If is null, an empty string is returned
+ /// - Otherwise, is called, with null results converted to empty string
+ ///
+ ///
+ ///
+ ///
+ /// This method provides a null-safe way to convert objects to strings, with special handling
+ /// for value wrapper types that implement .
+ ///
+ ///
+ /// The parameter is included for API consistency but is not
+ /// currently used in the implementation.
+ ///
+ ///
+ ///
+ ///
+ /// // String passthrough
+ /// string s = "Hello".AsString(); // Returns "Hello"
+ ///
+ /// // Null handling
+ /// object? nullObj = null;
+ /// string empty = nullObj.AsString(); // Returns ""
+ ///
+ /// // Object conversion
+ /// int number = 42;
+ /// string numStr = number.AsString(); // Returns "42"
+ ///
+ ///
+ public static string AsString(this object? data, string? format = null)
=> data switch
{
string s => s,
@@ -255,16 +633,49 @@ public static string AsString(this object? data,string? format =null)
null => "",
object o => o.ToString() ?? "",
};
-
+
///
- /// Copies the elements of the given string array into the specified list of strings, starting at the given offset.
- /// If the target list is null, a new list with sufficient capacity is created.
- /// Only elements that fit within the bounds of the target list are copied.
+ /// Copies elements from a string array into a target list of strings at a specified offset.
///
/// The source array of strings to copy from.
- /// The target list to copy into. If null, a new list is created.
- /// The zero-based index in the target list at which copying begins. Can be negative.
- /// The target list with the copied elements.
+ ///
+ /// The target list to copy into. If null, a new array is created with
+ /// sufficient capacity to hold all source elements considering the offset.
+ ///
+ ///
+ /// The zero-based index in the target list at which copying begins.
+ /// Can be negative, which will skip the first || elements of the source array.
+ ///
+ ///
+ /// The target list with the copied elements. If was null,
+ /// returns the newly created array.
+ ///
+ ///
+ ///
+ /// Only elements that fit within the bounds of the target list are copied. Elements that would
+ /// fall outside the target list boundaries (either negative indices or beyond the list count)
+ /// are silently ignored.
+ ///
+ ///
+ /// When is null, a new string array is created with size
+ /// Math.Max(0, asData.Length + offs).
+ ///
+ ///
+ ///
+ ///
+ /// // Copy into a new array
+ /// string[] source = { "a", "b", "c" };
+ /// IList<string> result = source.IntoString(); // Creates ["a", "b", "c"]
+ ///
+ /// // Copy with offset into existing array
+ /// string[] target = new string[5];
+ /// source.IntoString(target, 1); // target becomes [null, "a", "b", "c", null]
+ ///
+ /// // Copy with negative offset (skips first element of source)
+ /// string[] target2 = new string[2];
+ /// source.IntoString(target2, -1); // target2 becomes ["b", "c"]
+ ///
+ ///
public static IList IntoString(this string[] asData, IList? asKont = null, int offs = 0)
{
asKont ??= new string[Math.Max(0, asData.Length + offs)];
@@ -274,4 +685,171 @@ public static IList IntoString(this string[] asData, IList? asKo
return asKont;
}
+ ///
+ /// Finds the index of the next placeholder opening bracket ('<') in the specified line that is followed by an alphabetical character.
+ ///
+ /// The source text that may contain placeholder tokens.
+ /// The starting position in the line from which the search begins.
+ ///
+ /// The zero-based index of the next placeholder start if one exists; otherwise, the length of the line plus one.
+ ///
+ public static int GetNextPlaceHolder(this string line, int offset=0)
+ {
+ int result = line.Length + 1;
+ int i = offset;
+ while (i < line.Length)
+ {
+ var p = line.IndexOf('<', i);
+ if (p > -1 && p < line.Length - 2)
+ {
+ if (Alpha.Contains(line[p + 1]))
+ {
+ result = p;
+ i = line.Length;
+ }
+ else
+ i = p + 1;
+ }
+ else
+ i = line.Length;
+ }
+ return result;
+ }
+
+
+ ///
+ /// Attempts to match a probe string against a mask containing named placeholders while collecting the values that fill those placeholders.
+ ///
+ /// The input text that should conform to the placeholder mask.
+ /// The pattern that may contain literal text and placeholder tokens of the form "<Name>".
+ /// A list that receives the resolved placeholder/value pairs when the match succeeds.
+ ///
+ /// An optional callback that can validate whether a candidate value is acceptable for a given placeholder token; returning false rejects the candidate.
+ ///
+ ///
+ /// true if the probe string can be fully matched to the mask with consistent placeholder assignments; otherwise, false.
+ ///
+ ///
+ ///
+ /// The algorithm walks through the mask, matching literal segments case-insensitively and treating placeholders as flexible sections that can absorb
+ /// varying amounts of text. When placeholders are bounded by literal anchors, the method tests each possible split until a consistent assignment is found.
+ ///
+ ///
+ /// Any assignments that fail deeper in the recursion are rolled back to ensure only contains results from successful matches.
+ ///
+ ///
+ public static bool TryPlaceHolderMatching(string Probe, string Mask, List> WilldCardFill, Func? checkPlaceholderCharset = null)
+ {
+ if (WilldCardFill == null)
+ throw new ArgumentNullException(nameof(WilldCardFill));
+
+ Probe ??= string.Empty;
+ Mask ??= string.Empty;
+
+ return Match(Mask, Probe);
+
+
+ bool Match(string currentMask, string currentProbe)
+ {
+ var placeholderIndex = FindPlaceholderIndex(currentMask);
+ if (placeholderIndex >= currentMask.Length)
+ return currentMask.Equals(currentProbe, StringComparison.OrdinalIgnoreCase);
+
+ var literalPrefix = currentMask.Substring(0, placeholderIndex);
+ if (!currentProbe.StartsWith(literalPrefix, StringComparison.OrdinalIgnoreCase))
+ return false;
+
+ var placeholderEnd = currentMask.IndexOf('>', placeholderIndex);
+ if (placeholderEnd < 0)
+ return false;
+
+ var placeholderToken = currentMask.Substring(placeholderIndex, placeholderEnd - placeholderIndex + 1);
+ var suffix = currentMask.Substring(placeholderEnd + 1);
+ var probeRemainder = currentProbe.Substring(literalPrefix.Length);
+
+ if (suffix.Length == 0)
+ return TryAssignCandidate(probeRemainder, placeholderToken, suffix, string.Empty);
+
+ return TryMatchWithAnchors(placeholderToken, suffix, probeRemainder);
+ }
+
+ bool TryMatchWithAnchors(string placeholderToken, string suffix, string probeRemainder)
+ {
+ var nextPlaceholder = FindPlaceholderIndex(suffix);
+ var literalAnchor = nextPlaceholder >= suffix.Length ? suffix : suffix.Substring(0, nextPlaceholder);
+
+ if (!string.IsNullOrEmpty(literalAnchor))
+ {
+ var searchIndex = 0;
+ while (true)
+ {
+ var anchorPos = probeRemainder.IndexOf(literalAnchor, searchIndex, StringComparison.OrdinalIgnoreCase);
+ if (anchorPos < 0)
+ break;
+
+ if (TryAssignCandidate(probeRemainder.Substring(0, anchorPos), placeholderToken, suffix, probeRemainder.Substring(anchorPos)))
+ return true;
+
+ searchIndex = anchorPos + 1;
+ }
+
+ return false;
+ }
+
+ for (var split = 0; split <= probeRemainder.Length; split++)
+ {
+ if (TryAssignCandidate(probeRemainder.Substring(0, split), placeholderToken, suffix, probeRemainder.Substring(split)))
+ return true;
+ }
+
+ return false;
+ }
+
+ bool TryAssignCandidate(string value, string placeholderToken, string suffix, string remainingProbe)
+ {
+ var trimmed = value.Trim();
+ if (checkPlaceholderCharset?.Invoke(placeholderToken, trimmed) == false)
+ return false;
+
+ WilldCardFill.Add(new KeyValuePair(placeholderToken, trimmed));
+ if (Match(suffix, remainingProbe))
+ return true;
+
+ WilldCardFill.RemoveAt(WilldCardFill.Count - 1);
+ return false;
+ }
+
+ int FindPlaceholderIndex(string pattern)
+ {
+ if (string.IsNullOrEmpty(pattern))
+ return pattern.Length;
+
+ var next = pattern.GetNextPlaceHolder();
+ return next >= pattern.Length ? pattern.Length : next;
+ }
+ }
+
+ public static string MTSpaceTrim(this string MT)
+ {
+ IList result = [];
+ char _last = ' ';
+ for (var I = 0; I < MT.Length; I++)
+ {
+ if (MT[I] == ' ')
+ {
+ if (I == 0 || I == MT.Length - 1 || _last == ' ')
+ continue;
+
+ if ((AlphaNumeric.Contains(_last) == AlphaNumeric.Contains(MT[I + 1]) && MT[I + 1] != ' ')
+ || (_last is '>' or '<')
+ || (MT[I + 1] is '>' or '<' or ':'))
+ result.Add(_last = MT[I]);
+ }
+ else
+ result.Add(_last = MT[I]);
+ }
+ return string.Join("", result);
+ }
+
+
}
diff --git a/Avalonia_Apps/Libraries/BaseLib/Interfaces/IConsole.cs b/Avalonia_Apps/Libraries/BaseLib/Interfaces/IConsole.cs
index 30d2bbb15..51a405c64 100644
--- a/Avalonia_Apps/Libraries/BaseLib/Interfaces/IConsole.cs
+++ b/Avalonia_Apps/Libraries/BaseLib/Interfaces/IConsole.cs
@@ -15,24 +15,164 @@
namespace BaseLib.Interfaces;
+///
+/// Defines an abstraction layer for console operations, enabling dependency injection
+/// and testability for console-based applications.
+///
+///
+/// This interface provides a comprehensive set of console operations including:
+///
+/// - Color management for foreground and background
+/// - Window sizing and positioning
+/// - Input/output operations
+/// - Cursor positioning
+/// - Audio feedback capabilities
+///
+/// Implementations of this interface can wrap for production use
+/// or provide mock implementations for unit testing purposes.
+///
public interface IConsole
{
+ ///
+ /// Gets or sets the foreground color of the console output.
+ ///
+ ///
+ /// A value representing the text color.
+ ///
ConsoleColor ForegroundColor { get; set; }
+
+ ///
+ /// Gets or sets the background color of the console output.
+ ///
+ ///
+ /// A value representing the background color behind the text.
+ ///
ConsoleColor BackgroundColor { get; set; }
+
+ ///
+ /// Gets a value indicating whether the console output stream has been redirected.
+ ///
+ ///
+ /// true if the output is redirected to a file or another stream; otherwise, false.
+ ///
bool IsOutputRedirected { get; }
+
+ ///
+ /// Gets a value indicating whether a key press is available in the input stream.
+ ///
+ ///
+ /// true if a key press is available to be read; otherwise, false.
+ ///
bool KeyAvailable { get; }
+
+ ///
+ /// Gets the largest possible number of console window rows based on the current font and display resolution.
+ ///
+ ///
+ /// The maximum number of rows that can be displayed in the console window.
+ ///
int LargestWindowHeight { get; }
+
+ ///
+ /// Gets or sets the title to display in the console window's title bar.
+ ///
+ ///
+ /// A string representing the console window title.
+ ///
string Title { get; set; }
+
+ ///
+ /// Gets or sets the height of the console window area in rows.
+ ///
+ ///
+ /// The number of rows visible in the console window.
+ ///
int WindowHeight { get; set; }
+
+ ///
+ /// Gets or sets the width of the console window area in columns.
+ ///
+ ///
+ /// The number of columns visible in the console window.
+ ///
int WindowWidth { get; set; }
+ ///
+ /// Gets or sets a value indicating whether the cursor is visible.
+ ///
+ bool CursorVisible { get; set; }
+
+ ///
+ /// Gets the width of the console buffer area.
+ ///
+ int BufferWidth { get; }
+
+ ///
+ /// Gets the height of the console buffer area.
+ ///
+ int BufferHeight { get; }
+
+ ///
+ /// Plays a beep sound through the console speaker.
+ ///
+ /// The frequency of the beep sound in hertz (Hz). Valid range is typically 37 to 32767 Hz.
+ /// The duration of the beep sound in milliseconds.
void Beep(int freq, int len);
+
+ ///
+ /// Clears the console buffer and corresponding console window of all displayed information.
+ ///
void Clear();
+
+ ///
+ /// Gets the current position of the cursor within the console buffer.
+ ///
+ ///
+ /// A tuple containing the Left (column) and Top (row) coordinates of the cursor position,
+ /// where (0, 0) represents the top-left corner of the console buffer.
+ ///
(int Left, int Top) GetCursorPosition();
+
+ ///
+ /// Obtains the next character or function key pressed by the user.
+ ///
+ ///
+ /// A object describing the key pressed, including the character
+ /// and any modifier keys (Alt, Shift, Control); or null if no key is available.
+ ///
ConsoleKeyInfo? ReadKey();
+
+ ///
+ /// Reads the next line of characters from the standard input stream.
+ ///
+ ///
+ /// The next line of characters from the input stream, or an empty string if no input is available.
+ ///
string ReadLine();
+ void ResetColor();
+
+ ///
+ /// Sets the position of the cursor within the console buffer.
+ ///
+ /// The column position of the cursor, where 0 is the leftmost column.
+ /// The row position of the cursor, where 0 is the topmost row.
void SetCursorPosition(int left, int top);
+
+ ///
+ /// Writes the specified Unicode character to the standard output stream.
+ ///
+ /// The character to write to the console.
void Write(char ch);
+
+ ///
+ /// Writes the specified string value to the standard output stream.
+ ///
+ /// The string to write. Can be null, in which case nothing is written.
void Write(string? st);
+
+ ///
+ /// Writes the specified string value, followed by the current line terminator, to the standard output stream.
+ ///
+ /// The string to write. Can be null or empty. Defaults to an empty string.
void WriteLine(string? st = "");
}
\ No newline at end of file
diff --git a/Avalonia_Apps/Libraries/BaseLib/Models/ConsoleProxy.cs b/Avalonia_Apps/Libraries/BaseLib/Models/ConsoleProxy.cs
index acae40bc0..0b2ee1214 100644
--- a/Avalonia_Apps/Libraries/BaseLib/Models/ConsoleProxy.cs
+++ b/Avalonia_Apps/Libraries/BaseLib/Models/ConsoleProxy.cs
@@ -6,51 +6,62 @@ namespace BaseLib.Models;
public class ConsoleProxy : IConsole
{
- MethodInfo _writeLineS = typeof(Console).GetMethod(nameof(Console.WriteLine), [typeof(string)])!;
- MethodInfo _beep = typeof(Console).GetMethod(nameof(Console.Beep), [typeof(int), typeof(int)])!;
+ protected MethodInfo _writeLineS = typeof(Console).GetMethod(nameof(Console.WriteLine), [typeof(string)])!;
+ protected MethodInfo _beep = typeof(Console).GetMethod(nameof(Console.Beep), [typeof(int), typeof(int)])!;
#if NET5_0_OR_GREATER
- MethodInfo _GetCursorPosition = typeof(Console).GetMethod(nameof(Console.GetCursorPosition), [])!;
+ protected MethodInfo _GetCursorPosition = typeof(Console).GetMethod(nameof(Console.GetCursorPosition), [])!;
#else
- MethodInfo _CursorLeft = typeof(Console).GetMethod(nameof(Console.CursorLeft), [])!;
- MethodInfo _CursorTop = typeof(Console).GetMethod(nameof(Console.CursorTop), [])!;
+ protected MethodInfo _CursorLeft = typeof(Console).GetMethod(nameof(Console.CursorLeft), [])!;
+ protected MethodInfo _CursorTop = typeof(Console).GetMethod(nameof(Console.CursorTop), [])!;
#endif
- MethodInfo _ReadKey = typeof(Console).GetMethod(nameof(Console.ReadKey), [])!;
- MethodInfo _Readline = typeof(Console).GetMethod(nameof(Console.ReadLine), [])!;
- MethodInfo _setCursorPosition = typeof(Console).GetMethod(nameof(Console.SetCursorPosition), [typeof(int), typeof(int)])!;
- MethodInfo _writeCh = typeof(Console).GetMethod(nameof(Console.Write), [typeof(char)])!;
- MethodInfo _writeS = typeof(Console).GetMethod(nameof(Console.Write), [typeof(string)])!;
- MethodInfo _clear = typeof(Console).GetMethod(nameof(Console.Clear), [])!;
-
- PropertyInfo _ForegroundColor = typeof(Console).GetProperty(nameof(Console.ForegroundColor))!;
- PropertyInfo _BackgroundColor = typeof(Console).GetProperty(nameof(Console.BackgroundColor))!;
- PropertyInfo _IsOutputRedirected = typeof(Console).GetProperty(nameof(Console.IsOutputRedirected))!;
- PropertyInfo _KeyAvailable = typeof(Console).GetProperty(nameof(Console.KeyAvailable))!;
- PropertyInfo _LargestWindowHeight = typeof(Console).GetProperty(nameof(Console.LargestWindowHeight))!;
- PropertyInfo _Title = typeof(Console).GetProperty(nameof(Console.Title))!;
- PropertyInfo _WindowHeight = typeof(Console).GetProperty(nameof(Console.WindowHeight))!;
- PropertyInfo _WindowWidth = typeof(Console).GetProperty(nameof(Console.WindowWidth))!;
-
- public ConsoleColor ForegroundColor { get => _ForegroundColor?.GetValue(null) as ConsoleColor? ?? ConsoleColor.White; set => _ForegroundColor?.SetValue(null,value); }
- public ConsoleColor BackgroundColor { get => _BackgroundColor?.GetValue(null) as ConsoleColor? ?? ConsoleColor.Black; set => _BackgroundColor?.SetValue(null, value); }
- public bool IsOutputRedirected => _IsOutputRedirected?.GetValue(null) as bool? ?? false;
- public bool KeyAvailable => _KeyAvailable?.GetValue(null) as bool? ?? false;
- public int LargestWindowHeight => _LargestWindowHeight?.GetValue(null) as int? ?? 0;
- public string Title { get => _Title?.GetValue(null) as string ?? string.Empty; set => _Title?.SetValue(null, value); }
- public int WindowHeight { get => _WindowHeight?.GetValue(null) as int? ?? 0; set => _WindowHeight?.SetValue(null, value); }
- public int WindowWidth { get => _WindowWidth?.GetValue(null) as int? ?? 0; set => _WindowWidth?.SetValue(null, value); }
-
-
- public void Beep(int freq, int len) => _beep?.Invoke(null, [freq, len]);
- public void Clear() => _clear?.Invoke(null, []);
+ protected MethodInfo _ReadKey = typeof(Console).GetMethod(nameof(Console.ReadKey), [])!;
+ protected MethodInfo _Readline = typeof(Console).GetMethod(nameof(Console.ReadLine), [])!;
+ protected MethodInfo _setCursorPosition = typeof(Console).GetMethod(nameof(Console.SetCursorPosition), [typeof(int), typeof(int)])!;
+ protected MethodInfo _writeCh = typeof(Console).GetMethod(nameof(Console.Write), [typeof(char)])!;
+ protected MethodInfo _writeS = typeof(Console).GetMethod(nameof(Console.Write), [typeof(string)])!;
+ protected MethodInfo _clear = typeof(Console).GetMethod(nameof(Console.Clear), [])!;
+ protected MethodInfo _resetColor = typeof(Console).GetMethod(nameof(Console.ResetColor), [])!;
+
+ protected PropertyInfo _ForegroundColor = typeof(Console).GetProperty(nameof(Console.ForegroundColor))!;
+ protected PropertyInfo _BackgroundColor = typeof(Console).GetProperty(nameof(Console.BackgroundColor))!;
+ protected PropertyInfo _IsOutputRedirected = typeof(Console).GetProperty(nameof(Console.IsOutputRedirected))!;
+ protected PropertyInfo _KeyAvailable = typeof(Console).GetProperty(nameof(Console.KeyAvailable))!;
+ protected PropertyInfo _LargestWindowHeight = typeof(Console).GetProperty(nameof(Console.LargestWindowHeight))!;
+ protected PropertyInfo _Title = typeof(Console).GetProperty(nameof(Console.Title))!;
+ protected PropertyInfo _WindowHeight = typeof(Console).GetProperty(nameof(Console.WindowHeight))!;
+ protected PropertyInfo _WindowWidth = typeof(Console).GetProperty(nameof(Console.WindowWidth))!;
+ protected PropertyInfo _CursorVisible = typeof(Console).GetProperty(nameof(Console.CursorVisible))!;
+ protected PropertyInfo _BufferWidth = typeof(Console).GetProperty(nameof(Console.BufferWidth))!;
+ protected PropertyInfo _BufferHeight = typeof(Console).GetProperty(nameof(Console.BufferHeight))!;
+
+ protected object? instance = default;
+ public ConsoleColor ForegroundColor { get => _ForegroundColor?.GetValue(instance) as ConsoleColor? ?? ConsoleColor.White; set => _ForegroundColor?.SetValue(instance,value); }
+ public ConsoleColor BackgroundColor { get => _BackgroundColor?.GetValue(instance) as ConsoleColor? ?? ConsoleColor.Black; set => _BackgroundColor?.SetValue(instance, value); }
+ public bool IsOutputRedirected => _IsOutputRedirected?.GetValue(instance) as bool? ?? false;
+ public bool KeyAvailable => _KeyAvailable?.GetValue(instance) as bool? ?? false;
+ public int LargestWindowHeight => _LargestWindowHeight?.GetValue(instance) as int? ?? 0;
+ public string Title { get => _Title?.GetValue(instance) as string ?? string.Empty; set => _Title?.SetValue(instance, value); }
+ public int WindowHeight { get => _WindowHeight?.GetValue(instance) as int? ?? 0; set => _WindowHeight?.SetValue(instance, value); }
+ public int WindowWidth { get => _WindowWidth?.GetValue(instance) as int? ?? 0; set => _WindowWidth?.SetValue(instance, value); }
+ public bool CursorVisible { get => _CursorVisible?.GetValue(instance) as bool? ?? false; set => _CursorVisible?.SetValue(instance, value); }
+ public int BufferWidth => _BufferWidth?.GetValue(instance) as int? ?? 0;
+ public int BufferHeight => _BufferHeight?.GetValue(instance) as int? ?? 0;
+
+
+ public void Beep(int freq, int len) => _beep?.Invoke(instance, [freq, len]);
+ public void Clear() => _clear?.Invoke(instance, []);
#if NET5_0_OR_GREATER
- public (int Left, int Top) GetCursorPosition() => _GetCursorPosition?.Invoke(null, []) as (int, int)? ?? (0, 0);
+ public (int Left, int Top) GetCursorPosition() => _GetCursorPosition?.Invoke(instance, []) as (int, int)? ?? (0, 0);
#else
- public (int Left, int Top) GetCursorPosition() => (_CursorLeft?.Invoke(null, []) as int? ?? 0, _CursorTop?.Invoke(null, []) as int? ?? 0);
+ public (int Left, int Top) GetCursorPosition() => (_CursorLeft?.Invoke(instance, []) as int? ?? 0, _CursorTop?.Invoke(instance, []) as int? ?? 0);
#endif
- public ConsoleKeyInfo? ReadKey() => _ReadKey?.Invoke(null, []) as ConsoleKeyInfo?;
- public string ReadLine() => _Readline?.Invoke(null, [])?.ToString() ?? string.Empty;
- public void SetCursorPosition(int left, int top) => _setCursorPosition?.Invoke(null, [left, top]);
- public void Write(char ch) => _writeCh?.Invoke(null, [ch]);
- public void Write(string? st) => _writeS?.Invoke(null, [st]);
- public void WriteLine(string? v) => _writeLineS?.Invoke(null, [v]);
+ public ConsoleKeyInfo? ReadKey() => _ReadKey?.Invoke(instance, []) as ConsoleKeyInfo?;
+ public string ReadLine() => _Readline?.Invoke(instance, [])?.ToString() ?? string.Empty;
+
+ public void ResetColor() => _resetColor?.Invoke(instance, []);
+
+ public void SetCursorPosition(int left, int top) => _setCursorPosition?.Invoke(instance, [left, top]);
+ public void Write(char ch) => _writeCh?.Invoke(instance, [ch]);
+ public void Write(string? st) => _writeS?.Invoke(instance, [st]);
+ public void WriteLine(string? v) => _writeLineS?.Invoke(instance, [v]);
}
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj b/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj
index 8a1e73ac9..54f402aab 100644
--- a/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj
+++ b/Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj
@@ -4,6 +4,7 @@
net8.0;net481;net48;net472;net462
false
true
+ AnyCPU;x64
@@ -14,8 +15,8 @@
$(TargetFrameworks);net10.0
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/Helper/ListHelperTests.cs b/Avalonia_Apps/Libraries/BaseLibTests/Helper/ListHelperTests.cs
new file mode 100644
index 000000000..7f49e6103
--- /dev/null
+++ b/Avalonia_Apps/Libraries/BaseLibTests/Helper/ListHelperTests.cs
@@ -0,0 +1,67 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
+using static BaseLib.Helper.TestHelper;
+
+namespace BaseLib.Helper.Tests;
+
+[TestClass()]
+public class ListHelperTests
+{
+ [TestMethod()]
+ [DataRow(new object[] { 0, 1, 2, 3, 4 }, 2, 2, new object[] { 0, 1, 2, 3, 4 })]
+ [DataRow(new object[] { 0, 1, 2, 3, 4 }, 4, 0, new object[] { 4, 0, 1, 2, 3 })]
+ [DataRow(new object[] { 0, 1, 2, 3, 4 }, 1, 3, new object[] { 0, 2, 1, 3, 4 })]
+ [DataRow(new object[] { 0, 1, 2, 3, 4 }, 2, 5, new object[] { 0, 1, 3, 4, 2 })]
+ [DataRow(new object[] { 0, 1, 2, 3, 4 }, 1, 6, new object[] { 0, 1, 2, 3, 4 })]
+ public void MoveItemTest(object[] aoSrc, int iSrc, int iDst, object[] asExp)
+ {
+ var aoResult = aoSrc.ToList();
+ if (iDst > asExp.Length)
+ Assert.ThrowsExactly(() => aoResult.MoveItem(iSrc, iDst));
+ else
+ aoResult.MoveItem(iSrc, iDst);
+ AssertAreEqual(asExp, aoResult.ToArray());
+ }
+
+ [TestMethod()]
+ [DataRow(new object[] { 0, 1, 2, 3, 4 }, 2, 2, new object[] { 0, 1, 2, 3, 4 })]
+ [DataRow(new object[] { 0, 1, 2, 3, 4 }, 4, 0, new object[] { 4, 1, 2, 3, 0 })]
+ public void SwapTest(object[] aoSrc, int iSrc, int iDst, object[] asExp)
+ {
+ aoSrc.Swap(iSrc, iDst);
+ AssertAreEqual(asExp, aoSrc);
+ }
+
+ [TestMethod()]
+ [DataRow(0, -1, new int[] { })]
+ [DataRow(2, 2, new[] { 2 })]
+ [DataRow(0, 4, new[] { 0, 1, 2, 3, 4 })]
+ public void RangeTest(int iSrc, int iDst, int[] aiExp)
+ {
+ AssertAreEqual(aiExp, typeof(int).Range(iSrc, iDst));
+ }
+
+ [TestMethod()]
+ [DataRow('2', '6', new char[] { '2', '3', '4', '5', '6' })]
+ public void RangeTest2(char iSrc, char iDst, char[] aoExp)
+ {
+ AssertAreEqual(aoExp, typeof(object).Range(iSrc, iDst));
+ }
+
+ [TestMethod()]
+ [DataRow((byte)0, (byte)4, new byte[] { 0, 1, 2, 3, 4 })]
+ public void RangeTest3(byte iSrc, byte iDst, byte[] aoExp)
+ {
+ AssertAreEqual(aoExp, typeof(object).Range(iSrc, iDst));
+ }
+
+ [TestMethod()]
+ [DataRow(0, -1, new int[] { })]
+ [DataRow(2, 2, new[] { 2 })]
+ [DataRow(0, 4, new[] { 0, 1, 2, 3, 4 })]
+ public void ToTest(int iSrc, int iDst, int[] aoExp)
+ {
+ AssertAreEqual(aoExp, iSrc.To(iDst));
+ }
+}
\ No newline at end of file
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/Helper/ObjectHelper2Tests.cs b/Avalonia_Apps/Libraries/BaseLibTests/Helper/ObjectHelper2Tests.cs
new file mode 100644
index 000000000..333e3b3f7
--- /dev/null
+++ b/Avalonia_Apps/Libraries/BaseLibTests/Helper/ObjectHelper2Tests.cs
@@ -0,0 +1,45 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+
+namespace BaseLib.Helper.Tests;
+
+[TestClass()]
+public class ObjectHelper2Tests
+{
+#pragma warning disable CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Fügen Sie ggf. den „erforderlichen“ Modifizierer hinzu, oder deklarieren Sie den Modifizierer als NULL-Werte zulassend.
+ private ControlArray _testClass;
+#pragma warning restore CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Fügen Sie ggf. den „erforderlichen“ Modifizierer hinzu, oder deklarieren Sie den Modifizierer als NULL-Werte zulassend.
+
+ [TestInitialize]
+ public void Init()
+ {
+ _testClass = new ControlArray();
+ }
+
+ [TestMethod()]
+ public void SetIndexTest()
+ {
+ // Act
+ _testClass.SetIndex(8, 4);
+ _testClass.SetIndex(2, 1);
+ // Assert
+ Assert.HasCount(2, _testClass);
+ Assert.AreEqual(8, _testClass[4]);
+ Assert.AreEqual(2, _testClass[1]);
+ }
+
+ [TestMethod()]
+ public void GetIndexTest()
+ {
+ // Arrange
+ var d = (Dictionary)_testClass;
+ d[5] = 8;
+ d[1] = null!;
+ d[2] = 2;
+
+ // Assert
+ Assert.AreEqual(4, _testClass.GetIndex(8));
+ Assert.AreEqual(1, _testClass.GetIndex(2));
+ Assert.AreEqual(-1, _testClass.GetIndex(1));
+ }
+}
\ No newline at end of file
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/Helper/ObjectHelperTests.cs b/Avalonia_Apps/Libraries/BaseLibTests/Helper/ObjectHelperTests.cs
new file mode 100644
index 000000000..1357942ca
--- /dev/null
+++ b/Avalonia_Apps/Libraries/BaseLibTests/Helper/ObjectHelperTests.cs
@@ -0,0 +1,278 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using BaseLib.Interfaces;
+using NSubstitute;
+
+namespace BaseLib.Helper.Tests;
+
+[TestClass()]
+public class ObjectHelperTests
+{
+ [TestMethod()]
+ [DataRow(null, -1)]
+ [DataRow(1, 1)]
+ [DataRow(int.MaxValue, int.MaxValue)]
+ [DataRow(int.MinValue, int.MinValue)]
+ [DataRow(uint.MaxValue-1, -2)]
+ [DataRow(2u, 2)]
+ [DataRow("3", 3)]
+ [DataRow("4.5", -1)]
+ [DataRow(5.1f, 5)]
+ [DataRow(6L, 6)]
+ [DataRow("DBNull", -1)]
+ [DataRow("IHasValue", 0)]
+ [DataRow("_", -1)]
+ public void AsIntTest(object? obj,int iExp)
+ {
+ if (obj is string s)
+ obj = obj switch
+ {
+ "DBNull" => DBNull.Value,
+ "IHasValue" => Substitute.For(),
+ "_" => new object(),
+ _ => obj
+ };
+ // Act
+ var result = ObjectHelper.AsInt(obj,-1);
+
+ // Assert
+ Assert.AreEqual(iExp, result);
+
+ }
+
+ [TestMethod()]
+ [DataRow(null, -1)]
+ [DataRow(1, 1)]
+ [DataRow(long.MaxValue, long.MaxValue)]
+ [DataRow(long.MinValue, long.MinValue)]
+ [DataRow(ulong.MaxValue - 1, -2)]
+ [DataRow(2u, 2)]
+ [DataRow("3", 3)]
+ [DataRow("4.5", -1)]
+ [DataRow(5.1f, 5)]
+ [DataRow(6L, 6)]
+ [DataRow("DBNull", -1)]
+ [DataRow("IHasValue", 0)]
+ [DataRow("_", -1)]
+ public void AsLongTest(object? obj, long lExp)
+ {
+ if (obj is string s)
+ obj = obj switch
+ {
+ "DBNull" => DBNull.Value,
+ "IHasValue" => Substitute.For(),
+ "_" => new object(),
+ _ => obj
+ };
+ // Act
+ var result = ObjectHelper.AsLong(obj, -1);
+
+ // Assert
+ Assert.AreEqual(lExp, result);
+ }
+
+ public enum TestEnum
+ {
+ Default = 0,
+ Value1 = 1,
+ Value2 = 2
+ }
+
+ [TestMethod()]
+ [DataRow(null, TestEnum.Default)]
+ [DataRow("Value1", TestEnum.Value1)]
+ [DataRow("Value2", TestEnum.Value2)]
+ [DataRow("InvalidValue", TestEnum.Default)]
+ [DataRow("TestEnum.Value1", TestEnum.Value1)]
+ [DataRow("IHasValue", TestEnum.Default)]
+ [DataRow("DBNull", TestEnum.Default)]
+ [DataRow(1, TestEnum.Value1)]
+ [DataRow(2, TestEnum.Value2)]
+ [DataRow(2u, TestEnum.Value2)]
+ [DataRow(0, TestEnum.Default)]
+ [DataRow(99, (TestEnum)99)]
+ [DataRow(-1, (TestEnum)(int)-1)]
+ [DataRow("_", TestEnum.Default)]
+ public void AsEnumTest(object? obj, TestEnum expected)
+ {
+ if (obj is string s)
+ obj = obj switch
+ {
+ "DBNull" => DBNull.Value,
+ "IHasValue" => Substitute.For(),
+ "TestEnum.Value1" => TestEnum.Value1,
+
+ "_" => new object(),
+ _ => obj
+ };
+ // Act
+ var result = ObjectHelper.AsEnum(obj);
+
+ // Assert
+ Assert.AreEqual(expected, result);
+ }
+
+ [TestMethod()]
+ [DataRow(null, "0001-01-01T00:00:00")]
+ [DataRow(20231040, "0001-01-01T00:00:00")]
+ [DataRow(20230010, "0001-01-01T00:00:00")]
+ [DataRow(0, "0001-01-01T00:00:00")]
+ [DataRow(20231010, "2023-10-10T00:00:00")]
+ [DataRow(1000u, "1902-09-26T00:00:00")]
+ [DataRow(1000, "1902-09-26T00:00:00")]
+ [DataRow('c', "1999-01-01T00:00:00")]
+ [DataRow("10-10-2000", "2000-10-10T00:00:00")]
+ [DataRow("2023-10-10", "2023-10-10T00:00:00")]
+ [DataRow("10/10/2023", "2023-10-10T00:00:00")]
+ [DataRow("10-10-2023", "2023-10-10T00:00:00")]
+ [DataRow("2023-10-10T10:10:10", "2023-10-10T10:10:10")]
+ [DataRow("InvalidDate", "0001-01-01T00:00:00")]
+ [DataRow(638000000000000000L, "2022-09-28T22:13:20")]
+ [DataRow("DBNull", "0001-01-01T00:00:00")]
+ [DataRow("IHasValue", "0001-01-01T00:00:00")]
+ [DataRow("_", "0001-01-01T00:00:00")]
+ public void AsDateTest(object? obj, string expected)
+ {
+ if (obj is string s)
+ obj = s switch
+ {
+ "DBNull" => DBNull.Value,
+ "IHasValue" => Substitute.For(),
+ "_" => new object(),
+ _ when s.Contains("2000") && DateTime.TryParse(s, out var dt) => dt,
+ _ => obj
+ };
+ // Act
+ var result = ObjectHelper.AsDate(obj);
+
+ // Assert
+ Assert.AreEqual(DateTime.Parse(expected), result);
+ }
+
+ [TestMethod()]
+ [DataRow(null, 0)]
+ [DataRow(1, 1)]
+ [DataRow(long.MaxValue, long.MaxValue)]
+ [DataRow(long.MinValue, long.MinValue)]
+ [DataRow(ulong.MaxValue , ulong.MaxValue)]
+ [DataRow(2u, 2)]
+ [DataRow("3", 3)]
+ [DataRow("Dog", 0)]
+ [DataRow("4.5", 4.5)]
+ [DataRow(5.1f, 5.1f)]
+ [DataRow(double.MinValue, double.MinValue)]
+ [DataRow(double.MaxValue, double.MaxValue)]
+ [DataRow(double.NaN, double.NaN)]
+ [DataRow(6L, 6)]
+ [DataRow('7', 48+7)]
+ [DataRow("DBNull", 0)]
+ [DataRow("IHasValue", 0)]
+ [DataRow("_", 0)]
+ public void AsDoubleTest(object? obj, double dExp)
+ {
+ if (obj is string s)
+ obj = s switch
+ {
+ "DBNull" => DBNull.Value,
+ "IHasValue" => Substitute.For(),
+ "_" => new object(),
+ _ => obj
+ };
+ // Act
+ var result = ObjectHelper.AsDouble(obj);
+
+ // Assert
+ Assert.AreEqual(dExp, result);
+ }
+
+ [TestMethod()]
+ [DataRow(null, false)]
+ [DataRow(true, true)]
+ [DataRow(false, false)]
+ [DataRow(1, true)]
+ [DataRow(0, false)]
+ [DataRow("true", true)]
+ [DataRow("false", false)]
+ [DataRow("True", true)]
+ [DataRow("False", false)]
+ [DataRow("yes", false)]
+ [DataRow("no", false)]
+ [DataRow("1", true)]
+ [DataRow("0", false)]
+ [DataRow('1', true)]
+ [DataRow('T', true)]
+ [DataRow('t', true)]
+ [DataRow('0', false)]
+ [DataRow("DBNull", false)]
+ [DataRow("IHasValue", false)]
+ [DataRow("_", false)]
+ public void AsBoolTest(object? obj, bool bExp)
+ {
+ if (obj is string s)
+ obj = obj switch
+ {
+ "DBNull" => DBNull.Value,
+ "IHasValue" => Substitute.For(),
+ "_" => new object(),
+ _ => obj
+ };
+ // Act
+ var result = ObjectHelper.AsBool(obj);
+
+ // Assert
+ Assert.AreEqual(bExp, result);
+ }
+
+ [TestMethod()]
+ [DataRow(null, "00000000-0000-0000-0000-000000000000")]
+ [DataRow("d3c4a1b2-3f4e-5d6c-7a8b-9c0d1e2f3a4b", "d3c4a1b2-3f4e-5d6c-7a8b-9c0d1e2f3a4b")]
+ [DataRow("invalid-guid", "00000000-0000-0000-0000-000000000000")]
+ [DataRow("00000000-0000-0000-0000-000000000000", "00000000-0000-0000-0000-000000000000")]
+ [DataRow("123456789", "075bcd15-0000-0000-0000-000000000000")]
+ [DataRow(123456789L, "075bcd15-0000-0000-0000-000000000000")]
+ [DataRow(123456789u, "075bcd15-0000-0000-0000-000000000000")]
+ [DataRow("IHasValue", "00000000-0000-0000-0000-000000000000")]
+ [DataRow("DBNull", "00000000-0000-0000-0000-000000000000")]
+ [DataRow("EmptyGUID", "00000000-0000-0000-0000-000000000000")]
+ [DataRow("_", "00000000-0000-0000-0000-000000000000")]
+ public void AsGUIDTest(object? obj, string expected)
+ {
+ if (obj is string s)
+ obj = obj switch
+ {
+ "DBNull" => DBNull.Value,
+ "IHasValue" => Substitute.For(),
+ "EmptyGUID" => Guid.Empty,
+ "_" => new object(),
+ _ => obj
+ };
+
+ // Act
+ var result = ObjectHelper.AsGUID(obj);
+
+ // Assert
+ Assert.AreEqual(Guid.Parse(expected), result);
+ }
+
+ [TestMethod()]
+ [DataRow(null, false)]
+ [DataRow(1, true)]
+ [DataRow("test", true)]
+ [DataRow("", false)]
+ [DataRow(0, false)]
+ public void SetRetTest(object? input, bool expected)
+ {
+ // Arrange
+ bool actionCalled = false;
+ object? _o = null;
+ Action action = (obj) => { actionCalled = true; _o = obj; };
+
+ // Act
+ var result = ObjectHelper.SetRet(input, action, expected);
+
+ // Assert
+ Assert.AreEqual(expected, result);
+ Assert.AreEqual(input, _o);
+ Assert.IsTrue(actionCalled);
+ }
+}
\ No newline at end of file
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/Helper/StringUtilsTests.cs b/Avalonia_Apps/Libraries/BaseLibTests/Helper/StringUtilsTests.cs
index 6e93308eb..7d01189b2 100644
--- a/Avalonia_Apps/Libraries/BaseLibTests/Helper/StringUtilsTests.cs
+++ b/Avalonia_Apps/Libraries/BaseLibTests/Helper/StringUtilsTests.cs
@@ -12,7 +12,9 @@
//
// ***********************************************************************
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
using System.Collections.Generic;
+using System.Linq;
using static BaseLib.Helper.TestHelper;
///
/// The Tests namespace.
@@ -27,6 +29,8 @@ namespace BaseLib.Helper.Tests;
[TestClass()]
public class StringUtilsTests
{
+ private static readonly string RootPlaceholder = "";
+
///
/// Quotes the test.
///
@@ -326,4 +330,164 @@ public void IsValidIdentifyerTest(string sAct, bool xExp)
{
Assert.AreEqual(xExp,sAct.IsValidIdentifyer());
}
+
+ [TestMethod()]
+ [DataRow("This is a test",14, "This is a test")]
+ [DataRow("This is a test",0, "")]
+ [DataRow("This is a test",-1, "This is a tes")]
+ [DataRow("This is a test",1, "T")]
+ [DataRow("This is a test",20, "This is a test")]
+ public void LeftTest(string sAct,int iAct, string sExp)
+ {
+ Assert.AreEqual(sExp, sAct.Left(iAct));
+ }
+
+ [TestMethod()]
+ [DataRow("This is a test",14, "This is a test")]
+ [DataRow("This is a test",0, "")]
+ [DataRow("This is a test",-1, "his is a test")]
+ [DataRow("This is a test",1, "t")]
+ [DataRow("This is a test",20, "This is a test")]
+ public void RightTest(string sAct,int iAct, string sExp)
+ {
+ Assert.AreEqual(sExp, sAct.Right(iAct));
+ }
+
+ [TestMethod()]
+ [DataRow(null, "")]
+ [DataRow("", "")]
+ [DataRow(true, "True")]
+ [DataRow(false, "False")]
+ [DataRow(1234, "1234")]
+
+ public void AsStringTest(object? oAct,string sExp)
+ {
+ Assert.AreEqual(sExp, oAct.AsString());
+ }
+
+ [TestMethod]
+ [DataRow("NOP", "NOP", true, "", DisplayName = "Matches literal-only mask")]
+ [DataRow("SUB Start", "SUB ", true, "=Start", DisplayName = "Matches trailing placeholder")]
+ [DataRow("Start: HELLO", ": ", true, "=Start|=HELLO", DisplayName = "Matches placeholder surrounded by literals")]
+ [DataRow("call 42", "CALL ", true, "=42", DisplayName = "Matches while ignoring literal casing")]
+ [DataRow("CALL TEXT", "CALL ", true, "=TEXT", DisplayName = "Don't rejects when placeholder value violates expectations")]
+ [DataRow("JMP Start", "SUB ", false, "", DisplayName = "Rejects when literal prefix mismatches")]
+ public void TryPlaceHolderMatching_EvaluatesPatternsCorrectly2(string probe, string mask, bool expectedSuccess, string expectedPairsSpec)
+ {
+ var wildcardFill = CreateSeededWildcardFill();
+
+ var actual = StringUtils.TryPlaceHolderMatching(probe, mask, wildcardFill);
+
+ Assert.AreEqual(expectedSuccess, actual);
+
+ var expectedPairs = ParseExpectedPairs(expectedPairsSpec);
+ var actualPairs = wildcardFill.Skip(1).ToList();
+
+ Assert.HasCount(expectedPairs.Count, actualPairs);
+
+ for (var index = 0; index < expectedPairs.Count; index++)
+ {
+ Assert.AreEqual(expectedPairs[index].Key, actualPairs[index].Key);
+ Assert.AreEqual(expectedPairs[index].Value, actualPairs[index].Value);
+ }
+ }
+
+ [TestMethod]
+ [DataRow("NOP", "NOP", true, "", DisplayName = "Matches literal-only mask")]
+ [DataRow("SUB Start", "SUB ", true, "=Start", DisplayName = "Matches trailing placeholder")]
+ [DataRow("Start: HELLO", ": ", true, "=Start|=HELLO", DisplayName = "Matches placeholder surrounded by literals")]
+ [DataRow("call 42", "CALL ", true, "=42", DisplayName = "Matches while ignoring literal casing")]
+ [DataRow("CALL TEXT", "CALL ", false, "", DisplayName = "Rejects when placeholder value violates expectations")]
+ [DataRow("JMP Start", "SUB ", false, "", DisplayName = "Rejects when literal prefix mismatches")]
+ public void TryPlaceHolderMatching_EvaluatesPatternsCorrectly(string probe, string mask, bool expectedSuccess, string expectedPairsSpec)
+ {
+ var wildcardFill = CreateSeededWildcardFill();
+
+ var actual = StringUtils.TryPlaceHolderMatching(probe, mask, wildcardFill, testCharset);
+
+ Assert.AreEqual(expectedSuccess, actual);
+
+ var expectedPairs = ParseExpectedPairs(expectedPairsSpec);
+ var actualPairs = wildcardFill.Skip(1).ToList();
+
+ Assert.HasCount(expectedPairs.Count, actualPairs);
+
+ for (var index = 0; index < expectedPairs.Count; index++)
+ {
+ Assert.AreEqual(expectedPairs[index].Key, actualPairs[index].Key);
+ Assert.AreEqual(expectedPairs[index].Value, actualPairs[index].Value);
+ }
+ }
+
+ [TestMethod]
+ [DataRow(" ", "")]
+ [DataRow(" Both ", "Both")]
+ [DataRow(" Leading", "Leading")]
+ [DataRow("", "")]
+ [DataRow("< NoIdentifyer >", "< NoIdentifyer >")] // Leerzeichen innerhalb von <> werden entfernt, wenn sie am Rand stehen
+ [DataRow("", "")]
+ [DataRow("1 + 2 * 3", "1+2*3")]
+ [DataRow("A + B", "A+B")]
+ [DataRow("A + B", "A+B")]
+ [DataRow("IF A > B THEN", "IF A > B THEN")]
+ [DataRow("IF A < B THEN", "IF A < B THEN")]
+ [DataRow("VAR < 10", "VAR < 10")]
+ [DataRow("VAR > 10", "VAR > 10")]
+ [DataRow("Label:", "Label:")]
+ [DataRow("NoLabel :", "NoLabel :")]
+ [DataRow("A := B", "A :=B")]
+ [DataRow("A : = B", "A : =B")]
+ [DataRow("A B", "A B")]
+ [DataRow("A < NoIdentifyer > B", "A < NoIdentifyer > B")]
+ [DataRow("String \" Text \"", "String\"Text\"")] // Anfhrungszeichen werden hier nicht gesondert behandelt, Logik entfernt Spaces basierend auf Nachbarn
+ [DataRow("Trailing ", "Trailing")]
+ [DataRow("A . B", "A.B")]
+ [DataRow("Func ( A , B )", "Func(A,B)")]
+ [DataRow("AC", "AC")]
+ [DataRow("A < B > C", "A < B > C")]
+ [DataRow("Name : ", "Name : ")]
+ public void MTSpaceTrimTests(string input, string expected)
+ {
+ // Act
+ var result = input.MTSpaceTrim();
+
+ // Assert
+ Assert.AreEqual(expected, result, $"Input: '{input}'");
+ }
+
+ private bool testCharset(string arg1, string arg2) => !arg1.StartsWith("> CreateSeededWildcardFill()
+ {
+ return new List>
+ {
+ new KeyValuePair(RootPlaceholder, "0")
+ };
+ }
+
+ private static List> ParseExpectedPairs(string expectedPairsSpec)
+ {
+ var result = new List>();
+ if (string.IsNullOrWhiteSpace(expectedPairsSpec))
+ {
+ return result;
+ }
+
+ var segments = expectedPairsSpec.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
+ foreach (var segment in segments)
+ {
+ var separatorIndex = segment.IndexOf('=');
+ if (separatorIndex < 0)
+ {
+ continue;
+ }
+
+ var placeholder = segment.Substring(0, separatorIndex).Trim();
+ var value = segment.Substring(separatorIndex + 1).Trim();
+ result.Add(new KeyValuePair(placeholder, value));
+ }
+
+ return result;
+ }
+
}
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/Model/CRandomTests.cs b/Avalonia_Apps/Libraries/BaseLibTests/Model/CRandomTests.cs
new file mode 100644
index 000000000..61baf4b03
--- /dev/null
+++ b/Avalonia_Apps/Libraries/BaseLibTests/Model/CRandomTests.cs
@@ -0,0 +1,82 @@
+using BaseLib.Models.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static BaseLib.Helper.TestHelper;
+
+namespace BaseLib.Models.Tests;
+
+[TestClass()]
+public class CRandomTests
+{
+#pragma warning disable CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Erwägen Sie die Deklaration als Nullable.
+ private CRandom _testClass;
+#pragma warning restore CS8618 // Ein Non-Nullable-Feld muss beim Beenden des Konstruktors einen Wert ungleich NULL enthalten. Erwägen Sie die Deklaration als Nullable.
+
+ [TestInitialize]
+ public void Init()
+ {
+ _testClass = new CRandom();
+ _testClass.Seed(0);
+ }
+
+ [TestMethod()]
+ public void CRandomTest()
+ {
+ Assert.IsNotNull(_testClass);
+ Assert.IsInstanceOfType(_testClass, typeof(IRandom));
+ Assert.IsInstanceOfType(_testClass, typeof(CRandom));
+ }
+
+ [TestMethod()]
+ [DataRow(0, 1, new[] { 0, 0, 0, 0, 0 })]
+ [DataRow(0, 2, new[] { 1, 1, 1, 1, 0 })]
+
+ public void NextTest(int imin, int iMax,int[] asExp)
+ {
+ var aoResult = new int[asExp.Length];
+ for (int i = 0; i < asExp.Length; i++)
+ {
+ aoResult[i] = _testClass.Next(imin, iMax);
+ }
+ AssertAreEqual(asExp, aoResult);
+ }
+
+ [TestMethod()]
+ [DataRow(new[] { 0.7262432699679598, 0.8173253595909687, 0.7680226893946634,0.5581611914365372, 0.2060331540210327 })]
+ public void NextDoubleTest(double[] adExp)
+ {
+ var adResult = new double[adExp.Length];
+ for (int i = 0; i < adExp.Length; i++)
+ {
+ adResult[i] = _testClass.NextDouble();
+ }
+ AssertAreEqual(adExp, adResult);
+ }
+
+ [TestMethod()]
+ [DataRow(new[] { 1559595546, 1755192844, 1649316166, 1198642031, 442452829 })]
+ public void NextIntTest(int[] asExp)
+ {
+ var aoResult = new int[asExp.Length];
+ for (int i = 0; i < asExp.Length; i++)
+ {
+ aoResult[i] = _testClass.NextInt();
+ }
+ AssertAreEqual(asExp, aoResult);
+ }
+
+ [TestMethod()]
+ [DataRow(0, new[] { 1559595546, 1755192844, 1649316166, 1198642031, 442452829 })]
+ [DataRow(1, new[] { 534011718, 237820880, 1002897798, 1657007234, 1412011072 })]
+ [DataRow(int.MaxValue, new[] { 1559595546, 1755192844, 1649316172, 1198642031, 442452829 })]
+
+ public void SeedTest(int iSeed, int[] asExp)
+ {
+ _testClass.Seed(iSeed);
+ var aoResult = new int[asExp.Length];
+ for (int i = 0; i < asExp.Length; i++)
+ {
+ aoResult[i] = _testClass.NextInt();
+ }
+ AssertAreEqual(asExp, aoResult);
+ }
+}
\ No newline at end of file
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/Model/ConsoleProxyTests.cs b/Avalonia_Apps/Libraries/BaseLibTests/Model/ConsoleProxyTests.cs
new file mode 100644
index 000000000..b769e5b8f
--- /dev/null
+++ b/Avalonia_Apps/Libraries/BaseLibTests/Model/ConsoleProxyTests.cs
@@ -0,0 +1,186 @@
+using BaseLib.Models;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace BaseLib.Models.Tests;
+
+[TestClass]
+public class ConsoleProxyTests
+{
+ private ConsoleProxy _sut = null!;
+
+ [TestInitialize]
+ public void TestInitialize()
+ {
+ _sut = new ConsoleProxy();
+ }
+
+ [TestMethod]
+ public void Constructor_ShouldCreateInstance()
+ {
+ // Assert
+ Assert.IsNotNull(_sut);
+ }
+
+ [TestMethod]
+ public void ForegroundColor_Get_ShouldReturnConsoleColor()
+ {
+ // Act
+ var result = _sut.ForegroundColor;
+
+ // Assert
+ Assert.IsInstanceOfType(result, typeof(ConsoleColor));
+ }
+
+ [TestMethod]
+ public void ForegroundColor_Set_ShouldNotThrow()
+ {
+ // Arrange
+ var originalColor = _sut.ForegroundColor;
+
+ // Act & Assert
+ _sut.ForegroundColor = ConsoleColor.Red;
+ _sut.ForegroundColor = originalColor;
+ }
+
+ [TestMethod]
+ public void BackgroundColor_Get_ShouldReturnConsoleColor()
+ {
+ // Act
+ var result = _sut.BackgroundColor;
+
+ // Assert
+ Assert.IsInstanceOfType(result, typeof(ConsoleColor));
+ }
+
+ [TestMethod]
+ public void BackgroundColor_Set_ShouldNotThrow()
+ {
+ // Arrange
+ var originalColor = _sut.BackgroundColor;
+
+ // Act & Assert
+ _sut.BackgroundColor = ConsoleColor.Blue;
+ _sut.BackgroundColor = originalColor;
+ }
+
+ [TestMethod]
+ public void IsOutputRedirected_ShouldReturnBool()
+ {
+ // Act
+ var result = _sut.IsOutputRedirected;
+
+ // Assert
+ Assert.IsInstanceOfType(result, typeof(bool));
+ }
+
+ [TestMethod]
+ public void KeyAvailable_ShouldReturnBool()
+ {
+ // Act
+ var result = _sut.KeyAvailable;
+
+ // Assert
+ Assert.IsInstanceOfType(result, typeof(bool));
+ }
+
+ [TestMethod]
+ public void LargestWindowHeight_ShouldReturnInt()
+ {
+ // Act
+ var result = _sut.LargestWindowHeight;
+
+ // Assert
+ Assert.IsInstanceOfType(result, typeof(int));
+ }
+
+ [TestMethod]
+ public void Title_Get_ShouldReturnString()
+ {
+ // Act
+ var result = _sut.Title;
+
+ // Assert
+ Assert.IsNotNull(result);
+ }
+
+ [TestMethod]
+ public void Title_Set_ShouldNotThrow()
+ {
+ // Arrange
+ var originalTitle = _sut.Title;
+
+ // Act & Assert
+ _sut.Title = "TestTitle";
+ _sut.Title = originalTitle;
+ }
+
+ [TestMethod]
+ public void GetCursorPosition_ShouldReturnTuple()
+ {
+ // Act
+ var result = _sut.GetCursorPosition;
+
+ // Assert
+ Assert.IsNotNull(result);
+ }
+
+ [TestMethod]
+ public void SetCursorPosition_ShouldNotThrow()
+ {
+ // Arrange
+
+ // Act
+ var result = _sut.SetCursorPosition;
+
+ //Assert
+ Assert.IsNotNull(result);
+ }
+
+ [TestMethod]
+ public void Write_Char_ShouldNotThrow()
+ {
+ // Act & Assert - keine Exception erwartet
+ _sut.Write('X');
+ }
+
+ [TestMethod]
+ public void Write_String_ShouldNotThrow()
+ {
+ // Act & Assert - keine Exception erwartet
+ _sut.Write("Test");
+ }
+
+ [TestMethod]
+ public void Write_NullString_ShouldNotThrow()
+ {
+ // Act & Assert - keine Exception erwartet
+ _sut.Write((string?)null);
+ }
+
+ [TestMethod]
+ public void WriteLine_ShouldNotThrow()
+ {
+ // Act & Assert - keine Exception erwartet
+ _sut.WriteLine("TestLine");
+ }
+
+ [TestMethod]
+ public void WriteLine_Null_ShouldNotThrow()
+ {
+ // Act & Assert - keine Exception erwartet
+ _sut.WriteLine(null);
+ }
+
+ [TestMethod]
+ public void Clear_ShouldNotThrow()
+ {
+ // Act & Assert - keine Exception erwartet
+ var m= _sut.Clear;
+ //Assert
+ Assert.IsNotNull(m);
+ }
+
+ // Beep und ReadKey/ReadLine werden nicht getestet, da sie
+ // auf Benutzereingaben warten oder Audio abspielen
+}
\ No newline at end of file
diff --git a/Avalonia_Apps/Libraries/BaseLibTests/Model/SysTimeTests.cs b/Avalonia_Apps/Libraries/BaseLibTests/Model/SysTimeTests.cs
new file mode 100644
index 000000000..abb53320a
--- /dev/null
+++ b/Avalonia_Apps/Libraries/BaseLibTests/Model/SysTimeTests.cs
@@ -0,0 +1,81 @@
+using BaseLib.Models;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace BaseLib.Models.Tests;
+
+[TestClass]
+public class SysTimeTests
+{
+ private SysTime _sut = null!;
+
+ [TestInitialize]
+ public void TestInitialize()
+ {
+ _sut = new SysTime();
+ }
+
+ [TestCleanup]
+ public void TestCleanup()
+ {
+ SysTime.GetNow = () => DateTime.Now;
+ }
+
+ [TestMethod]
+ public void Now_ReturnsCurrentDateTime()
+ {
+ // Arrange
+ var expectedDate = new DateTime(2024, 6, 15, 10, 30, 45);
+ SysTime.GetNow = () => expectedDate;
+
+ // Act
+ var result = _sut.Now;
+
+ // Assert
+ Assert.AreEqual(expectedDate, result);
+ }
+
+ [TestMethod]
+ public void Today_ReturnsDatePartOnly()
+ {
+ // Arrange
+ var dateWithTime = new DateTime(2024, 6, 15, 10, 30, 45);
+ var expectedDate = new DateTime(2024, 6, 15);
+ SysTime.GetNow = () => dateWithTime;
+
+ // Act
+ var result = _sut.Today;
+
+ // Assert
+ Assert.AreEqual(expectedDate, result);
+ }
+
+ [TestMethod]
+ public void GetNow_DefaultValue_ReturnsDateTimeNow()
+ {
+ // Arrange
+ SysTime.GetNow = () => DateTime.Now;
+
+ // Act
+ var before = DateTime.Now;
+ var result = _sut.Now;
+ var after = DateTime.Now;
+
+ // Assert
+ Assert.IsTrue(result >= before && result <= after);
+ }
+
+ [TestMethod]
+ public void GetNow_CanBeOverridden()
+ {
+ // Arrange
+ var customDate = new DateTime(2000, 1, 1);
+ SysTime.GetNow = () => customDate;
+
+ // Act
+ var result = SysTime.GetNow();
+
+ // Assert
+ Assert.AreEqual(customDate, result);
+ }
+}
\ No newline at end of file
diff --git a/Avalonia_Apps/Packages.props b/Avalonia_Apps/Packages.props
index 1881a483e..0bf91cefc 100644
--- a/Avalonia_Apps/Packages.props
+++ b/Avalonia_Apps/Packages.props
@@ -6,40 +6,34 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
-
-
+
+
\ No newline at end of file
diff --git a/Avalonia_Apps/RenderImage.BaseTests/RenderImage.BaseTests.csproj b/Avalonia_Apps/RenderImage.BaseTests/RenderImage.BaseTests.csproj
index 4532ef592..d01ad3802 100644
--- a/Avalonia_Apps/RenderImage.BaseTests/RenderImage.BaseTests.csproj
+++ b/Avalonia_Apps/RenderImage.BaseTests/RenderImage.BaseTests.csproj
@@ -8,9 +8,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/AboutEx/AboutEx.csproj b/CSharpBible/AboutEx/AboutEx.csproj
index f20164a3c..6b307f8a5 100644
--- a/CSharpBible/AboutEx/AboutEx.csproj
+++ b/CSharpBible/AboutEx/AboutEx.csproj
@@ -13,8 +13,8 @@
CSharpBible.AboutEx
-
-
+
+
diff --git a/CSharpBible/AboutExTests/AboutExTests.csproj b/CSharpBible/AboutExTests/AboutExTests.csproj
index d8fddf4e0..0d43f6f74 100644
--- a/CSharpBible/AboutExTests/AboutExTests.csproj
+++ b/CSharpBible/AboutExTests/AboutExTests.csproj
@@ -12,9 +12,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj b/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj
index b44731426..45cf4cdd8 100644
--- a/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj
+++ b/CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj b/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj
index f342e8d0b..e1a8e3500 100644
--- a/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj
+++ b/CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj
@@ -13,9 +13,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -26,6 +26,6 @@
-
+
diff --git a/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj b/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj
index a664d7c2e..34744af43 100644
--- a/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj
+++ b/CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj b/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj
index 527fc311d..f0d0c967d 100644
--- a/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj
+++ b/CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj
@@ -13,9 +13,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj b/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj
index 012b3db34..ba3ec99c5 100644
--- a/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj
+++ b/CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj b/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj
index f0b33e6f8..0baf77e5c 100644
--- a/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj
+++ b/CSharpBible/Basics/Basic_Del02_FilterTests/Basic_Del02_FilterTests.csproj
@@ -13,9 +13,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj b/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj
index 62e685fe1..a57d3d602 100644
--- a/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj
+++ b/CSharpBible/Basics/Basic_Del03_General/Basic_Del03_General.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj b/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj
index 77bd2fd12..5a812c3bb 100644
--- a/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj
+++ b/CSharpBible/Basics/Basic_Del03_GeneralTests/Basic_Del03_GeneralTests.csproj
@@ -13,9 +13,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj
index 2f9edc5ba..9cdc5f0c1 100644
--- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj
+++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuff/Basic_Del04_TestImposibleStuff.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj
index 1c3a49b0d..a35304b0a 100644
--- a/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj
+++ b/CSharpBible/Basics/Basic_Del04_TestImposibleStuffTests/Basic_Del04_TestImposibleStuffTests.csproj
@@ -13,9 +13,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/CSharpBible.sln b/CSharpBible/CSharpBible.sln
index 2eaf51596..d17c8b552 100644
--- a/CSharpBible/CSharpBible.sln
+++ b/CSharpBible/CSharpBible.sln
@@ -158,6 +158,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile", "Mobile", "{8CCD8B
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{947E3943-6DE0-46E7-9106-BCE8C6E812E0}"
ProjectSection(SolutionItems) = preProject
+ Games\Directory.Packages.props = Games\Directory.Packages.props
Games\Games.props = Games\Games.props
Games\Games_net.props = Games\Games_net.props
SomeThing\Solution.props = SomeThing\Solution.props
@@ -427,7 +428,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_00_TemplateTests", "MV
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_06_Converters_4_net", "MVVM_Tutorial\MVVM_06_Converters_4\MVVM_06_Converters_4_net.csproj", "{70AD3FCB-F529-4E08-BE39-E56C940EA114}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_16_Usercontrol1_net", "MVVM_Tutorial\MVVM_16_Usercontrol1\MVVM_16_Usercontrol1_net.csproj", "{CDC8B1F7-3C94-4686-9EE0-6841231E6144}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_16_UserControl1_net", "MVVM_Tutorial\MVVM_16_Usercontrol1\MVVM_16_UserControl1_net.csproj", "{CDC8B1F7-3C94-4686-9EE0-6841231E6144}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simulation", "Simulation", "{0DF8EC71-8008-41CF-9A87-946604FBD24D}"
ProjectSection(SolutionItems) = preProject
@@ -848,6 +849,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVM_AllExamples_netTests", "MVVM_Tutorial\MVVM_AllExamplesTests\MVVM_AllExamples_netTests.csproj", "{687EFF77-3468-444D-A410-1B76E41E74FC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SomeThing", "SomeThing", "{72BE345F-8168-4D28-895C-2A22010B39C8}"
+ ProjectSection(SolutionItems) = preProject
+ SomeThing\README.md = SomeThing\README.md
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quine1", "SomeThing\Quine1\Quine1.csproj", "{CC31DD38-B57D-4A71-9681-E9D7DDFB8909}"
EndProject
@@ -1099,6 +1103,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Document.Xaml", "Data\Docum
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Story.Base", "Data\Story.Base\Story.Base.csproj", "{A06D0241-A272-9A48-0BDC-00B60E27D924}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Snake", "Snake", "{175441F2-40F8-410C-AAE1-B79760244304}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Quine", "Quine", "{0E1CB7B2-F372-4F6D-A071-021C7B0BE80C}"
+ ProjectSection(SolutionItems) = preProject
+ SomeThing\README.md = SomeThing\README.md
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quine4", "SomeThing\Quine4\Quine4.csproj", "{3E692837-3E14-86AF-8F4B-1CE45081E1B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quine5", "SomeThing\Quine5\Quine5.csproj", "{E2411CA0-1AD4-1A5A-B440-04EB09184818}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quine6", "SomeThing\Quine6\Quine6.csproj", "{0DA4D107-D40D-C3C7-089B-A16980E49CEA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -6789,6 +6806,42 @@ Global
{A06D0241-A272-9A48-0BDC-00B60E27D924}.Release|x64.Build.0 = Release|Any CPU
{A06D0241-A272-9A48-0BDC-00B60E27D924}.Release|x86.ActiveCfg = Release|Any CPU
{A06D0241-A272-9A48-0BDC-00B60E27D924}.Release|x86.Build.0 = Release|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Debug|x64.Build.0 = Debug|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Debug|x86.Build.0 = Debug|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Release|x64.ActiveCfg = Release|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Release|x64.Build.0 = Release|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Release|x86.ActiveCfg = Release|Any CPU
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1}.Release|x86.Build.0 = Release|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Debug|x64.Build.0 = Debug|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Debug|x86.Build.0 = Debug|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Release|x64.ActiveCfg = Release|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Release|x64.Build.0 = Release|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Release|x86.ActiveCfg = Release|Any CPU
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818}.Release|x86.Build.0 = Release|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Debug|x64.Build.0 = Debug|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Debug|x86.Build.0 = Debug|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Release|x64.ActiveCfg = Release|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Release|x64.Build.0 = Release|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Release|x86.ActiveCfg = Release|Any CPU
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -6883,8 +6936,8 @@ Global
{27777C75-0DA7-4489-BE60-51E74F921090} = {465E6B8C-A028-4C99-86E7-2710FFC62901}
{9EA5388E-5333-4C8A-8B27-8E16AC4E7137} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10}
{385737C2-FB69-44AD-ACBB-A2CBE11686E4} = {E1D77C39-936E-4ADB-8350-74B5A4401280}
- {F30BC8EB-5AC7-4FD0-A5B7-33057AEF8ECA} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0}
- {9D934BB9-B0C6-4CBC-81AB-35AFC52784EE} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0}
+ {F30BC8EB-5AC7-4FD0-A5B7-33057AEF8ECA} = {175441F2-40F8-410C-AAE1-B79760244304}
+ {9D934BB9-B0C6-4CBC-81AB-35AFC52784EE} = {175441F2-40F8-410C-AAE1-B79760244304}
{33D1CD60-0C70-4645-A50E-CA82F83CE0A5} = {7BA535EF-38FA-47A6-A6BD-5D6333D5DB10}
{E8D9DBBF-0516-4FA7-A5D0-F66DFD196C5C} = {9E686C3B-3AF8-4C7F-9F71-F09EF3E12031}
{4B6719F3-89B1-4C4F-9690-150D0ABDA36F} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0}
@@ -7154,9 +7207,9 @@ Global
{42EA49AE-5C87-4C75-83EF-964D4B24E9E9} = {4C78BE6F-C572-41FC-917E-B8587E10596F}
{75423717-B64A-4EAC-9762-CD17A2F60857} = {1BD34A20-4B18-43A2-AEEE-1E24B93C8BC9}
{687EFF77-3468-444D-A410-1B76E41E74FC} = {1BD34A20-4B18-43A2-AEEE-1E24B93C8BC9}
- {CC31DD38-B57D-4A71-9681-E9D7DDFB8909} = {72BE345F-8168-4D28-895C-2A22010B39C8}
- {B57AAB4C-0BA8-46B9-B365-F941A54F4DEF} = {72BE345F-8168-4D28-895C-2A22010B39C8}
- {4879406D-8F0C-4EDF-A7EB-CB549E510E03} = {72BE345F-8168-4D28-895C-2A22010B39C8}
+ {CC31DD38-B57D-4A71-9681-E9D7DDFB8909} = {0E1CB7B2-F372-4F6D-A071-021C7B0BE80C}
+ {B57AAB4C-0BA8-46B9-B365-F941A54F4DEF} = {0E1CB7B2-F372-4F6D-A071-021C7B0BE80C}
+ {4879406D-8F0C-4EDF-A7EB-CB549E510E03} = {0E1CB7B2-F372-4F6D-A071-021C7B0BE80C}
{DE121B38-5563-463D-B4B0-0817E75F4DDB} = {37C1201C-8936-4BAC-9BA1-7B8CAB87BD60}
{827CB9D9-EE91-47E1-BCF3-3DAC2C45EE57} = {37C1201C-8936-4BAC-9BA1-7B8CAB87BD60}
{391D26F2-FAFB-4113-9C80-4DA54BCE5D4A} = {827CB9D9-EE91-47E1-BCF3-3DAC2C45EE57}
@@ -7209,7 +7262,7 @@ Global
{5E9D2F06-E4E1-4E2E-BE1A-A0F7E0CF785C} = {71DD55F8-E61A-49E8-B841-72984B85D38B}
{CE9E0C11-AACD-4F57-8C1B-7210AFABCA19} = {A7AA5940-00E1-4F63-B85A-90BF6A35EA05}
{7EE327D2-B598-4F77-A889-04EB6949A6BB} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0}
- {2399EFC7-01EC-4574-9552-1A84857B076E} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0}
+ {2399EFC7-01EC-4574-9552-1A84857B076E} = {175441F2-40F8-410C-AAE1-B79760244304}
{69E4FEBA-5470-4BAC-8848-AF4ECA3DC9BD} = {71DD55F8-E61A-49E8-B841-72984B85D38B}
{D8A95DA6-F62B-3E10-BC72-FABE1D9146F4} = {9E686C3B-3AF8-4C7F-9F71-F09EF3E12031}
{501893AF-503A-30CC-ECDA-DFAC435E6D10} = {71DD55F8-E61A-49E8-B841-72984B85D38B}
@@ -7274,6 +7327,11 @@ Global
{2ED77FB7-8A9C-0D43-368C-9CEFF79BADE1} = {C59CD07D-726D-36FF-06E5-2CFE8C4AA341}
{D19418F6-67A8-763C-B179-193233BB812C} = {C59CD07D-726D-36FF-06E5-2CFE8C4AA341}
{A06D0241-A272-9A48-0BDC-00B60E27D924} = {050F69CA-1EB1-4D46-B52C-018637E6D525}
+ {175441F2-40F8-410C-AAE1-B79760244304} = {947E3943-6DE0-46E7-9106-BCE8C6E812E0}
+ {0E1CB7B2-F372-4F6D-A071-021C7B0BE80C} = {72BE345F-8168-4D28-895C-2A22010B39C8}
+ {3E692837-3E14-86AF-8F4B-1CE45081E1B1} = {0E1CB7B2-F372-4F6D-A071-021C7B0BE80C}
+ {E2411CA0-1AD4-1A5A-B440-04EB09184818} = {0E1CB7B2-F372-4F6D-A071-021C7B0BE80C}
+ {0DA4D107-D40D-C3C7-089B-A16980E49CEA} = {0E1CB7B2-F372-4F6D-A071-021C7B0BE80C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DAF8B3ED-D51A-4CDA-8BF1-1E032CF0AC4F}
diff --git a/CSharpBible/Calc/Calc32/NonVisual/CalculatorClass.cs b/CSharpBible/Calc/Calc32/NonVisual/CalculatorClass.cs
deleted file mode 100644
index b9cca5e93..000000000
--- a/CSharpBible/Calc/Calc32/NonVisual/CalculatorClass.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-// ***********************************************************************
-// Assembly : Calc32
-// Author : Mir
-// Created : 12-19-2021
-//
-// Last Modified By : Mir
-// Last Modified On : 10-22-2022
-// ***********************************************************************
-//
-// Copyright © JC-Soft 2020
-//
-//
-// ***********************************************************************
-using BaseLib.Helper;
-using System;
-using System.ComponentModel;
-
-///
-/// The NonVisual namespace.
-///
-namespace Calc32.NonVisual
-
-{
- ///
- /// Class CalculatorClass.
- /// Implements the
- ///
- public class CalculatorClass : Component
- {
- ///
- /// Enum Mode
- /// of Operation
- ///
- public enum eOpMode
- {
- ///
- /// No mode
- ///
- NoMode = 0,
-
- ///
- /// The calculate result
- ///
- CalcResult = 1,
- ///
- /// The plus mode
- ///
- Plus = 2,
- ///
- /// The minus mode
- ///
- Minus = 3,
- ///
- /// The multiply mode
- ///
- Multiply = 4,
- ///
- /// The divide
- /// mode
- ///
- Divide = 5,
- ///
- /// The binary and
- /// mode
- ///
- BinaryAnd = 6,
- ///
- /// The binary or
- /// mode
- ///
- BinaryOr = 7,
- ///
- /// The binary xor
- /// mode
- ///
- BinaryXor = 8,
- ///
- /// The binary not
- /// mode
- ///
- BinaryNot = 9,
- ///
- /// The binary not
- /// mode
- ///
- Negate = 10
- };
-
- #region Property
- #region private property
- // Fields
- ///
- /// The accumulator
- ///
- private int nAccumulator; // Editorfeld
- ///
- /// The n mode
- ///
- private eOpMode nMode { get => _nMode; set => value.SetProperty(ref _nMode, FireModeChangeEvent); }
-
- ///
- /// The b edit mode
- ///
- private bool bEditMode;
- // private bool bNegMode;
- ///
- /// The n memory
- ///
- private int nMemory; // Gemerkte Zahl für Operationen
- private eOpMode _nMode;
- #endregion
-
- ///
- /// The mode-string
- ///
- public readonly static string[] sMode = { "", "=", "+", "-", "*", "/", "&", "|", "x", "!" };
- ///
- /// Occurs when a change happens.
- ///
- public event EventHandler<(string,object?,object?)>? OnChange;
-
- // Properties
- ///
- /// Gets or sets the accumulator.
- ///
- /// The accumulator.
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
- public int Accumulator
- {
- get => nAccumulator;
- set => value.SetProperty(ref nAccumulator, FireChangeEvent);
- }
-
- ///
- /// Gets or sets the memory.
- ///
- /// The memory.
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
- public int Memory
- {
- get => nMemory;
- set => value.SetProperty(ref nMemory, FireChangeEvent);
- }
-
-
- ///
- /// Gets the operation text.
- ///
- /// The operation text.
- public string OperationText => sMode[(int)nMode];
- #endregion
-
- #region Methode
- ///
- /// Initializes a new instance of the class.
- ///
- public CalculatorClass()
- {
- nAccumulator = 0;
- nMode = 0;
- OnChange = null;
- }
- private void FireChangeEvent(string Prop, int ol, int nw)
- {
- OnChange?.Invoke(this, (Prop,ol,nw));
- }
-
- private void FireModeChangeEvent(string arg1, eOpMode arg2, eOpMode arg3)
- {
- OnChange?.Invoke(this,(nameof(OperationText), sMode[(int)arg2], sMode[(int)arg3]));
- }
-
-
- ///
- /// Button of Numbers.
- ///
- /// a number.
- public void NumberButton(int aNumber)
- {
- if (bEditMode)
- {
- if (nAccumulator < int.MaxValue / 10)
- {
- Accumulator = nAccumulator * 10 + aNumber;
- }
- }
- else
- {
- bEditMode = true;
- Accumulator = aNumber;
- }
- }
-
- ///
- /// Executes the specified Operation.
- ///
- /// The operation.
- public void Operation(int v)
- {
- if ((v > 0) && (v <= (int)eOpMode.Negate))
- {
- bEditMode &= (v ==(int)eOpMode.Negate);
- Accumulator = nMode switch
- {
- eOpMode.Plus => nMemory + nAccumulator,
- eOpMode.Minus => nMemory - nAccumulator,
- eOpMode.Multiply => nMemory * nAccumulator,
- eOpMode.Divide => nMemory / nAccumulator,
- eOpMode.BinaryAnd => nMemory & nAccumulator,
- eOpMode.BinaryOr => nMemory | nAccumulator,
- eOpMode.BinaryXor => nMemory ^ nAccumulator,
- _ => nAccumulator
- };
-
- if ((eOpMode)v == eOpMode.CalcResult)
- {
- nMode = (eOpMode)v;
- Memory = 0;
- }
- else if ((eOpMode) v == eOpMode.BinaryNot)
- {
- Accumulator = ~nAccumulator;
- }
- else if ((eOpMode)v == eOpMode.Negate)
- {
- Accumulator = -nAccumulator;
- }
- else
- {
- nMode = (eOpMode)v;
- Memory = nAccumulator;
- }
-
- }
- }
-
- ///
- /// Backs the space.
- ///
- public void BackSpace()
- => Accumulator = bEditMode ? nAccumulator / 10 : 0;
- #endregion
- }
-}
diff --git a/CSharpBible/Calc/Calc32/Program.cs b/CSharpBible/Calc/Calc32/Program.cs
index 72e8c6858..0260d049a 100644
--- a/CSharpBible/Calc/Calc32/Program.cs
+++ b/CSharpBible/Calc/Calc32/Program.cs
@@ -25,36 +25,35 @@
/// The Calc32 namespace.
///
///
-namespace CSharpBible.Calc32
+namespace Calc32;
+
+///
+/// Class Program.
+///
+public static class Program
{
+
///
- /// Class Program.
+ /// Der Haupteinstiegspunkt für die Anwendung.
///
- public static class Program
+ [STAThread]
+ public static void Main()
{
-
- ///
- /// Der Haupteinstiegspunkt für die Anwendung.
- ///
- [STAThread]
- public static void Main()
- {
- Init();
- Application.EnableVisualStyles();
+ Init();
+ Application.EnableVisualStyles();
// Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(Ioc.Default.GetRequiredService
-
-
+
+
diff --git a/CSharpBible/ConsoleApps/ConsoleMouseApp/ConsoleMouseApp_net.csproj b/CSharpBible/ConsoleApps/ConsoleMouseApp/ConsoleMouseApp_net.csproj
index 68ba48046..5a9d7aaa5 100644
--- a/CSharpBible/ConsoleApps/ConsoleMouseApp/ConsoleMouseApp_net.csproj
+++ b/CSharpBible/ConsoleApps/ConsoleMouseApp/ConsoleMouseApp_net.csproj
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/CSharpBible/ConsoleApps/TestConsole/TestConsole.cs b/CSharpBible/ConsoleApps/TestConsole/TestConsole.cs
index 8b42c4e71..ec6e4a7b3 100644
--- a/CSharpBible/ConsoleApps/TestConsole/TestConsole.cs
+++ b/CSharpBible/ConsoleApps/TestConsole/TestConsole.cs
@@ -17,73 +17,73 @@ public class TstConsole : IConsole
/// Gets or sets the color of the foreground.
///
/// The color of the foreground.
- public ConsoleColor ForegroundColor { get => form?.ForegroundColor ?? ConsoleColor.Gray; set => form.ForegroundColor = value; }
+ public ConsoleColor ForegroundColor { get => form.ForegroundColor; set => form.ForegroundColor = value; }
///
/// Gets or sets the color of the background.
///
/// The color of the background.
- public ConsoleColor BackgroundColor { get => form?.BackgroundColor ?? ConsoleColor.Black; set => form.BackgroundColor = value; }
+ public ConsoleColor BackgroundColor { get => form.BackgroundColor; set => form.BackgroundColor = value; }
///
/// Gets or sets the height of the window.
///
/// The height of the window.
- public int WindowHeight { get => form?.WindowHeight ?? 0; set => form.WindowHeight = value; }
+ public int WindowHeight { get => form.WindowHeight; set => form.WindowHeight = value; }
///
/// Gets or sets the width of the window.
///
/// The width of the window.
- public int WindowWidth { get => form?.WindowWidth ?? 0; set => form.WindowWidth = value; }
+ public int WindowWidth { get => form.WindowWidth; set => form.WindowWidth = value; }
///
/// Gets a value indicating whether [key available].
///
/// true if [key available]; otherwise, false.
- public bool KeyAvailable => form?.KeyAvailable ?? false;
+ public bool KeyAvailable => form.KeyAvailable;
///
/// Gets the height of the largest window.
///
/// The height of the largest window.
///
- public int LargestWindowHeight => form?.WindowHeight ?? 50;
+ public int LargestWindowHeight => form.WindowHeight;
- public string Title { get => form?.Text??""; set => form.Text = value; }
+ public string Title { get => form.Text ?? ""; set => form.Text = value; }
///
/// Clears this instance.
///
- public void Clear() => form?.Clear();
+ public void Clear() => form.Clear();
///
/// Reads the key.
///
/// System.Nullable<ConsoleKeyInfo>.
- public ConsoleKeyInfo? ReadKey() => form?.ReadKey();
+ public ConsoleKeyInfo? ReadKey() => form.ReadKey();
///
/// Sets the cursor position.
///
/// The left.
/// The top.
- public void SetCursorPosition(int left, int top) => form?.SetCursorPosition(left, top);
+ public void SetCursorPosition(int left, int top) => form.SetCursorPosition(left, top);
///
/// Writes the specified ch.
///
/// The ch.
- public void Write(char ch) => form?.Write(ch);
+ public void Write(char ch) => form.Write(ch);
///
/// Writes the specified st.
///
/// The st.
- public void Write(string? st) => form?.Write(st);
+ public void Write(string? st) => form.Write(st);
///
/// Writes the line.
///
/// The st.
- public void WriteLine(string? st = "") => Write((st ?? "") + "\r\n");
+ public void WriteLine(string? st = "") => Write((st ?? "") + "\r\n");
private readonly IConsoleHandler form;
///
@@ -92,16 +92,16 @@ public class TstConsole : IConsole
public TstConsole()
{
form = new TestConsoleForm();
- (form as TestConsoleForm).Show();
+ ((TestConsoleForm)form).Show();
}
///
/// Gets the cursor position.
///
/// System.ValueTuple<System.Int32, System.Int32>.
- public (int Left, int Top) GetCursorPosition()
+ public (int Left, int Top) GetCursorPosition()
{
- return ((int Left, int Top)?)(form?.GetCursorPosition()) ?? (0, 0);
+ return form.GetCursorPosition();
}
///
@@ -110,14 +110,92 @@ public TstConsole()
/// The freq.
/// The length.
///
- public void Beep(int freq, int len)
+ public void Beep(int freq, int len)
{
throw new NotImplementedException();
}
- public string ReadLine()
+ private readonly System.Collections.Concurrent.ConcurrentQueue _scriptedLines = new();
+
+ ///
+ /// Enqueue a full line (without newline) that will be returned by the next ReadLine() call.
+ /// Useful for deterministic unit tests.
+ ///
+ public void EnqueueLine(string line) => _scriptedLines.Enqueue(line);
+
+ ///
+ /// Optional. If set, ReadLine will wait up to this duration for keys to become available.
+ /// When elapsed, it throws to avoid freezing test environments.
+ ///
+ public TimeSpan? ReadLineTimeout { get; set; }
+
+ public string ReadLine()
{
- throw new NotImplementedException();
+ if (_scriptedLines.TryDequeue(out var scripted))
+ {
+ // Optional echo behavior to keep output similar to a real console
+ Write(scripted);
+ WriteLine();
+ return scripted;
+ }
+
+ var timeout = ReadLineTimeout;
+ var start = DateTime.UtcNow;
+
+ var sb = new System.Text.StringBuilder();
+
+ while (true)
+ {
+ if (timeout.HasValue && DateTime.UtcNow - start > timeout.Value)
+ {
+ throw new TimeoutException("ReadLine timed out waiting for input.");
+ }
+
+ // Avoid hot spinning in test runners
+ if (!KeyAvailable)
+ {
+ System.Threading.Thread.Sleep(10);
+ continue;
+ }
+
+ var keyInfo = ReadKey();
+ if (keyInfo == null)
+ {
+ continue;
+ }
+
+ switch (keyInfo.Value.Key)
+ {
+ case ConsoleKey.Enter:
+ WriteLine();
+ return sb.ToString();
+
+ case ConsoleKey.Backspace:
+ if (sb.Length > 0)
+ {
+ sb.Length -= 1;
+ Write("\b \b");
+ }
+ break;
+
+ default:
+ var ch = keyInfo.Value.KeyChar;
+ if (ch == '\0' || char.IsControl(ch))
+ {
+ break;
+ }
+
+ sb.Append(ch);
+ Write(ch);
+ break;
+ }
+ }
+ }
+
+ public void ResetColor()
+ {
+ ForegroundColor = ConsoleColor.Gray;
+ BackgroundColor = ConsoleColor.Black;
}
///
@@ -126,7 +204,20 @@ public string ReadLine()
/// The content.
public string Content => form.Content;
- public bool IsOutputRedirected
+ public bool IsOutputRedirected
=> false;
+
+ public bool CursorVisible
+ {
+ get => true;
+ set
+ {
+ // Test console UI does not currently model caret visibility.
+ }
+ }
+
+ public int BufferWidth => WindowWidth;
+
+ public int BufferHeight => WindowHeight;
}
}
diff --git a/CSharpBible/ConsoleApps/TestConsole/TestConsole_net.csproj b/CSharpBible/ConsoleApps/TestConsole/TestConsole_net.csproj
index d3d7ab0fe..c7da959ff 100644
--- a/CSharpBible/ConsoleApps/TestConsole/TestConsole_net.csproj
+++ b/CSharpBible/ConsoleApps/TestConsole/TestConsole_net.csproj
@@ -1,11 +1,17 @@
- net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows
+ net6.0-windows;net7.0-windows;net8.0-windows
true
+
+ $(TargetFrameworks);net9.0-windows
+
+
+ $(TargetFrameworks);net10.0-windows
+
enable
disable
diff --git a/CSharpBible/ConsoleApps/TestConsoleDemo/TestConsoleDemo.csproj b/CSharpBible/ConsoleApps/TestConsoleDemo/TestConsoleDemo.csproj
index 65f5390a9..617333cfa 100644
--- a/CSharpBible/ConsoleApps/TestConsoleDemo/TestConsoleDemo.csproj
+++ b/CSharpBible/ConsoleApps/TestConsoleDemo/TestConsoleDemo.csproj
@@ -25,8 +25,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.cs b/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.cs
index cea8ad438..0005b7e9c 100644
--- a/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.cs
+++ b/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.cs
@@ -144,7 +144,7 @@ public void ReadKeyTest()
///
/// Defines the test method SetCursorPositionTest.
///
- [DataTestMethod()]
+ [TestMethod()]
[DataRow("0,0",0,0)]
[DataRow("0,1", 0, 1)]
[DataRow("1,0", 1, 0)]
diff --git a/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.csproj b/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.csproj
index 967446997..8007f278e 100644
--- a/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.csproj
+++ b/CSharpBible/ConsoleApps/TestConsoleTests/TestConsoleTests.csproj
@@ -19,8 +19,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/ConsoleApps/WaveFuncCol/WaveFunCollapse.csproj b/CSharpBible/ConsoleApps/WaveFuncCol/WaveFunCollapse.csproj
index eff66c56d..41f070acf 100644
--- a/CSharpBible/ConsoleApps/WaveFuncCol/WaveFunCollapse.csproj
+++ b/CSharpBible/ConsoleApps/WaveFuncCol/WaveFunCollapse.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/CSharpBible/ConsoleApps/WaveFuncColFrm/WaveFuncColFrm.csproj b/CSharpBible/ConsoleApps/WaveFuncColFrm/WaveFuncColFrm.csproj
index da2bebee4..00b57a9b9 100644
--- a/CSharpBible/ConsoleApps/WaveFuncColFrm/WaveFuncColFrm.csproj
+++ b/CSharpBible/ConsoleApps/WaveFuncColFrm/WaveFuncColFrm.csproj
@@ -24,8 +24,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/CSharpBible/DB/DBTest1/DBTest1.csproj b/CSharpBible/DB/DBTest1/DBTest1.csproj
index 14d3645c7..7370e68b8 100644
--- a/CSharpBible/DB/DBTest1/DBTest1.csproj
+++ b/CSharpBible/DB/DBTest1/DBTest1.csproj
@@ -12,7 +12,7 @@
-->
-
+
diff --git a/CSharpBible/DB/FoxCon/FoxCon.csproj b/CSharpBible/DB/FoxCon/FoxCon.csproj
index 542a047a7..87686e905 100644
--- a/CSharpBible/DB/FoxCon/FoxCon.csproj
+++ b/CSharpBible/DB/FoxCon/FoxCon.csproj
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj b/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj
index 1f76463c8..dd76927f9 100644
--- a/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj
+++ b/CSharpBible/DB/MdbBrowser/MdbBrowser.csproj
@@ -2,14 +2,20 @@
WinExe
- net481;net472;net462;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows
+ net481;net472;net462;net8.0-windows
enable
true
AnyCPU;x86
-
+
+ $(TargetFrameworks);net9.0-windows
+
+
+ $(TargetFrameworks);net10.0-windows
+
+
@@ -20,9 +26,9 @@
-
-
-
+
+
+
diff --git a/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj b/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj
index 94a916268..969471750 100644
--- a/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj
+++ b/CSharpBible/DB/MdbBrowserTests/MdbBrowserTests.csproj
@@ -20,8 +20,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/DB/OLEDBTest/OleDbTest.csproj b/CSharpBible/DB/OLEDBTest/OleDbTest.csproj
index 6c4f4780e..2f7977719 100644
--- a/CSharpBible/DB/OLEDBTest/OleDbTest.csproj
+++ b/CSharpBible/DB/OLEDBTest/OleDbTest.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj b/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj
index 784a3d5b3..b3b3497fb 100644
--- a/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj
+++ b/CSharpBible/DB/OLEDBTest2/OleDbTest2.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core.Tests/DataAnalysis.Core.Tests.csproj b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core.Tests/DataAnalysis.Core.Tests.csproj
index ddd4f0052..d26d35186 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core.Tests/DataAnalysis.Core.Tests.csproj
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core.Tests/DataAnalysis.Core.Tests.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisAggregateProfile.cs b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisAggregateProfile.cs
index 31ff305ec..17ac7408b 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisAggregateProfile.cs
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisAggregateProfile.cs
@@ -1,3 +1,4 @@
+using ClosedXML.Excel;
using System.Collections.Generic;
namespace DataAnalysis.Core.Models;
@@ -17,36 +18,80 @@ public sealed class AnalysisAggregateProfile
{
Queries = new List
{
+ // SW-ProgID
new AnalysisQuery { Title = "Severity", Dimensions = new [] { DimensionKind.Severity } },
+ new AnalysisQuery { Title = "Source x ProgID", Dimensions = new [] { DimensionKind.Source, DimensionKind.ProgID }, Grouped = true },
new AnalysisQuery { Title = "Source", Filter = new ValueFilterDefinition { Field = "Severity", Type = "Enum", Operator = FilterOperator.Le, Value = "Error" }, Dimensions = new [] { DimensionKind.Source }, TopN =300 },
- new AnalysisQuery { Title = "Hour x Source", Dimensions = new [] { DimensionKind.Hour, DimensionKind.Source },Filter = new ValueFilterDefinition { Field = "Severity", Type = "Enum", Operator = FilterOperator.Le, Value = "Error" }, },
+ new AnalysisQuery { Title = "Hour x Source", Dimensions = new [] { DimensionKind.Hour, DimensionKind.Source },
+ Filter = new GroupFilterDefinition { Mode="And", Type = "group", Filters = [
+ new ValueFilterDefinition { Field = "PS", Type = "value", Operator = FilterOperator.Eq, Value = "1" },
+ new ValueFilterDefinition { Field = "Severity", Type = "Enum", Operator = FilterOperator.Le, Value = "Error" },
+ ] }
+ },
new AnalysisQuery { Title = "Top-Events", Dimensions = new [] { DimensionKind.MessageNormalized }, TopN =100 },
- new AnalysisQuery { Title = "Top-Events2", Dimensions = new [] { DimensionKind.MessageNormalized }, TopN =30, Filter = new ValueFilterDefinition { Field = "Severity", Type = "Enum", Operator = FilterOperator.Le, Value = "Error" }, },
+ new AnalysisQuery { Title = "Top-Errors", Dimensions = new [] { DimensionKind.MessageNormalized }, TopN =30,
+ Filter = new GroupFilterDefinition { Mode="And", Type = "group", Filters = [
+ new ValueFilterDefinition { Field = "PS", Type = "value", Operator = FilterOperator.Eq, Value = "1" },
+ new ValueFilterDefinition { Field = "Severity", Type = "Enum", Operator = FilterOperator.Le, Value = "Error" },
+ ] }
+ },
new AnalysisQuery { Title = "Severity x Source", Dimensions = new [] { DimensionKind.Source, DimensionKind.Severity }, Columns = Enum.GetValues().Select(s => s.ToString()).ToArray() },
new AnalysisQuery { Title = "Events x Source (Top50)", Dimensions = new [] { DimensionKind.Source, DimensionKind.MessageNormalized }, TopN =300},
- new AnalysisQuery { Title = "Error Cluster", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 30, IsDBScan = true, DbEps = 2.0, DbMinPts = 3, Filter = new ValueFilterDefinition { Field = "Severity", Type = "Enum", Operator = FilterOperator.Le, Value = "Error" }, },
- new AnalysisQuery { Title = "Max-G Cluster (1.0)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 30, IsDBScan = true, DbEps = 1.0, DbMinPts = 3, Filter = new GroupFilterDefinition { Mode="And", Type = "group",
+ new AnalysisQuery { Title = "Events x ProgID", Dimensions = new [] { DimensionKind.ProgID, DimensionKind.MessageNormalized }, Grouped = true ,
+ Filter = new ValueFilterDefinition { Field = "PS", Type = "value", Operator = FilterOperator.Eq, Value = "1" } },
+ new AnalysisQuery { Title = "Error Cluster", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 30, IsDBScan = true, DbEps = 2.0, DbMinPts = 3,
+ Filter = new GroupFilterDefinition { Mode="And", Type = "group", Filters = [
+ new ValueFilterDefinition { Field = "PS", Type = "value", Operator = FilterOperator.Eq, Value = "1" },
+ new ValueFilterDefinition { Field = "Severity", Type = "Enum", Operator = FilterOperator.Le, Value = "Error" },
+ ] }
+ },
+ new AnalysisQuery { Title = "Max-G Cluster (1.0)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 30, IsDBScan = true, DbEps = 1.0, DbMinPts = 3,
+ Filter = new GroupFilterDefinition { Mode="And", Type = "group",
Filters=[ new ValueFilterDefinition { Field = "Message", Type = "String", Operator = FilterOperator.Eq, Value = "Max. G-Force" },
new ValueFilterDefinition { Field = "X", Type = "value", Operator = FilterOperator.Gt, Value = "10" }
] }, },
- new AnalysisQuery { Title = "Max-G Cluster (0.5)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 50, IsDBScan = true, DbEps = 0.5, DbMinPts = 3, Filter =
+ new AnalysisQuery { Title = "Max-G Cluster (0.5)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 50, IsDBScan = true, DbEps = 0.5, DbMinPts = 3, Filter =
new GroupFilterDefinition { Mode="And", Type = "group",
- Filters=[
+ Filters=[
new ValueFilterDefinition { Field = "Message", Type = "String", Operator = FilterOperator.Eq, Value = "Max. G-Force" },
new ValueFilterDefinition { Field = "X", Type = "value", Operator = FilterOperator.Gt, Value = "10" }
] }, },
+ new AnalysisQuery { Title = "Max-G Cluster (0.5) > 1g", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 50, IsDBScan = true, DbEps = 0.5, DbMinPts = 3, Filter =
+ new GroupFilterDefinition { Mode="And", Type = "group",
+ Filters=[
+ new ValueFilterDefinition { Field = "Message", Type = "String", Operator = FilterOperator.Eq, Value = "Max. G-Force" },
+ new ValueFilterDefinition { Field = "X", Type = "value", Operator = FilterOperator.Gt, Value = "10" },
+ new GroupFilterDefinition { Mode="Or", Type = "group",
+ Filters=[
+ new ValueFilterDefinition { Field = "U", Type = "value", Operator = FilterOperator.Ge, Value = "1" },
+ new ValueFilterDefinition { Field = "U", Type = "value", Operator = FilterOperator.Le, Value = "-1" }] }
+ ] }, },
+
new AnalysisQuery { Title = "SSCU Cluster (0.5)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 30, IsDBScan = true, DbEps = 0.5, DbMinPts = 3, Filter =
new GroupFilterDefinition { Mode="And", Type = "group", Filters=[
new ValueFilterDefinition { Field = "Message", Type = "String", Operator = FilterOperator.StartsWith, Value = "SSCU" },
new ValueFilterDefinition { Field = "X", Type = "value", Operator = FilterOperator.Gt, Value = "10" },
- ]
+ ]
}, },
new AnalysisQuery { Title = "SSCU Cluster (0.25)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 50, IsDBScan = true, DbEps = 0.25, DbMinPts = 3, Filter =
- new GroupFilterDefinition { Mode="And", Type = "group", Filters=[
+ new GroupFilterDefinition { Mode="And", Type = "group", Filters=[
new ValueFilterDefinition { Field = "Message", Type = "String", Operator = FilterOperator.StartsWith, Value = "SSCU" },
new ValueFilterDefinition { Field = "X", Type = "value", Operator = FilterOperator.Gt, Value = "10" },
] },
+ },
+ new AnalysisQuery { Title = "Scanner Front Err (0.25)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 30, IsDBScan = true, DbEps = 0.25, DbMinPts = 3, Filter =
+ new GroupFilterDefinition { Mode="And", Type = "group", Filters=[
+ new ValueFilterDefinition { Field = "Message", Type = "String", Operator = FilterOperator.StartsWith, Value = "Front Scanner" },
+ new ValueFilterDefinition { Field = "X", Type = "value", Operator = FilterOperator.Gt, Value = "10" },
+ ]
+ }, },
+ new AnalysisQuery { Title = "Scanner Rear Err (0.25)", Dimensions = new [] { DimensionKind.X, DimensionKind.Y }, TopN = 50, IsDBScan = true, DbEps = 0.25, DbMinPts = 3, Filter =
+ new GroupFilterDefinition { Mode="And", Type = "group", Filters=[
+ new ValueFilterDefinition { Field = "Message", Type = "String", Operator = FilterOperator.StartsWith, Value = "Rear Scanner" },
+ new ValueFilterDefinition { Field = "X", Type = "value", Operator = FilterOperator.Gt, Value = "10" },
+ ] },
}
+
}
};
}
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisQuery.cs b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisQuery.cs
index 9d62fbf87..8ec422351 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisQuery.cs
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/AnalysisQuery.cs
@@ -4,28 +4,31 @@ namespace DataAnalysis.Core.Models;
public sealed class AnalysisQuery
{
- // Anzeigename fr den Export
- public required string Title { get; init; }
+ // Anzeigename fr den Export
+ public required string Title { get; init; }
- // Liste der Dimensionen:1D => Serie,2D => Kreuztabelle
- public required IReadOnlyList Dimensions { get; init; }
+ // Liste der Dimensionen:1D => Serie,2D => Kreuztabelle
+ public required IReadOnlyList Dimensions { get; init; }
- // Optional: feste Spalten fr2D (z. B. Reihenfolge der Severity-Spalten)
- public IReadOnlyList? Columns { get; init; }
+ // Optional: feste Spalten fr2D (z. B. Reihenfolge der Severity-Spalten)
+ public IReadOnlyList? Columns { get; init; }
- // Optional: TopN-Begrenzung fr1D-Serien
- public int? TopN { get; init; }
+ // Optional: TopN-Begrenzung fr1D-Serien
+ public int? TopN { get; init; }
- // Optional: TopN pro Zeile fr2D-Kreuztabellen
- public int? RowTopN { get; init; }
+ // Optional: TopN pro Zeile fr2D-Kreuztabellen
+ public int? RowTopN { get; init; }
- // Optional: DBSCAN-Clustering der Punkte (bei2D X/Y)
- public bool IsDBScan { get; init; } = false;
- // Optional: Radius (Epsilon) fr DBSCAN (gleiche Einheit wie X/Y)
- public double? DbEps { get; init; }
- // Optional: Mindestanzahl Punkte pro Cluster
- public int? DbMinPts { get; init; }
+ // Optional: DBSCAN-Clustering der Punkte (bei2D X/Y)
+ public bool IsDBScan { get; init; } = false;
+ // Optional: Radius (Epsilon) fr DBSCAN (gleiche Einheit wie X/Y)
+ public double? DbEps { get; init; }
+ // Optional: Mindestanzahl Punkte pro Cluster
+ public int? DbMinPts { get; init; }
- // Optional: Auswertungsspezifischer Filter (DTO, serialisierbar)
- public FilterDefinition? Filter { get; init; }
+ // Optional: Auswertungsspezifischer Filter (DTO, serialisierbar)
+ public FilterDefinition? Filter { get; init; }
+
+ // Optional: Gruppierte Ausgabe (fr2D-Tabellen)
+ public bool Grouped { get; init; }
}
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/DimensionKind.cs b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/DimensionKind.cs
index 30f2a0758..3df695e29 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/DimensionKind.cs
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/DimensionKind.cs
@@ -2,10 +2,12 @@ namespace DataAnalysis.Core.Models;
public enum DimensionKind
{
- Severity,
- Source,
- Hour, // Hour bucket of timestamp
- MessageNormalized,
- X,
- Y
+ Severity,
+ Source,
+ Hour, // Hour bucket of timestamp
+ MessageNormalized,
+ ProgID, // Software version extracted from message
+ X,
+ Y,
+ MsgID,
}
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterCompiler.cs b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterCompiler.cs
index cec3effcb..90588ce33 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterCompiler.cs
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterCompiler.cs
@@ -117,28 +117,28 @@ public static class FilterCompiler
break;
}
- return e =>
+ return e =>
{
if (!TryGetFieldText(e, v.Field, out var text, out var typed))
- return false;
+ return false ;
switch (v.DataType)
{
case FilterDataType.Number:
if (!TryAsDouble(text, typed, culture, out var d))
return false;
- return CompareNumbers(d, v.Operator, parsedFrom as double?, parsedTo as double?);
+ return v.Negate ^ CompareNumbers(d, v.Operator, parsedFrom as double?, parsedTo as double?);
case FilterDataType.DateTime:
if (!TryAsDateTimeOffset(text, typed, culture, formats, out var dt))
return false;
- return CompareDateTimes(dt, v.Operator, parsedFrom as DateTimeOffset?, parsedTo as DateTimeOffset?);
+ return v.Negate ^ CompareDateTimes(dt, v.Operator, parsedFrom as DateTimeOffset?, parsedTo as DateTimeOffset?);
case FilterDataType.Enum:
if (!TryAsEnum(text, typed, parsedFrom, out var eobj))
return false;
- return CompareEnums(eobj, v.Operator, parsedFrom, parsedTo);
+ return v.Negate ^ CompareEnums(eobj!, v.Operator, parsedFrom, parsedTo);
case FilterDataType.String:
default:
- return CompareStrings(text ?? string.Empty, v.Operator, v.Value, v.ValueTo, cmp);
+ return v.Negate ^ CompareStrings(text ?? string.Empty, v.Operator, v.Value, v.ValueTo, cmp);
}
};
}
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterDefinitions.cs b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterDefinitions.cs
index 8379558dd..c4ebe5208 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterDefinitions.cs
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/Filters/FilterDefinitions.cs
@@ -10,6 +10,9 @@ namespace DataAnalysis.Core.Models;
public abstract class FilterDefinition
{
[JsonPropertyName("type")] public string Type { get; init; }
+
+ public bool Negate { get; init; } = false;
+
}
public sealed class ValueFilterDefinition : FilterDefinition
@@ -34,5 +37,4 @@ public sealed class GroupFilterDefinition : FilterDefinition
// "and" oder "or"
public required string Mode { get; init; }
public required IReadOnlyList Filters { get; init; }
- public bool Negate { get; init; } = false;
}
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/QueryBuilder.cs b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/QueryBuilder.cs
index 488353515..5d304497f 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/QueryBuilder.cs
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.Core/Models/QueryBuilder.cs
@@ -56,7 +56,7 @@ public void Observe(SyslogEntry e)
var col = GetKey(e, _q.Dimensions[1]);
if (row is null || col is null) return;
if (!_matrix.TryGetValue(row, out var d)) { d = new Dictionary(StringComparer.OrdinalIgnoreCase); _matrix[row] = d; }
- d[col] = d.TryGetValue(col, out var c) ? c +1 :1;
+ d[col] = d.TryGetValue(col, out var c) && !_q.Grouped ? c +1 :1;
}
}
@@ -152,6 +152,8 @@ public AggregationResult Build()
DimensionKind.Source => string.IsNullOrWhiteSpace(e.Source) ? "(unbekannt)" : e.Source.Trim(),
DimensionKind.Hour => e.Timestamp is DateTimeOffset ts ? new DateTimeOffset(ts.Year, ts.Month, ts.Day, ts.Hour,0,0, ts.Offset).LocalDateTime.ToString("yyyy-MM-dd HH:00") : null,
DimensionKind.MessageNormalized => AnalysisModel.NormalizeMessage(e.Message),
+ DimensionKind.ProgID => TryGetAttributeAsString(e, "eventprogid", out var s) ? s : "",
+ DimensionKind.MsgID => TryGetAttributeAsString(e, "eventmsgid", out var s) ? s : null,
DimensionKind.X => TryGetAttributeAsDouble(e, "X", out var x) ? x.ToString(CultureInfo.InvariantCulture) : null,
DimensionKind.Y => TryGetAttributeAsDouble(e, "Y", out var y) ? y.ToString(CultureInfo.InvariantCulture) : null,
_ => null
@@ -176,5 +178,17 @@ private static bool TryGetAttributeAsDouble(SyslogEntry e, string key, out doubl
}
return false;
}
+
+ private static bool TryGetAttributeAsString(SyslogEntry e, string key, out string value)
+ {
+ value = "";
+ if (e.Attributes.TryGetValue(key, out var s))
+ {
+ value = s;
+ return true;
+ }
+ return false;
+ }
+
}
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/DataAnalysis.WPF.csproj b/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/DataAnalysis.WPF.csproj
index 923762b6f..7a6953369 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/DataAnalysis.WPF.csproj
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/DataAnalysis.WPF.csproj
@@ -17,9 +17,9 @@
-
-
-
+
+
+
diff --git a/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/ViewModels/MatrixAggregationViewModel.cs b/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/ViewModels/MatrixAggregationViewModel.cs
index d5caeeaed..77a45ad0c 100644
--- a/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/ViewModels/MatrixAggregationViewModel.cs
+++ b/CSharpBible/Data/DataAnalysis/DataAnalysis.WPF/ViewModels/MatrixAggregationViewModel.cs
@@ -15,7 +15,7 @@ public MatrixAggregationViewModel(AggregationResult agg)
var dt = new DataTable();
dt.Columns.Add("Key", typeof(string));
var columns = agg.Columns ?? Array.Empty();
- foreach (var col in columns) dt.Columns.Add(col.Replace(".", "˳"), typeof(int));
+ foreach (var col in columns) dt.Columns.Add(col.Replace(".", "˳").Replace("/", "|"), typeof(int));
if (agg.Matrix is not null)
{
var rows = agg.Matrix.Keys.ToList();
diff --git a/CSharpBible/Data/DataAnalysis/DataConvert.Console/DataConvert.Console.csproj b/CSharpBible/Data/DataAnalysis/DataConvert.Console/DataConvert.Console.csproj
index 6af1c927c..978d08732 100644
--- a/CSharpBible/Data/DataAnalysis/DataConvert.Console/DataConvert.Console.csproj
+++ b/CSharpBible/Data/DataAnalysis/DataConvert.Console/DataConvert.Console.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/CSharpBible/Data/DocumentUtils/DocOdfTest/DocOdfTest.csproj b/CSharpBible/Data/DocumentUtils/DocOdfTest/DocOdfTest.csproj
new file mode 100644
index 000000000..a1c1c6c17
--- /dev/null
+++ b/CSharpBible/Data/DocumentUtils/DocOdfTest/DocOdfTest.csproj
@@ -0,0 +1,21 @@
+
+
+
+ Exe
+ net8.0
+ enable
+ enable
+
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
+
+
+
+
+
+
+
diff --git a/CSharpBible/Data/DocumentUtils/DocOdfTest/Program.cs b/CSharpBible/Data/DocumentUtils/DocOdfTest/Program.cs
new file mode 100644
index 000000000..e86784e6d
--- /dev/null
+++ b/CSharpBible/Data/DocumentUtils/DocOdfTest/Program.cs
@@ -0,0 +1,29 @@
+using Document.Base.Models;
+using Document.Odf;
+
+namespace DocOdfTest;
+
+internal class Program
+{
+ static void Main(string[] args)
+ {
+ // Neues Dokument erstellen
+ var doc = new OdfTextDocument();
+
+ // Überschrift hinzufügen
+ var h1 = doc.AddHeadline(1);
+ h1.AppendText("Mein Dokument");
+
+ // Absatz hinzufügen
+ var p = doc.AddParagraph("");
+ p.AppendText("Dies ist ein ");
+ p.AddSpan("fetter", EFontStyle.Bold);
+ p.AppendText(" Text.");
+
+ // Speichern
+ doc.SaveTo("test.odt");
+
+ // Laden
+ doc.LoadFrom("existing.odt");
+ }
+}
diff --git a/CSharpBible/Data/DocumentUtils/Document.Base/Document.Base.csproj b/CSharpBible/Data/DocumentUtils/Document.Base/Document.Base.csproj
index f817901a6..1a195279a 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Base/Document.Base.csproj
+++ b/CSharpBible/Data/DocumentUtils/Document.Base/Document.Base.csproj
@@ -1,10 +1,16 @@
- net8.0;net9.0;net10.0
+ net8.0
enable
enable
preview
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
diff --git a/CSharpBible/Data/DocumentUtils/Document.Docx/Document.Docx.csproj b/CSharpBible/Data/DocumentUtils/Document.Docx/Document.Docx.csproj
index 62a854977..644f2746a 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Docx/Document.Docx.csproj
+++ b/CSharpBible/Data/DocumentUtils/Document.Docx/Document.Docx.csproj
@@ -1,12 +1,18 @@
- net8.0;net9.0;net10.0
+ net8.0
enable
preview
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
-
+
diff --git a/CSharpBible/Data/DocumentUtils/Document.Html/Document.Html.csproj b/CSharpBible/Data/DocumentUtils/Document.Html/Document.Html.csproj
index 0b6317dc2..22bd4cb73 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Html/Document.Html.csproj
+++ b/CSharpBible/Data/DocumentUtils/Document.Html/Document.Html.csproj
@@ -1,10 +1,16 @@
- net9.0
+ net8.0
enable
enable
preview
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
diff --git a/CSharpBible/Data/DocumentUtils/Document.Odf/Document.Odf.csproj b/CSharpBible/Data/DocumentUtils/Document.Odf/Document.Odf.csproj
index 0e3ffb3c4..c53c7ce5b 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Odf/Document.Odf.csproj
+++ b/CSharpBible/Data/DocumentUtils/Document.Odf/Document.Odf.csproj
@@ -1,10 +1,16 @@
- net9.0
+ net8.0
enable
enable
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
diff --git a/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfNamespaces.cs b/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfNamespaces.cs
index 12dc45f97..1de21292f 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfNamespaces.cs
+++ b/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfNamespaces.cs
@@ -9,4 +9,9 @@ public static class OdfNamespaces
public static readonly XNamespace Style = "urn:oasis:names:tc:opendocument:xmlns:style:1.0";
public static readonly XNamespace Table = "urn:oasis:names:tc:opendocument:xmlns:table:1.0";
public static readonly XNamespace XLink = "http://www.w3.org/1999/xlink";
+ public static readonly XNamespace Fo = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0";
+ public static readonly XNamespace Svg = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0";
+ public static readonly XNamespace Dc = "http://purl.org/dc/elements/1.1/";
+ public static readonly XNamespace Meta = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0";
+ public static readonly XNamespace Manifest = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
}
\ No newline at end of file
diff --git a/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfTextDocument.cs b/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfTextDocument.cs
index f58906551..8cc20aa78 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfTextDocument.cs
+++ b/CSharpBible/Data/DocumentUtils/Document.Odf/Models/OdfTextDocument.cs
@@ -1,60 +1,177 @@
using Document.Base.Models.Interfaces;
+using Document.Odf.Parsing;
+using Document.Odf.Writing;
namespace Document.Odf.Models;
public class OdfTextDocument : IUserDocument
{
- public IDocElement Root => throw new NotImplementedException();
+ private readonly OdfSection _root = new();
+ private bool _isModified;
- public bool IsModified => throw new NotImplementedException();
+ public IDocElement Root => _root;
- public static IUserDocument CreateUserDocument()
- {
- throw new NotImplementedException();
- }
+ public bool IsModified => _isModified;
+
+ public static IUserDocument CreateUserDocument() => new OdfTextDocument();
public IDocHeadline AddHeadline(int nLevel, string? Id = null)
{
- throw new NotImplementedException();
+ var id = Id ?? Guid.NewGuid().ToString("N");
+ var headline = new OdfHeadline(nLevel, id);
+ _root.AddChild(headline);
+ _isModified = true;
+ return headline;
}
public IDocParagraph AddParagraph(string cStylename)
{
- throw new NotImplementedException();
+ var paragraph = new OdfParagraph(cStylename);
+ _root.AddChild(paragraph);
+ _isModified = true;
+ return paragraph;
}
public IDocTOC AddTOC(string cName, int nLevel)
{
- throw new NotImplementedException();
+ var toc = new OdfTOC(cName, nLevel);
+ _root.AddChild(toc);
+ _isModified = true;
+ return toc;
}
- public IEnumerable Enumerate()
- {
- throw new NotImplementedException();
- }
+ public IEnumerable Enumerate() => _root.Enumerate();
public bool LoadFrom(string cInputPath)
{
- throw new NotImplementedException();
+ try
+ {
+ using var fs = File.OpenRead(cInputPath);
+ return LoadFrom(fs);
+ }
+ catch
+ {
+ return false;
+ }
}
public bool LoadFrom(Stream sInputStream, object? options = null)
{
- throw new NotImplementedException();
+ try
+ {
+ // Stream in temporäre Datei kopieren, da ZipArchive seekable Stream benötigt
+ using var ms = new MemoryStream();
+ sInputStream.CopyTo(ms);
+ ms.Position = 0;
+
+ using var zip = new System.IO.Compression.ZipArchive(ms, System.IO.Compression.ZipArchiveMode.Read);
+ var contentEntry = zip.GetEntry("content.xml");
+ if (contentEntry == null)
+ return false;
+
+ using var contentStream = contentEntry.Open();
+ var contentXml = System.Xml.Linq.XDocument.Load(contentStream,
+ System.Xml.Linq.LoadOptions.PreserveWhitespace | System.Xml.Linq.LoadOptions.SetLineInfo);
+
+ // Root-Nodes löschen und neu befüllen
+ _root.Nodes.Clear();
+ OdfBlockParser.Populate(this, contentXml);
+ _isModified = false;
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
}
- public void SaveTo(string cOutputPath)
+ public bool SaveTo(string cOutputPath)
{
- throw new NotImplementedException();
+ try
+ {
+ using var fs = new FileStream(cOutputPath, FileMode.Create, FileAccess.Write);
+ return SaveTo(fs);
+ }
+ catch
+ {
+ return false;
+ }
}
public bool SaveTo(Stream sOutputStream, object? options = null)
{
- throw new NotImplementedException();
+ try
+ {
+ using var zip = new System.IO.Compression.ZipArchive(sOutputStream,
+ System.IO.Compression.ZipArchiveMode.Create, leaveOpen: true);
+
+ // mimetype (muss erste Entry sein, unkomprimiert)
+ var mimetypeEntry = zip.CreateEntry("mimetype", System.IO.Compression.CompressionLevel.NoCompression);
+ using (var s = mimetypeEntry.Open())
+ using (var w = new StreamWriter(s, new System.Text.UTF8Encoding(false)))
+ {
+ w.Write("application/vnd.oasis.opendocument.text");
+ }
+
+ // content.xml
+ var contentXml = OdfXmlWriter.CreateContentXml(_root);
+ var contentEntry = zip.CreateEntry("content.xml", System.IO.Compression.CompressionLevel.Optimal);
+ using (var s = contentEntry.Open())
+ {
+ contentXml.Save(s);
+ }
+
+ // styles.xml
+ var stylesXml = OdfXmlWriter.CreateStylesXml();
+ var stylesEntry = zip.CreateEntry("styles.xml", System.IO.Compression.CompressionLevel.Optimal);
+ using (var s = stylesEntry.Open())
+ {
+ stylesXml.Save(s);
+ }
+
+ // meta.xml
+ var metaXml = OdfXmlWriter.CreateMetaXml();
+ var metaEntry = zip.CreateEntry("meta.xml", System.IO.Compression.CompressionLevel.Optimal);
+ using (var s = metaEntry.Open())
+ {
+ metaXml.Save(s);
+ }
+
+ // META-INF/manifest.xml
+ WriteManifest(zip);
+
+ _isModified = false;
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
}
- bool IUserDocument.SaveTo(string cOutputPath)
+ private static void WriteManifest(System.IO.Compression.ZipArchive zip)
{
- throw new NotImplementedException();
+ var manifestEntry = zip.CreateEntry("META-INF/manifest.xml", System.IO.Compression.CompressionLevel.Optimal);
+ using var s = manifestEntry.Open();
+
+ var manifest = new System.Xml.Linq.XDocument(
+ new System.Xml.Linq.XDeclaration("1.0", "UTF-8", null),
+ new System.Xml.Linq.XElement(OdfNamespaces.Manifest + "manifest",
+ new System.Xml.Linq.XAttribute(System.Xml.Linq.XNamespace.Xmlns + "manifest", OdfNamespaces.Manifest),
+ new System.Xml.Linq.XElement(OdfNamespaces.Manifest + "file-entry",
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "full-path", "/"),
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "media-type", "application/vnd.oasis.opendocument.text")),
+ new System.Xml.Linq.XElement(OdfNamespaces.Manifest + "file-entry",
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "full-path", "content.xml"),
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "media-type", "text/xml")),
+ new System.Xml.Linq.XElement(OdfNamespaces.Manifest + "file-entry",
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "full-path", "styles.xml"),
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "media-type", "text/xml")),
+ new System.Xml.Linq.XElement(OdfNamespaces.Manifest + "file-entry",
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "full-path", "meta.xml"),
+ new System.Xml.Linq.XAttribute(OdfNamespaces.Manifest + "media-type", "text/xml"))
+ )
+ );
+ manifest.Save(s);
}
}
diff --git a/CSharpBible/Data/DocumentUtils/Document.Odf/OdfDocument.cs b/CSharpBible/Data/DocumentUtils/Document.Odf/OdfDocument.cs
index aca63dce7..435a88edf 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Odf/OdfDocument.cs
+++ b/CSharpBible/Data/DocumentUtils/Document.Odf/OdfDocument.cs
@@ -1,31 +1,59 @@
using System.IO.Compression;
+using System.Text;
using System.Xml.Linq;
+using Document.Odf.Models;
namespace Document.Odf;
public sealed class OdfDocument : IAsyncDisposable, IDisposable
{
- private readonly ZipArchive _zip; private bool _disposed;
- private OdfDocument(ZipArchive zip)
+ private readonly ZipArchive _zip;
+ private readonly bool _isReadOnly;
+ private bool _disposed;
+
+ private OdfDocument(ZipArchive zip, bool isReadOnly)
{
_zip = zip;
+ _isReadOnly = isReadOnly;
}
public static OdfDocument Open(string path)
{
var fs = File.OpenRead(path);
var zip = new ZipArchive(fs, ZipArchiveMode.Read, leaveOpen: false);
- return new OdfDocument(zip);
+ return new OdfDocument(zip, isReadOnly: true);
+ }
+
+ public static OdfDocument OpenForUpdate(string path)
+ {
+ var fs = new FileStream(path, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
+ var zip = new ZipArchive(fs, ZipArchiveMode.Update, leaveOpen: false);
+ return new OdfDocument(zip, isReadOnly: false);
+ }
+
+ public static OdfDocument Create(string path)
+ {
+ var fs = new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
+ var zip = new ZipArchive(fs, ZipArchiveMode.Create, leaveOpen: false);
+ var doc = new OdfDocument(zip, isReadOnly: false);
+ doc.WriteMinimalStructure();
+ return doc;
+ }
+
+ public static OdfDocument Create(Stream stream, bool leaveOpen = false)
+ {
+ var zip = new ZipArchive(stream, ZipArchiveMode.Create, leaveOpen);
+ var doc = new OdfDocument(zip, isReadOnly: false);
+ doc.WriteMinimalStructure();
+ return doc;
}
public static async Task OpenAsync(string path, CancellationToken ct = default)
{
- // ZipArchive hat kein echtes Async-Open; Datei async öffnen für IO.
var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 64 * 1024, useAsync: true);
- // trotzdem synchrones Zip-Parsing
var zip = new ZipArchive(fs, ZipArchiveMode.Read, leaveOpen: false);
await Task.CompletedTask;
- return new OdfDocument(zip);
+ return new OdfDocument(zip, isReadOnly: true);
}
public XDocument ReadContentXml()
@@ -43,12 +71,108 @@ public XDocument ReadContentXml()
return XDocument.Load(s, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
}
+ public XDocument? ReadStylesXmlOrNull()
+ {
+ var entry = _zip.GetEntry("styles.xml");
+ if (entry is null) return null;
+ using var s = entry.Open();
+ return XDocument.Load(s, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+ }
+
public Stream? OpenBinary(string pathInPackage)
{
var entry = _zip.GetEntry(pathInPackage);
return entry?.Open();
}
+ public void WriteContentXml(XDocument contentXml)
+ {
+ if (_isReadOnly) throw new InvalidOperationException("Dokument ist schreibgeschützt");
+
+ var entry = _zip.GetEntry("content.xml");
+ entry?.Delete();
+
+ entry = _zip.CreateEntry("content.xml", CompressionLevel.Optimal);
+ using var s = entry.Open();
+ contentXml.Save(s);
+ }
+
+ public void WriteMetaXml(XDocument metaXml)
+ {
+ if (_isReadOnly) throw new InvalidOperationException("Dokument ist schreibgeschützt");
+
+ var entry = _zip.GetEntry("meta.xml");
+ entry?.Delete();
+
+ entry = _zip.CreateEntry("meta.xml", CompressionLevel.Optimal);
+ using var s = entry.Open();
+ metaXml.Save(s);
+ }
+
+ public void WriteStylesXml(XDocument stylesXml)
+ {
+ if (_isReadOnly) throw new InvalidOperationException("Dokument ist schreibgeschützt");
+
+ var entry = _zip.GetEntry("styles.xml");
+ entry?.Delete();
+
+ entry = _zip.CreateEntry("styles.xml", CompressionLevel.Optimal);
+ using var s = entry.Open();
+ stylesXml.Save(s);
+ }
+
+ public void WriteBinary(string pathInPackage, Stream data)
+ {
+ if (_isReadOnly) throw new InvalidOperationException("Dokument ist schreibgeschützt");
+
+ var entry = _zip.GetEntry(pathInPackage);
+ entry?.Delete();
+
+ entry = _zip.CreateEntry(pathInPackage, CompressionLevel.Optimal);
+ using var s = entry.Open();
+ data.CopyTo(s);
+ }
+
+ private void WriteMinimalStructure()
+ {
+ // mimetype (uncompressed, must be first)
+ var mimetypeEntry = _zip.CreateEntry("mimetype", CompressionLevel.NoCompression);
+ using (var s = mimetypeEntry.Open())
+ using (var w = new StreamWriter(s, new UTF8Encoding(false)))
+ {
+ w.Write("application/vnd.oasis.opendocument.text");
+ }
+
+ // META-INF/manifest.xml
+ WriteManifest();
+ }
+
+ private void WriteManifest()
+ {
+ var manifestEntry = _zip.CreateEntry("META-INF/manifest.xml", CompressionLevel.Optimal);
+ using var s = manifestEntry.Open();
+
+ var manifest = new XDocument(
+ new XDeclaration("1.0", "UTF-8", null),
+ new XElement(OdfNamespaces.Manifest + "manifest",
+ new XAttribute(XNamespace.Xmlns + "manifest", OdfNamespaces.Manifest),
+ new XElement(OdfNamespaces.Manifest + "file-entry",
+ new XAttribute(OdfNamespaces.Manifest + "full-path", "/"),
+ new XAttribute(OdfNamespaces.Manifest + "media-type", "application/vnd.oasis.opendocument.text")),
+ new XElement(OdfNamespaces.Manifest + "file-entry",
+ new XAttribute(OdfNamespaces.Manifest + "full-path", "content.xml"),
+ new XAttribute(OdfNamespaces.Manifest + "media-type", "text/xml")),
+ new XElement(OdfNamespaces.Manifest + "file-entry",
+ new XAttribute(OdfNamespaces.Manifest + "full-path", "styles.xml"),
+ new XAttribute(OdfNamespaces.Manifest + "media-type", "text/xml")),
+ new XElement(OdfNamespaces.Manifest + "file-entry",
+ new XAttribute(OdfNamespaces.Manifest + "full-path", "meta.xml"),
+ new XAttribute(OdfNamespaces.Manifest + "media-type", "text/xml"))
+ )
+ );
+ manifest.Save(s);
+ }
+
public void Dispose()
{
if (_disposed) return;
diff --git a/CSharpBible/Data/DocumentUtils/Document.Odf/OdfTextDocument.cs b/CSharpBible/Data/DocumentUtils/Document.Odf/OdfTextDocument.cs
index 1bac6c6ac..e2f1f6fd1 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Odf/OdfTextDocument.cs
+++ b/CSharpBible/Data/DocumentUtils/Document.Odf/OdfTextDocument.cs
@@ -47,10 +47,53 @@ public IEnumerable Enumerate()
=> Root.Enumerate();
public bool SaveTo(string cOutputPath)
- => throw new NotSupportedException();
+ {
+ try
+ {
+ using var fs = new FileStream(cOutputPath, FileMode.Create, FileAccess.Write);
+ return SaveTo(fs);
+ }
+ catch
+ {
+ return false;
+ }
+ }
public bool SaveTo(Stream sOutputStream, object? options = null)
- => throw new NotSupportedException();
+ {
+ try
+ {
+ using var zip = new System.IO.Compression.ZipArchive(sOutputStream, System.IO.Compression.ZipArchiveMode.Create, leaveOpen: true);
+
+ // mimetype (uncompressed, first entry)
+ var mimeEntry = zip.CreateEntry("mimetype", System.IO.Compression.CompressionLevel.NoCompression);
+ using (var writer = new StreamWriter(mimeEntry.Open()))
+ writer.Write("application/vnd.oasis.opendocument.text");
+
+ // content.xml
+ var contentEntry = zip.CreateEntry("content.xml");
+ using (var stream = contentEntry.Open())
+ {
+ var xdoc = CreateContentXDocument();
+ xdoc.Save(stream);
+ }
+
+ // META-INF/manifest.xml
+ var manifestEntry = zip.CreateEntry("META-INF/manifest.xml");
+ using (var stream = manifestEntry.Open())
+ {
+ var manifest = CreateManifest();
+ manifest.Save(stream);
+ }
+
+ _isModified = false;
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
+ }
public bool LoadFrom(string cInputPath)
{
@@ -88,4 +131,76 @@ public bool LoadFrom(Stream sInputStream, object? options = null)
private Models.OdfSection EnsureRoot()
=> Root as Models.OdfSection ?? throw new InvalidOperationException("Root ist nicht OdfSection");
+
+ private static System.Xml.Linq.XDocument CreateManifest()
+ {
+ System.Xml.Linq.XNamespace manifestNs = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
+ return new System.Xml.Linq.XDocument(
+ new System.Xml.Linq.XDeclaration("1.0", "UTF-8", null),
+ new System.Xml.Linq.XElement(manifestNs + "manifest",
+ new System.Xml.Linq.XAttribute(System.Xml.Linq.XNamespace.Xmlns + "manifest", manifestNs),
+ new System.Xml.Linq.XElement(manifestNs + "file-entry",
+ new System.Xml.Linq.XAttribute(manifestNs + "full-path", "/"),
+ new System.Xml.Linq.XAttribute(manifestNs + "media-type", "application/vnd.oasis.opendocument.text")),
+ new System.Xml.Linq.XElement(manifestNs + "file-entry",
+ new System.Xml.Linq.XAttribute(manifestNs + "full-path", "content.xml"),
+ new System.Xml.Linq.XAttribute(manifestNs + "media-type", "text/xml"))
+ )
+ );
+ }
+
+ private System.Xml.Linq.XDocument CreateContentXDocument()
+ {
+ // TODO: Anpassung an tatsächliches ODF-Modell der Anwendung
+ var officeNs = System.Xml.Linq.XNamespace.Get("urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+ var textNs = System.Xml.Linq.XNamespace.Get("urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+
+ var rootSection = EnsureRoot();
+
+ var bodyElement = new System.Xml.Linq.XElement(officeNs + "body");
+ var textElement = new System.Xml.Linq.XElement(officeNs + "text");
+ bodyElement.Add(textElement);
+
+ foreach (var element in rootSection.Enumerate())
+ {
+ if (element is IDocHeadline headline)
+ {
+ var h = new System.Xml.Linq.XElement(textNs + "h",
+ new System.Xml.Linq.XAttribute(textNs + "outline-level", headline.Level));
+
+ if (!string.IsNullOrEmpty(headline.Id))
+ h.Add(new System.Xml.Linq.XAttribute("xml:id", headline.Id));
+
+ // headline.Text gibt es nicht, stattdessen TextContent verwenden
+ if (!string.IsNullOrEmpty(headline.TextContent))
+ h.Add(new System.Xml.Linq.XText(headline.TextContent));
+
+ textElement.Add(h);
+ }
+ else if (element is IDocParagraph paragraph)
+ {
+ var p = new System.Xml.Linq.XElement(textNs + "p");
+
+ // StyleName gibt es nicht im Interface, daher entfernt
+ // if (!string.IsNullOrEmpty(paragraph.StyleName))
+ // p.Add(new System.Xml.Linq.XAttribute(textNs + "style-name", paragraph.StyleName));
+
+ if (!string.IsNullOrEmpty(paragraph.TextContent))
+ p.Add(new System.Xml.Linq.XText(paragraph.TextContent));
+
+ textElement.Add(p);
+ }
+ // Weitere Elementtypen hier bei Bedarf abbilden
+ }
+
+ var doc = new System.Xml.Linq.XDocument(
+ new System.Xml.Linq.XDeclaration("1.0", "UTF-8", null),
+ new System.Xml.Linq.XElement(officeNs + "document-content",
+ new System.Xml.Linq.XAttribute(System.Xml.Linq.XNamespace.Xmlns + "office", officeNs),
+ new System.Xml.Linq.XAttribute(System.Xml.Linq.XNamespace.Xmlns + "text", textNs),
+ bodyElement)
+ );
+
+ return doc;
+ }
}
diff --git a/CSharpBible/Data/DocumentUtils/Document.Odf/Writing/OdfXmlWriter.cs b/CSharpBible/Data/DocumentUtils/Document.Odf/Writing/OdfXmlWriter.cs
new file mode 100644
index 000000000..1affcaf8e
--- /dev/null
+++ b/CSharpBible/Data/DocumentUtils/Document.Odf/Writing/OdfXmlWriter.cs
@@ -0,0 +1,345 @@
+using System.Xml.Linq;
+using Document.Base.Models.Interfaces;
+using Document.Odf.Models;
+
+namespace Document.Odf.Writing;
+
+///
+/// Generiert ODF-XML-Dokumente aus dem Dokumentmodell.
+///
+public static class OdfXmlWriter
+{
+ ///
+ /// Erstellt ein vollstndiges content.xml fr ein ODF-Textdokument.
+ ///
+ public static XDocument CreateContentXml(OdfSection root)
+ {
+ var officeText = new XElement(OdfNamespaces.Office + "text");
+
+ foreach (var node in root.Nodes)
+ {
+ var el = ConvertNode(node);
+ if (el != null)
+ officeText.Add(el);
+ }
+
+ var doc = new XDocument(
+ new XDeclaration("1.0", "UTF-8", null),
+ new XElement(OdfNamespaces.Office + "document-content",
+ new XAttribute(XNamespace.Xmlns + "office", OdfNamespaces.Office),
+ new XAttribute(XNamespace.Xmlns + "text", OdfNamespaces.Text),
+ new XAttribute(XNamespace.Xmlns + "style", OdfNamespaces.Style),
+ new XAttribute(XNamespace.Xmlns + "fo", OdfNamespaces.Fo),
+ new XAttribute(XNamespace.Xmlns + "xlink", OdfNamespaces.XLink),
+ new XAttribute(XNamespace.Xmlns + "draw", OdfNamespaces.Draw),
+ new XAttribute(XNamespace.Xmlns + "table", OdfNamespaces.Table),
+ new XAttribute(XNamespace.Xmlns + "svg", OdfNamespaces.Svg),
+ new XAttribute(OdfNamespaces.Office + "version", "1.3"),
+ CreateAutomaticStyles(root),
+ new XElement(OdfNamespaces.Office + "body", officeText)
+ )
+ );
+
+ return doc;
+ }
+
+ ///
+ /// Erstellt ein minimales styles.xml.
+ ///
+ public static XDocument CreateStylesXml()
+ {
+ return new XDocument(
+ new XDeclaration("1.0", "UTF-8", null),
+ new XElement(OdfNamespaces.Office + "document-styles",
+ new XAttribute(XNamespace.Xmlns + "office", OdfNamespaces.Office),
+ new XAttribute(XNamespace.Xmlns + "style", OdfNamespaces.Style),
+ new XAttribute(XNamespace.Xmlns + "fo", OdfNamespaces.Fo),
+ new XAttribute(XNamespace.Xmlns + "text", OdfNamespaces.Text),
+ new XAttribute(OdfNamespaces.Office + "version", "1.3"),
+ new XElement(OdfNamespaces.Office + "styles",
+ CreateDefaultParagraphStyle(),
+ CreateHeadingStyles()
+ )
+ )
+ );
+ }
+
+ ///
+ /// Erstellt ein minimales meta.xml.
+ ///
+ public static XDocument CreateMetaXml(string? title = null, string? creator = null)
+ {
+ var meta = new XElement(OdfNamespaces.Office + "meta");
+
+ if (!string.IsNullOrEmpty(title))
+ meta.Add(new XElement(OdfNamespaces.Dc + "title", title));
+
+ if (!string.IsNullOrEmpty(creator))
+ meta.Add(new XElement(OdfNamespaces.Dc + "creator", creator));
+
+ meta.Add(new XElement(OdfNamespaces.Meta + "creation-date", DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ")));
+ meta.Add(new XElement(OdfNamespaces.Meta + "generator", "Document.Odf"));
+
+ return new XDocument(
+ new XDeclaration("1.0", "UTF-8", null),
+ new XElement(OdfNamespaces.Office + "document-meta",
+ new XAttribute(XNamespace.Xmlns + "office", OdfNamespaces.Office),
+ new XAttribute(XNamespace.Xmlns + "dc", OdfNamespaces.Dc),
+ new XAttribute(XNamespace.Xmlns + "meta", OdfNamespaces.Meta),
+ new XAttribute(OdfNamespaces.Office + "version", "1.3"),
+ meta
+ )
+ );
+ }
+
+ private static XElement CreateAutomaticStyles(OdfSection root)
+ {
+ var autoStyles = new XElement(OdfNamespaces.Office + "automatic-styles");
+ var usedStyles = new HashSet();
+
+ CollectUsedStyles(root, usedStyles);
+
+ foreach (var styleName in usedStyles)
+ {
+ var style = CreateAutomaticStyle(styleName);
+ if (style != null)
+ autoStyles.Add(style);
+ }
+
+ return autoStyles;
+ }
+
+ private static void CollectUsedStyles(IDOMElement element, HashSet styles)
+ {
+ if (element is OdfSpan span && span.FontStyle != null)
+ {
+ var styleName = GetAutoStyleName(span.FontStyle);
+ if (!string.IsNullOrEmpty(styleName))
+ styles.Add(styleName);
+ }
+
+ foreach (var child in element.Nodes)
+ {
+ if (child is IDOMElement childEl)
+ CollectUsedStyles(childEl, styles);
+ }
+ }
+
+ private static XElement? CreateAutomaticStyle(string styleName)
+ {
+ var textProps = new XElement(OdfNamespaces.Style + "text-properties");
+ bool hasProps = false;
+
+ if (styleName.Contains("Bold"))
+ {
+ textProps.Add(new XAttribute(OdfNamespaces.Fo + "font-weight", "bold"));
+ hasProps = true;
+ }
+ if (styleName.Contains("Italic"))
+ {
+ textProps.Add(new XAttribute(OdfNamespaces.Fo + "font-style", "italic"));
+ hasProps = true;
+ }
+ if (styleName.Contains("Underline"))
+ {
+ textProps.Add(new XAttribute(OdfNamespaces.Style + "text-underline-style", "solid"));
+ textProps.Add(new XAttribute(OdfNamespaces.Style + "text-underline-width", "auto"));
+ hasProps = true;
+ }
+ if (styleName.Contains("Strikeout"))
+ {
+ textProps.Add(new XAttribute(OdfNamespaces.Style + "text-line-through-style", "solid"));
+ hasProps = true;
+ }
+
+ if (!hasProps) return null;
+
+ return new XElement(OdfNamespaces.Style + "style",
+ new XAttribute(OdfNamespaces.Style + "name", styleName),
+ new XAttribute(OdfNamespaces.Style + "family", "text"),
+ textProps
+ );
+ }
+
+ private static string? GetAutoStyleName(IDocFontStyle fontStyle)
+ {
+ var parts = new List();
+ if (fontStyle.Bold) parts.Add("Bold");
+ if (fontStyle.Italic) parts.Add("Italic");
+ if (fontStyle.Underline) parts.Add("Underline");
+ if (fontStyle.Strikeout) parts.Add("Strikeout");
+
+ return parts.Count > 0 ? "T_" + string.Join("_", parts) : null;
+ }
+
+ private static XElement CreateDefaultParagraphStyle()
+ {
+ return new XElement(OdfNamespaces.Style + "default-style",
+ new XAttribute(OdfNamespaces.Style + "family", "paragraph"),
+ new XElement(OdfNamespaces.Style + "paragraph-properties",
+ new XAttribute(OdfNamespaces.Fo + "margin-top", "0cm"),
+ new XAttribute(OdfNamespaces.Fo + "margin-bottom", "0.212cm")
+ ),
+ new XElement(OdfNamespaces.Style + "text-properties",
+ new XAttribute(OdfNamespaces.Style + "font-name", "Liberation Serif"),
+ new XAttribute(OdfNamespaces.Fo + "font-size", "12pt")
+ )
+ );
+ }
+
+ private static IEnumerable CreateHeadingStyles()
+ {
+ for (int level = 1; level <= 6; level++)
+ {
+ var fontSize = level switch
+ {
+ 1 => "24pt",
+ 2 => "18pt",
+ 3 => "14pt",
+ 4 => "12pt",
+ 5 => "10pt",
+ _ => "10pt"
+ };
+
+ yield return new XElement(OdfNamespaces.Style + "style",
+ new XAttribute(OdfNamespaces.Style + "name", $"Heading_{level}"),
+ new XAttribute(OdfNamespaces.Style + "family", "paragraph"),
+ new XAttribute(OdfNamespaces.Style + "parent-style-name", "Heading"),
+ new XAttribute(OdfNamespaces.Style + "default-outline-level", level.ToString()),
+ new XElement(OdfNamespaces.Style + "text-properties",
+ new XAttribute(OdfNamespaces.Fo + "font-size", fontSize),
+ new XAttribute(OdfNamespaces.Fo + "font-weight", "bold")
+ )
+ );
+ }
+ }
+
+ private static XElement? ConvertNode(IDOMElement node)
+ {
+ return node switch
+ {
+ OdfParagraph p => ConvertParagraph(p),
+ OdfHeadline h => ConvertHeadline(h),
+ OdfTOC toc => ConvertTOC(toc),
+ _ => null
+ };
+ }
+
+ private static XElement ConvertParagraph(OdfParagraph p)
+ {
+ var el = new XElement(OdfNamespaces.Text + "p");
+
+ if (!string.IsNullOrEmpty(p.StyleName))
+ el.Add(new XAttribute(OdfNamespaces.Text + "style-name", p.StyleName));
+
+ AddInlineContent(el, p);
+ return el;
+ }
+
+ private static XElement ConvertHeadline(OdfHeadline h)
+ {
+ var el = new XElement(OdfNamespaces.Text + "h",
+ new XAttribute(OdfNamespaces.Text + "outline-level", h.Level.ToString()),
+ new XAttribute(OdfNamespaces.Text + "style-name", $"Heading_{h.Level}")
+ );
+
+ if (!string.IsNullOrEmpty(h.Id))
+ el.Add(new XAttribute(OdfNamespaces.Text + "name", h.Id));
+
+ AddInlineContent(el, h);
+ return el;
+ }
+
+ private static XElement ConvertTOC(OdfTOC toc)
+ {
+ var tocSource = new XElement(OdfNamespaces.Text + "table-of-content-source",
+ new XAttribute(OdfNamespaces.Text + "outline-level", toc.Level.ToString())
+ );
+
+ var tocBody = new XElement(OdfNamespaces.Text + "index-body");
+
+ foreach (var child in toc.Nodes)
+ {
+ if (child is OdfParagraph p)
+ {
+ tocBody.Add(ConvertParagraph(p));
+ }
+ }
+
+ return new XElement(OdfNamespaces.Text + "table-of-content",
+ new XAttribute(OdfNamespaces.Text + "name", toc.Name),
+ tocSource,
+ tocBody
+ );
+ }
+
+ private static void AddInlineContent(XElement parent, OdfContentBase content)
+ {
+ if (!string.IsNullOrEmpty(content.TextContent))
+ parent.Add(new XText(content.TextContent));
+
+ foreach (var child in content.Nodes)
+ {
+ var el = ConvertInlineNode(child);
+ if (el != null)
+ parent.Add(el);
+ }
+ }
+
+ private static object? ConvertInlineNode(IDOMElement node)
+ {
+ return node switch
+ {
+ OdfSpan span => ConvertSpan(span),
+ OdfLineBreak => new XElement(OdfNamespaces.Text + "line-break"),
+ OdfNbSpace => new XElement(OdfNamespaces.Text + "s"),
+ OdfTab => new XElement(OdfNamespaces.Text + "tab"),
+ _ => null
+ };
+ }
+
+ private static XElement ConvertSpan(OdfSpan span)
+ {
+ XElement el;
+
+ if (span.IsLink && !string.IsNullOrEmpty(span.Href))
+ {
+ el = new XElement(OdfNamespaces.Text + "a",
+ new XAttribute(OdfNamespaces.XLink + "href", span.Href),
+ new XAttribute(OdfNamespaces.XLink + "type", "simple")
+ );
+ }
+ else
+ {
+ el = new XElement(OdfNamespaces.Text + "span");
+
+ var styleName = GetAutoStyleName(span.FontStyle);
+ if (!string.IsNullOrEmpty(styleName))
+ el.Add(new XAttribute(OdfNamespaces.Text + "style-name", styleName));
+ }
+
+ if (!string.IsNullOrEmpty(span.Id))
+ {
+ el.AddFirst(new XElement(OdfNamespaces.Text + "bookmark-start",
+ new XAttribute(OdfNamespaces.Text + "name", span.Id)));
+ }
+
+ if (!string.IsNullOrEmpty(span.TextContent))
+ el.Add(new XText(span.TextContent));
+
+ foreach (var child in span.Nodes)
+ {
+ var childEl = ConvertInlineNode(child);
+ if (childEl != null)
+ el.Add(childEl);
+ }
+
+ if (!string.IsNullOrEmpty(span.Id))
+ {
+ el.Add(new XElement(OdfNamespaces.Text + "bookmark-end",
+ new XAttribute(OdfNamespaces.Text + "name", span.Id)));
+ }
+
+ return el;
+ }
+}
diff --git a/CSharpBible/Data/DocumentUtils/Document.Pdf/Document.Pdf.csproj b/CSharpBible/Data/DocumentUtils/Document.Pdf/Document.Pdf.csproj
index 914c04e38..7521c7a97 100644
--- a/CSharpBible/Data/DocumentUtils/Document.Pdf/Document.Pdf.csproj
+++ b/CSharpBible/Data/DocumentUtils/Document.Pdf/Document.Pdf.csproj
@@ -5,7 +5,7 @@
enable
-
+
diff --git a/CSharpBible/Data/PictureDB/PictureDB.Base/PictureDB.Base.csproj b/CSharpBible/Data/PictureDB/PictureDB.Base/PictureDB.Base.csproj
index 0ab59ca54..3b425b7b5 100644
--- a/CSharpBible/Data/PictureDB/PictureDB.Base/PictureDB.Base.csproj
+++ b/CSharpBible/Data/PictureDB/PictureDB.Base/PictureDB.Base.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/CSharpBible/Data/PictureDB/PictureDB.UI/PictureDB.UI.csproj b/CSharpBible/Data/PictureDB/PictureDB.UI/PictureDB.UI.csproj
index 3b7ee9f5a..2a4206e4b 100644
--- a/CSharpBible/Data/PictureDB/PictureDB.UI/PictureDB.UI.csproj
+++ b/CSharpBible/Data/PictureDB/PictureDB.UI/PictureDB.UI.csproj
@@ -8,10 +8,10 @@
-
-
-
-
+
+
+
+
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/DI/BootStrap.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/DI/BootStrap.cs
index c8c26ae4f..5d08c4708 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/DI/BootStrap.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/DI/BootStrap.cs
@@ -1,5 +1,6 @@
// RepoMigrator.App.Wpf/DI/Bootstrap.cs
using Microsoft.Extensions.DependencyInjection;
+using RepoMigrator.App.Wpf.Services;
using RepoMigrator.App.Wpf.ViewModels;
using RepoMigrator.Core;
using RepoMigrator.Core.Abstractions;
@@ -31,6 +32,7 @@ public static ServiceProvider Create()
});
// ViewModels
+ services.AddSingleton();
services.AddSingleton();
return services.BuildServiceProvider();
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml
index 91eab1cea..88892e5ee 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml
@@ -2,6 +2,7 @@
@@ -35,8 +36,9 @@
-
+
+
@@ -52,6 +54,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml.cs
index e9d71d141..0e1d90001 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
// RepoMigrator.App.Wpf/MainWindow.xaml.cs
using System.Windows;
+using System.Windows.Controls;
using RepoMigrator.App.Wpf.ViewModels;
namespace RepoMigrator.App.Wpf;
@@ -8,9 +9,27 @@ public partial class MainWindow : Window
{
public MainWindow() => InitializeComponent();
+ private void WindowLoaded(object sender, RoutedEventArgs e)
+ {
+ if (DataContext is not MainViewModel vm)
+ return;
+
+ if (FindName("SourcePasswordBox") is PasswordBox sourcePasswordBox)
+ sourcePasswordBox.Password = vm.SourcePassword ?? string.Empty;
+
+ if (FindName("TargetPasswordBox") is PasswordBox targetPasswordBox)
+ targetPasswordBox.Password = vm.TargetPassword ?? string.Empty;
+ }
+
private void SourcePasswordChanged(object sender, System.Windows.RoutedEventArgs e)
{
if (DataContext is MainViewModel vm && sender is System.Windows.Controls.PasswordBox pb)
vm.SourcePassword = pb.Password;
}
+
+ private void TargetPasswordChanged(object sender, System.Windows.RoutedEventArgs e)
+ {
+ if (DataContext is MainViewModel vm && sender is System.Windows.Controls.PasswordBox pb)
+ vm.TargetPassword = pb.Password;
+ }
}
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/RepoMigrator.App.Wpf.csproj b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/RepoMigrator.App.Wpf.csproj
index 9b6632180..2d8f5cb0c 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/RepoMigrator.App.Wpf.csproj
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/RepoMigrator.App.Wpf.csproj
@@ -13,7 +13,7 @@
-
-
+
+
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/ViewModels/MainViewModel.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/ViewModels/MainViewModel.cs
index 744d9bae3..93f606664 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/ViewModels/MainViewModel.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.App.Wpf/ViewModels/MainViewModel.cs
@@ -1,7 +1,10 @@
// RepoMigrator.App.Wpf/ViewModels/MainViewModel.cs
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
+using RepoMigrator.App.Wpf.Services;
+using RepoMigrator.App.Wpf.Settings;
using RepoMigrator.Core;
+using RepoMigrator.Core.Abstractions;
using System;
using System.Collections.ObjectModel;
using System.Security.AccessControl;
@@ -15,6 +18,11 @@ namespace RepoMigrator.App.Wpf.ViewModels;
public partial class MainViewModel : ObservableObject, IMigrationProgress
{
private readonly IMigrationService _migration;
+ private readonly IProviderFactory _providerFactory;
+ private readonly AppInputStateStore _inputStateStore;
+ private bool _isLoadingInputState;
+ private string? _targetUser;
+ private string? _targetPassword;
[ObservableProperty] public partial RepoType SourceType { get; set; } = RepoType.Git;
[ObservableProperty] public partial string SourceUrl { get; set; } = "";
@@ -24,6 +32,26 @@ public partial class MainViewModel : ObservableObject, IMigrationProgress
[ObservableProperty] public partial RepoType TargetType { get; set; } = RepoType.Git;
[ObservableProperty] public partial string TargetUrl { get; set; } = "";
+ [ObservableProperty] public partial string? TargetBranch { get; set; }
+ public string? TargetUser
+ {
+ get => _targetUser;
+ set
+ {
+ if (SetProperty(ref _targetUser, value))
+ SaveInputState();
+ }
+ }
+
+ public string? TargetPassword
+ {
+ get => _targetPassword;
+ set
+ {
+ if (SetProperty(ref _targetPassword, value))
+ SaveInputState();
+ }
+ }
[ObservableProperty] public partial string? FromId { get; set; }
[ObservableProperty] public partial string? ToId { get; set; }
@@ -42,33 +70,36 @@ public partial class MainViewModel : ObservableObject, IMigrationProgress
private CancellationTokenSource? _cts;
private int _total;
- public MainViewModel(IMigrationService migration) => _migration = migration;
+ public MainViewModel(IMigrationService migration, IProviderFactory providerFactory, AppInputStateStore inputStateStore)
+ {
+ _migration = migration;
+ _providerFactory = providerFactory;
+ _inputStateStore = inputStateStore;
+
+ _isLoadingInputState = true;
+ var state = _inputStateStore.Load();
+ SourceType = state.SourceType;
+ SourceUrl = state.SourceUrl;
+ SourceBranch = state.SourceBranch;
+ SourceUser = state.SourceUser;
+ SourcePassword = state.SourcePassword;
+ TargetType = state.TargetType;
+ TargetUrl = state.TargetUrl;
+ TargetBranch = state.TargetBranch;
+ TargetUser = state.TargetUser;
+ TargetPassword = state.TargetPassword;
+ FromId = state.FromId;
+ ToId = state.ToId;
+ MaxCount = state.MaxCount;
+ OldestFirst = state.OldestFirst;
+ _isLoadingInputState = false;
+ }
[RelayCommand]
private async Task Start()
{
- IsRunning = true;
- OnPropertyChanged(nameof(IsIdle));
- _cts = new CancellationTokenSource();
- try
+ await RunOperationAsync(clearLog: true, async ct =>
{
- Log = "";
- ProgressValue = 0;
-
- var src = new RepositoryEndpoint
- {
- Type = SourceType,
- UrlOrPath = SourceUrl,
- BranchOrTrunk = SourceBranch,
- Credentials = new RepoCredentials { Username = SourceUser, Password = SourcePassword }
- };
-
- var dst = new RepositoryEndpoint
- {
- Type = TargetType,
- UrlOrPath = TargetUrl
- };
-
var q = new ChangeSetQuery
{
FromExclusiveId = FromId,
@@ -77,25 +108,18 @@ private async Task Start()
OldestFirst = OldestFirst
};
- await _migration.MigrateAsync(src, dst, q, this, _cts.Token);
- }
- catch (OperationCanceledException)
- {
- Append("Abgebrochen.");
- }
- catch (Exception ex)
- {
- Append("Fehler: " + ex.Message);
- }
- finally
- {
- IsRunning = false;
- OnPropertyChanged(nameof(IsIdle));
- _cts?.Dispose();
- _cts = null;
- }
+ await _migration.MigrateAsync(CreateSourceEndpoint(), CreateTargetEndpoint(), q, this, ct);
+ });
}
+ [RelayCommand]
+ private async Task TestSource()
+ => await ProbeEndpointAsync("Quelle", CreateSourceEndpoint(), RepositoryAccessMode.Read);
+
+ [RelayCommand]
+ private async Task TestTarget()
+ => await ProbeEndpointAsync("Ziel", CreateTargetEndpoint(), RepositoryAccessMode.Write);
+
[RelayCommand]
private void Cancel() => _cts?.Cancel();
@@ -119,4 +143,113 @@ private void Append(string line)
ProgressValue = idx;
}
}
+
+ private RepositoryEndpoint CreateSourceEndpoint()
+ => new()
+ {
+ Type = SourceType,
+ UrlOrPath = SourceUrl,
+ BranchOrTrunk = SourceBranch,
+ Credentials = new RepoCredentials { Username = SourceUser, Password = SourcePassword }
+ };
+
+ private RepositoryEndpoint CreateTargetEndpoint()
+ => new()
+ {
+ Type = TargetType,
+ UrlOrPath = TargetUrl,
+ BranchOrTrunk = TargetBranch,
+ Credentials = new RepoCredentials { Username = TargetUser, Password = TargetPassword }
+ };
+
+ private async Task ProbeEndpointAsync(string label, RepositoryEndpoint endpoint, RepositoryAccessMode accessMode)
+ {
+ await RunOperationAsync(clearLog: false, async ct =>
+ {
+ await using var provider = _providerFactory.Create(endpoint.Type);
+ Append($"Teste {label} ({provider.Name}) …");
+
+ var result = await provider.ProbeAsync(endpoint, accessMode, ct);
+ Append(result.Success
+ ? $"{label} erfolgreich getestet: {result.Summary}"
+ : $"{label}-Test fehlgeschlagen: {result.Summary}");
+
+ foreach (var detail in result.Details)
+ Append($" {detail}");
+ });
+ }
+
+ private async Task RunOperationAsync(bool clearLog, Func action)
+ {
+ if (IsRunning)
+ return;
+
+ IsRunning = true;
+ OnPropertyChanged(nameof(IsIdle));
+ _cts = new CancellationTokenSource();
+ try
+ {
+ if (clearLog)
+ {
+ Log = "";
+ _total = 0;
+ ProgressValue = 0;
+ ProgressMax = 100;
+ }
+
+ await action(_cts.Token);
+ }
+ catch (OperationCanceledException)
+ {
+ Append("Abgebrochen.");
+ }
+ catch (Exception ex)
+ {
+ Append("Fehler: " + ex.Message);
+ }
+ finally
+ {
+ IsRunning = false;
+ OnPropertyChanged(nameof(IsIdle));
+ _cts?.Dispose();
+ _cts = null;
+ }
+ }
+
+ partial void OnSourceTypeChanged(RepoType value) => SaveInputState();
+ partial void OnSourceUrlChanged(string value) => SaveInputState();
+ partial void OnSourceBranchChanged(string? value) => SaveInputState();
+ partial void OnSourceUserChanged(string? value) => SaveInputState();
+ partial void OnSourcePasswordChanged(string? value) => SaveInputState();
+ partial void OnTargetTypeChanged(RepoType value) => SaveInputState();
+ partial void OnTargetUrlChanged(string value) => SaveInputState();
+ partial void OnTargetBranchChanged(string? value) => SaveInputState();
+ partial void OnFromIdChanged(string? value) => SaveInputState();
+ partial void OnToIdChanged(string? value) => SaveInputState();
+ partial void OnMaxCountChanged(int? value) => SaveInputState();
+ partial void OnOldestFirstChanged(bool value) => SaveInputState();
+
+ private void SaveInputState()
+ {
+ if (_isLoadingInputState)
+ return;
+
+ _inputStateStore.Save(new AppInputState
+ {
+ SourceType = SourceType,
+ SourceUrl = SourceUrl,
+ SourceBranch = SourceBranch,
+ SourceUser = SourceUser,
+ SourcePassword = SourcePassword,
+ TargetType = TargetType,
+ TargetUrl = TargetUrl,
+ TargetBranch = TargetBranch,
+ TargetUser = TargetUser,
+ TargetPassword = TargetPassword,
+ FromId = FromId,
+ ToId = ToId,
+ MaxCount = MaxCount,
+ OldestFirst = OldestFirst
+ });
+ }
}
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Abstractions/IVersionControlProvider.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Abstractions/IVersionControlProvider.cs
index 36aeff09b..658c4e029 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Abstractions/IVersionControlProvider.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Abstractions/IVersionControlProvider.cs
@@ -9,11 +9,12 @@ namespace RepoMigrator.Core.Abstractions;
public interface IVersionControlProvider : IAsyncDisposable
{
Task OpenAsync(RepositoryEndpoint endpoint, CancellationToken ct);
+ Task ProbeAsync(RepositoryEndpoint endpoint, RepositoryAccessMode accessMode, CancellationToken ct);
Task> GetChangeSetsAsync(ChangeSetQuery query, CancellationToken ct);
Task MaterializeSnapshotAsync(string workDir, string changeSetId, CancellationToken ct);
- Task InitializeTargetAsync(string targetPath, bool emptyInit, CancellationToken ct);
+ Task InitializeTargetAsync(RepositoryEndpoint endpoint, bool emptyInit, CancellationToken ct);
Task CommitSnapshotAsync(string workDir, CommitMetadata metadata, CancellationToken ct);
string Name { get; }
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Models.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Models.cs
index b7c1b695c..c262501d5 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Models.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Models.cs
@@ -3,6 +3,8 @@ namespace RepoMigrator.Core;
public enum RepoType { Git, Svn, Custom }
+public enum RepositoryAccessMode { Read, Write }
+
public sealed class RepositoryEndpoint
{
public RepoType Type { get; init; }
@@ -42,4 +44,11 @@ public sealed class CommitMetadata
public string AuthorName { get; init; } = "";
public string? AuthorEmail { get; init; }
public DateTimeOffset Timestamp { get; init; }
+}
+
+public sealed class RepositoryProbeResult
+{
+ public bool Success { get; init; }
+ public string Summary { get; init; } = "";
+ public IReadOnlyList Details { get; init; } = Array.Empty();
}
\ No newline at end of file
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/RepoMigrator.Core.csproj b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/RepoMigrator.Core.csproj
index 8f7f30621..2503a65e5 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/RepoMigrator.Core.csproj
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/RepoMigrator.Core.csproj
@@ -6,6 +6,6 @@
enable
-
+
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Services/MigrationService.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Services/MigrationService.cs
index c348ce394..832a25cb5 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Services/MigrationService.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.Core/Services/MigrationService.cs
@@ -52,8 +52,7 @@ public async Task MigrateAsync(
}
progress.Report($"Initialisiere Ziel ({dst.Name}) …");
- await dst.OpenAsync(target, ct);
- await dst.InitializeTargetAsync(target.UrlOrPath, emptyInit: true, ct);
+ await dst.InitializeTargetAsync(target, emptyInit: true, ct);
var total = changes.Count;
for (int i = 0; i < total; i++)
@@ -72,7 +71,7 @@ public async Task MigrateAsync(
// 2) Snapshot in Ziel committen
var meta = new CommitMetadata
{
- Message = c.Message,
+ Message = string.IsNullOrWhiteSpace(c.Message) ? $"Imported revision {c.Id}" : c.Message,
AuthorName = c.AuthorName,
AuthorEmail = c.AuthorEmail,
Timestamp = c.Timestamp
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.Git/GitProvider.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.Git/GitProvider.cs
index ea0ed0631..b04549a4a 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.Git/GitProvider.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.Git/GitProvider.cs
@@ -4,9 +4,10 @@
using RepoMigrator.Core.Abstractions;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.IO;
using System.Linq;
-using System.Reflection.Metadata;
+using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -14,6 +15,7 @@ namespace RepoMigrator.Providers.Git;
public sealed class GitProvider : IVersionControlProvider
{
+ private RepositoryEndpoint? _endpoint;
private string? _localPath; // Lokales Arbeitsrepo für Quelle und/oder Ziel
private Repository? _repo;
public string Name => "Git";
@@ -22,6 +24,8 @@ public sealed class GitProvider : IVersionControlProvider
public async Task OpenAsync(RepositoryEndpoint endpoint, CancellationToken ct)
{
+ _endpoint = endpoint;
+
// Für lokale Pfade: direkt öffnen; für Remote: temporär klonen
_localPath = PrepareLocalPath(endpoint);
if (!Repository.IsValid(_localPath))
@@ -32,16 +36,16 @@ public async Task OpenAsync(RepositoryEndpoint endpoint, CancellationToken ct)
if (LooksLikeRemote(endpoint.UrlOrPath))
{
cloneOpts = new CloneOptions();
- if (endpoint.Credentials?.Username is not null)
+ if (HasHttpCredentials(endpoint))
{
- cloneOpts.FetchOptions.CredentialsProvider = (_url, _user, _cred) =>
- new UsernamePasswordCredentials
- {
- Username = endpoint.Credentials!.Username!,
- Password = endpoint.Credentials!.Password ?? ""
- };
+ var password = endpoint.Credentials?.Password ?? "";
+ cloneOpts.FetchOptions.CredentialsProvider = (_url, _user, _types) => new UsernamePasswordCredentials
+ {
+ Username = GetEffectiveHttpUsername(endpoint),
+ Password = password
+ };
}
- Repository.Clone(endpoint.UrlOrPath, _localPath!, cloneOpts);
+ Repository.Clone(GetAccessUrl(endpoint), _localPath!, cloneOpts);
}
else
{
@@ -62,6 +66,76 @@ public async Task OpenAsync(RepositoryEndpoint endpoint, CancellationToken ct)
await Task.CompletedTask;
}
+ public async Task ProbeAsync(RepositoryEndpoint endpoint, RepositoryAccessMode accessMode, CancellationToken ct)
+ {
+ try
+ {
+ if (!LooksLikeRemote(endpoint.UrlOrPath))
+ {
+ var localPath = Path.GetFullPath(endpoint.UrlOrPath);
+ if (!Repository.IsValid(localPath))
+ {
+ return new RepositoryProbeResult
+ {
+ Success = false,
+ Summary = "Lokales Git-Repository wurde nicht gefunden.",
+ Details = [$"Pfad: {localPath}"]
+ };
+ }
+
+ using var repo = new Repository(localPath);
+ return new RepositoryProbeResult
+ {
+ Success = true,
+ Summary = "Lokales Git-Repository ist erreichbar.",
+ Details =
+ [
+ $"Pfad: {localPath}",
+ $"Branch: {repo.Head.FriendlyName}",
+ $"Letzter Commit: {repo.Head.Tip?.Sha[..Math.Min(8, repo.Head.Tip.Sha.Length)] ?? "keiner"}"
+ ]
+ };
+ }
+
+ var output = await RunGitAsync(
+ $"ls-remote --symref \"{GetAccessUrl(endpoint)}\" HEAD",
+ workingDir: null,
+ operationName: "Git-Remote-Test",
+ ct);
+
+ var refs = output
+ .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+ .Take(3)
+ .ToArray();
+
+ var details = new List { $"Remote: {endpoint.UrlOrPath}" };
+ if (!string.IsNullOrWhiteSpace(endpoint.BranchOrTrunk))
+ details.Add($"Ziel-Branch: {endpoint.BranchOrTrunk}");
+ if (refs.Length > 0)
+ details.AddRange(refs.Select(r => $"Ref: {r}"));
+ else
+ details.Add("Keine Referenzen gefunden. Das Remote ist möglicherweise leer.");
+
+ if (accessMode == RepositoryAccessMode.Write)
+ details.Add("Hinweis: Der Test bestätigt Erreichbarkeit und Authentifizierung. Schreibrechte werden endgültig erst beim Push geprüft.");
+
+ return new RepositoryProbeResult
+ {
+ Success = true,
+ Summary = "Git-Remote ist erreichbar.",
+ Details = details
+ };
+ }
+ catch (Exception ex)
+ {
+ return new RepositoryProbeResult
+ {
+ Success = false,
+ Summary = ex.Message
+ };
+ }
+ }
+
public Task> GetChangeSetsAsync(ChangeSetQuery query, CancellationToken ct)
{
var commits = _repo!.Commits.QueryBy(new CommitFilter
@@ -113,13 +187,55 @@ public Task MaterializeSnapshotAsync(string workDir, string changeSetId, Cancell
return Task.CompletedTask;
}
- public Task InitializeTargetAsync(string targetPath, bool emptyInit, CancellationToken ct)
+ public async Task InitializeTargetAsync(RepositoryEndpoint endpoint, bool emptyInit, CancellationToken ct)
{
- if (!Repository.IsValid(targetPath))
+ _endpoint = endpoint;
+ _localPath = LooksLikeRemote(endpoint.UrlOrPath)
+ ? Path.Combine(Path.GetTempPath(), "RepoMigrator", "git-target", Guid.NewGuid().ToString("N"))
+ : Path.GetFullPath(endpoint.UrlOrPath);
+
+ Directory.CreateDirectory(_localPath);
+
+ if (!Repository.IsValid(_localPath))
+ Repository.Init(_localPath);
+
+ _repo?.Dispose();
+ _repo = new Repository(_localPath);
+
+ if (_endpoint is not null
+ && LooksLikeRemote(_endpoint.UrlOrPath)
+ && _repo.Network.Remotes["origin"] is null)
{
- Repository.Init(targetPath);
+ _repo.Network.Remotes.Add("origin", _endpoint.UrlOrPath);
+
+ var accessUrl = GetAccessUrl(_endpoint);
+ var targetBranch = NormalizeBranchName(_endpoint.BranchOrTrunk);
+
+ await RunGitAsync($"fetch \"{accessUrl}\" \"+refs/heads/*:refs/remotes/origin/*\"", _localPath, "Git-Fetch", ct);
+
+ var defaultRemoteBranch = await GetRemoteHeadBranchAsync(_endpoint, ct);
+ if (!string.IsNullOrWhiteSpace(targetBranch) && await RemoteBranchExistsAsync(_endpoint, targetBranch, ct))
+ {
+ await RunGitAsync($"checkout -B \"{targetBranch}\" \"origin/{targetBranch}\"", _localPath, "Git-Checkout", ct);
+ }
+ else if (!string.IsNullOrWhiteSpace(targetBranch) && !string.IsNullOrWhiteSpace(defaultRemoteBranch))
+ {
+ await RunGitAsync($"checkout -B \"{targetBranch}\" \"origin/{defaultRemoteBranch}\"", _localPath, "Git-Checkout", ct);
+ }
+ else if (!string.IsNullOrWhiteSpace(targetBranch))
+ {
+ await RunGitAsync($"checkout -B \"{targetBranch}\"", _localPath, "Git-Checkout", ct);
+ }
+ else if (!string.IsNullOrWhiteSpace(defaultRemoteBranch))
+ {
+ await RunGitAsync($"checkout -B \"{defaultRemoteBranch}\" \"origin/{defaultRemoteBranch}\"", _localPath, "Git-Checkout", ct);
+ }
+
+ _repo.Dispose();
+ _repo = new Repository(_localPath);
}
- return Task.CompletedTask;
+
+ return;
}
public Task CommitSnapshotAsync(string workDir, CommitMetadata metadata, CancellationToken ct)
@@ -132,7 +248,23 @@ public Task CommitSnapshotAsync(string workDir, CommitMetadata metadata, Cancell
Commands.Stage(_repo!, "*");
var author = new Signature(metadata.AuthorName, metadata.AuthorEmail ?? "unknown@example.com", metadata.Timestamp);
var committer = author;
- _repo!.Commit(metadata.Message, author, committer);
+ try
+ {
+ _repo!.Commit(metadata.Message, author, committer);
+ }
+ catch (EmptyCommitException)
+ {
+ return Task.CompletedTask;
+ }
+
+ if (_endpoint is not null && LooksLikeRemote(_endpoint.UrlOrPath))
+ {
+ var branchName = string.IsNullOrWhiteSpace(NormalizeBranchName(_endpoint.BranchOrTrunk))
+ ? _repo!.Head.FriendlyName
+ : NormalizeBranchName(_endpoint.BranchOrTrunk)!;
+ var args = $"push --set-upstream \"{GetAccessUrl(_endpoint)}\" \"HEAD:refs/heads/{branchName}\"";
+ return RunGitAsync(args, _localPath, "Git-Push", ct);
+ }
return Task.CompletedTask;
}
@@ -152,6 +284,114 @@ private static string PrepareLocalPath(RepositoryEndpoint ep)
=> LooksLikeRemote(ep.UrlOrPath) ? Path.Combine(Path.GetTempPath(), "RepoMigrator", "git", Guid.NewGuid().ToString("N"))
: Path.GetFullPath(ep.UrlOrPath);
+ private static bool IsHttpRemote(string urlOrPath)
+ => urlOrPath.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+ || urlOrPath.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+
+ private static string GetAccessUrl(RepositoryEndpoint endpoint)
+ {
+ if (!IsHttpRemote(endpoint.UrlOrPath) || !HasHttpCredentials(endpoint))
+ return endpoint.UrlOrPath;
+
+ var uri = new Uri(endpoint.UrlOrPath, UriKind.Absolute);
+ var builder = new UriBuilder(uri)
+ {
+ UserName = GetEffectiveHttpUsername(endpoint),
+ Password = endpoint.Credentials?.Password ?? string.Empty
+ };
+
+ return builder.Uri.AbsoluteUri;
+ }
+
+ private static async Task GetRemoteHeadBranchAsync(RepositoryEndpoint endpoint, CancellationToken ct)
+ {
+ var output = await RunGitAsync(
+ $"ls-remote --symref \"{GetAccessUrl(endpoint)}\" HEAD",
+ workingDir: null,
+ operationName: "Git-Remote-HEAD",
+ ct);
+
+ foreach (var line in output.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries))
+ {
+ const string prefix = "ref: refs/heads/";
+ if (line.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+ {
+ var headIndex = line.IndexOf("\tHEAD", StringComparison.OrdinalIgnoreCase);
+ if (headIndex > prefix.Length)
+ return line[prefix.Length..headIndex];
+ }
+ }
+
+ return null;
+ }
+
+ private static async Task RemoteBranchExistsAsync(RepositoryEndpoint endpoint, string branchName, CancellationToken ct)
+ {
+ var output = await RunGitAsync(
+ $"ls-remote --heads \"{GetAccessUrl(endpoint)}\" \"refs/heads/{branchName}\"",
+ workingDir: null,
+ operationName: "Git-Remote-Branch-Test",
+ ct);
+
+ return output.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).Length > 0;
+ }
+
+ private static bool HasHttpCredentials(RepositoryEndpoint endpoint)
+ => !string.IsNullOrWhiteSpace(endpoint.Credentials?.Username)
+ || !string.IsNullOrWhiteSpace(endpoint.Credentials?.Password);
+
+ private static string? NormalizeBranchName(string? branchName)
+ => string.IsNullOrWhiteSpace(branchName) ? null : branchName.Trim();
+
+ private static string GetEffectiveHttpUsername(RepositoryEndpoint endpoint)
+ => string.IsNullOrWhiteSpace(endpoint.Credentials?.Username)
+ ? "git"
+ : endpoint.Credentials.Username!;
+
+ private static async Task RunGitAsync(string arguments, string? workingDir, string operationName, CancellationToken ct)
+ {
+ var psi = new ProcessStartInfo
+ {
+ FileName = "git",
+ Arguments = arguments,
+ RedirectStandardOutput = true,
+ RedirectStandardError = true,
+ UseShellExecute = false,
+ CreateNoWindow = true,
+ StandardOutputEncoding = Encoding.UTF8,
+ StandardErrorEncoding = Encoding.UTF8
+ };
+
+ psi.Environment["GIT_TERMINAL_PROMPT"] = "0";
+ psi.Environment["GCM_INTERACTIVE"] = "Never";
+
+ if (!string.IsNullOrWhiteSpace(workingDir))
+ psi.WorkingDirectory = workingDir;
+
+ using var proc = new Process { StartInfo = psi, EnableRaisingEvents = true };
+ var stdout = new StringBuilder();
+ var stderr = new StringBuilder();
+
+ proc.OutputDataReceived += (_, e) => { if (e.Data is not null) stdout.AppendLine(e.Data); };
+ proc.ErrorDataReceived += (_, e) => { if (e.Data is not null) stderr.AppendLine(e.Data); };
+
+ if (!proc.Start())
+ throw new InvalidOperationException($"{operationName} konnte nicht gestartet werden.");
+
+ proc.BeginOutputReadLine();
+ proc.BeginErrorReadLine();
+
+ await proc.WaitForExitAsync(ct);
+
+ if (proc.ExitCode != 0)
+ {
+ var message = stderr.Length > 0 ? stderr.ToString().Trim() : stdout.ToString().Trim();
+ throw new InvalidOperationException(string.IsNullOrWhiteSpace(message) ? $"{operationName} ist fehlgeschlagen." : message);
+ }
+
+ return stdout.ToString();
+ }
+
private static void CleanDirectory(string dir)
{
foreach (var file in Directory.EnumerateFiles(dir, "*", SearchOption.AllDirectories))
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.SvnCli/SvnCliProvider.cs b/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.SvnCli/SvnCliProvider.cs
index a4637c9bb..c4b2212dd 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.SvnCli/SvnCliProvider.cs
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.Providers.SvnCli/SvnCliProvider.cs
@@ -29,6 +29,48 @@ public Task OpenAsync(RepositoryEndpoint endpoint, CancellationToken ct)
return Task.CompletedTask;
}
+ public async Task ProbeAsync(RepositoryEndpoint endpoint, RepositoryAccessMode accessMode, CancellationToken ct)
+ {
+ try
+ {
+ _endpoint = endpoint;
+ _wcPath = IsRemote(endpoint.UrlOrPath) ? null : Path.GetFullPath(endpoint.UrlOrPath);
+
+ var target = IsRemote(endpoint.UrlOrPath) ? endpoint.UrlOrPath : _wcPath!;
+ var infoXml = await RunSvnAsync($"info --xml \"{target}\"", workingDir: null, ct);
+ var doc = XDocument.Parse(infoXml);
+ var entry = doc.Root?.Element("entry");
+ var url = entry?.Element("url")?.Value;
+ var root = entry?.Element("repository")?.Element("root")?.Value;
+ var revision = entry?.Attribute("revision")?.Value;
+
+ var details = new List();
+ if (!string.IsNullOrWhiteSpace(url))
+ details.Add($"URL: {url}");
+ if (!string.IsNullOrWhiteSpace(root))
+ details.Add($"Repository Root: {root}");
+ if (!string.IsNullOrWhiteSpace(revision))
+ details.Add($"Revision: {revision}");
+ if (accessMode == RepositoryAccessMode.Write)
+ details.Add("Hinweis: Der Test bestätigt Erreichbarkeit. Schreibrechte werden endgültig erst beim Commit geprüft.");
+
+ return new RepositoryProbeResult
+ {
+ Success = true,
+ Summary = "SVN-Repository ist erreichbar.",
+ Details = details
+ };
+ }
+ catch (Exception ex)
+ {
+ return new RepositoryProbeResult
+ {
+ Success = false,
+ Summary = ex.Message
+ };
+ }
+ }
+
public async Task> GetChangeSetsAsync(ChangeSetQuery query, CancellationToken ct)
{
var repoUrl = await GetRepositoryUrlAsync(ct);
@@ -85,20 +127,22 @@ public async Task MaterializeSnapshotAsync(string workDir, string changeSetId, C
await RunSvnAsync($"export -r {changeSetId} \"{repoUrl}\" \"{workDir}\" --force", workingDir: null, ct);
}
- public async Task InitializeTargetAsync(string targetPath, bool emptyInit, CancellationToken ct)
+ public async Task InitializeTargetAsync(RepositoryEndpoint endpoint, bool emptyInit, CancellationToken ct)
{
- if (_endpoint is null)
- throw new InvalidOperationException("Endpoint nicht gesetzt. OpenAsync zuerst aufrufen.");
+ _endpoint = endpoint;
- Directory.CreateDirectory(targetPath);
- _wcPath = Path.GetFullPath(targetPath);
+ _wcPath = IsRemote(endpoint.UrlOrPath)
+ ? Path.Combine(Path.GetTempPath(), "RepoMigrator", "svn-target", Guid.NewGuid().ToString("N"))
+ : Path.GetFullPath(endpoint.UrlOrPath);
- if (IsRemote(_endpoint.UrlOrPath))
+ Directory.CreateDirectory(_wcPath);
+
+ if (IsRemote(endpoint.UrlOrPath))
{
// Falls targetPath noch keine WC ist: checkout
if (!await IsWorkingCopyAsync(_wcPath, ct))
{
- await RunSvnAsync($"checkout \"{_endpoint.UrlOrPath}\" \"{_wcPath}\"", workingDir: null, ct);
+ await RunSvnAsync($"checkout \"{endpoint.UrlOrPath}\" \"{_wcPath}\"", workingDir: null, ct);
}
}
else
diff --git a/CSharpBible/Data/RepoMigrator/RepoMigrator.Tests/RepoMigrator.Tests.csproj b/CSharpBible/Data/RepoMigrator/RepoMigrator.Tests/RepoMigrator.Tests.csproj
index b537b0d1b..0b0b18caf 100644
--- a/CSharpBible/Data/RepoMigrator/RepoMigrator.Tests/RepoMigrator.Tests.csproj
+++ b/CSharpBible/Data/RepoMigrator/RepoMigrator.Tests/RepoMigrator.Tests.csproj
@@ -1,4 +1,4 @@
-
+
net9.0
@@ -7,8 +7,8 @@
enable
-
-
+
+
diff --git a/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj b/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj
index bda95742d..f8dff9530 100644
--- a/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj
+++ b/CSharpBible/Data/TraceCsv2realCsv/TraceCsv2realCsv.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj b/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj
index 8fe426c44..5e7c8b5d6 100644
--- a/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj
+++ b/CSharpBible/Data/TraceCsv2realCsvTests/TraceCsv2realCsvTests.csproj
@@ -7,9 +7,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj b/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj
index edaba1c69..b3a111ddf 100644
--- a/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj
+++ b/CSharpBible/DependencyInjection/CustomerRepositoryTests/CustomerRepositoryTests.csproj
@@ -11,12 +11,12 @@
-
+
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -24,7 +24,7 @@
-
+
diff --git a/CSharpBible/Games/Arkanoid.Base/Arkanoid.Base.csproj b/CSharpBible/Games/Arkanoid.Base/Arkanoid.Base.csproj
new file mode 100644
index 000000000..1705ad3c5
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Arkanoid.Base.csproj
@@ -0,0 +1,24 @@
+
+
+
+ net8.0
+ enable
+ enable
+ true
+ Arkanoid.Base
+
+
+
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
+
+
+
+
+
+
+
diff --git a/CSharpBible/Games/Arkanoid.Base/GameEngine.cs b/CSharpBible/Games/Arkanoid.Base/GameEngine.cs
new file mode 100644
index 000000000..ac6cb6a0c
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/GameEngine.cs
@@ -0,0 +1,176 @@
+using Arkanoid.Base.Models;
+using System;
+using System.Linq;
+
+namespace Arkanoid.Base;
+
+///
+/// Provides the core game loop mechanics for the Arkanoid-style game,
+/// including state updates, collision handling, and level setup.
+///
+///
+/// This engine operates on a simple fixed-field coordinate system and updates
+/// the in-place. It is intentionally lightweight and
+/// deterministic for predictable gameplay behavior.
+///
+public class GameEngine
+{
+ ///
+ /// Gets the current mutable game state, including ball, paddle, bricks, score, and lives.
+ ///
+ public GameState State { get; } = new();
+
+ ///
+ /// Initializes a new instance of the class
+ /// and creates the default level layout.
+ ///
+ public GameEngine()
+ {
+ CreateDefaultLevel();
+ }
+
+ ///
+ /// Moves the paddle horizontally according to player input and elapsed time.
+ ///
+ ///
+ /// The horizontal input direction, typically in the range [-1, 1],
+ /// where negative values move left and positive values move right.
+ ///
+ /// The elapsed time since the last update, in seconds.
+ ///
+ /// The paddle position is clamped so it cannot leave the horizontal bounds of the field.
+ ///
+ public void MovePaddle(float direction, float deltaTime)
+ {
+ var dx = State.Paddle.Speed * direction * deltaTime;
+ var newX = Math.Clamp(State.Paddle.Position.X + dx, 0, State.FieldWidth - State.Paddle.Width);
+ State.Paddle.Position = new Vector2(newX, State.Paddle.Position.Y);
+ }
+
+ ///
+ /// Advances the simulation by the specified time step.
+ ///
+ /// The elapsed time since the last update, in seconds.
+ ///
+ /// If the game is over, no further updates are performed.
+ /// This method updates the ball position and resolves collisions.
+ ///
+ public void Update(float deltaTime)
+ {
+ if (State.IsGameOver) return;
+
+ State.Ball.Position = new Vector2(
+ State.Ball.Position.X + State.Ball.Velocity.X * deltaTime,
+ State.Ball.Position.Y + State.Ball.Velocity.Y * deltaTime);
+
+ HandleCollisions();
+ }
+
+ ///
+ /// Detects and resolves collisions between the ball and walls, paddle, and bricks.
+ ///
+ ///
+ /// - Wall collisions reflect velocity components as needed.
+ /// - Falling below the field reduces lives and resets the ball and paddle.
+ /// - Paddle collisions reflect the ball upward when moving downward.
+ /// - Brick collisions reflect vertical velocity and reduce hit points for breakable bricks.
+ /// - If all bricks are destroyed, the game ends.
+ ///
+ private void HandleCollisions()
+ {
+ var b = State.Ball;
+
+ // walls
+ if (b.Position.X - b.Radius < 0 || b.Position.X + b.Radius > State.FieldWidth)
+ State.Ball.Velocity = new Vector2(-b.Velocity.X, b.Velocity.Y);
+ if (b.Position.Y - b.Radius < 0)
+ State.Ball.Velocity = new Vector2(b.Velocity.X, -b.Velocity.Y);
+ if (b.Position.Y - b.Radius > State.FieldHeight)
+ {
+ State.Lives--;
+ if (State.Lives <= 0) State.IsGameOver = true;
+ ResetBallAndPaddle();
+ return;
+ }
+
+ // paddle (simple AABB)
+ var p = State.Paddle;
+ if (b.Position.Y + b.Radius >= p.Position.Y &&
+ b.Position.Y - b.Radius <= p.Position.Y + 1 &&
+ b.Position.X >= p.Position.X &&
+ b.Position.X <= p.Position.X + p.Width &&
+ b.Velocity.Y > 0)
+ {
+ State.Ball.Velocity = new Vector2(b.Velocity.X, -Math.Abs(b.Velocity.Y));
+ }
+
+ // bricks
+ foreach (var brick in State.Bricks.ToList())
+ {
+ if (brick.IsDestroyed) continue;
+
+ if (b.Position.X + b.Radius < brick.Position.X ||
+ b.Position.X - b.Radius > brick.Position.X + brick.Width ||
+ b.Position.Y + b.Radius < brick.Position.Y ||
+ b.Position.Y - b.Radius > brick.Position.Y + brick.Height)
+ continue;
+
+ State.Ball.Velocity = new Vector2(b.Velocity.X, -b.Velocity.Y);
+
+ if (brick.Type != BrickType.Unbreakable)
+ {
+ brick.HitPoints--;
+ if (brick.IsDestroyed)
+ {
+ State.Score += 10;
+ }
+ }
+ }
+
+ if (State.Bricks.All(br => br.IsDestroyed))
+ State.IsGameOver = true;
+ }
+
+ ///
+ /// Resets the paddle and ball to their default starting positions and velocity.
+ ///
+ ///
+ /// This is invoked after losing a life or when initializing a level.
+ ///
+ private void ResetBallAndPaddle()
+ {
+ State.Paddle.Position = new Vector2(State.FieldWidth / 2 - State.Paddle.Width / 2, State.FieldHeight - 2);
+ State.Ball.Position = new Vector2(State.FieldWidth / 2, State.FieldHeight / 2);
+ State.Ball.Velocity = new Vector2(15, -20);
+ }
+
+ ///
+ /// Creates the default level layout consisting of a rectangular grid of bricks.
+ ///
+ ///
+ /// The layout uses a fixed number of rows and columns and distributes bricks evenly
+ /// across the field width. All bricks are initialized as breakable with one hit point.
+ ///
+ private void CreateDefaultLevel()
+ {
+ State.Bricks.Clear();
+ var rows = 5;
+ var cols = 10;
+ var brickWidth = State.FieldWidth / cols;
+ for (var y = 0; y < rows; y++)
+ {
+ for (var x = 0; x < cols; x++)
+ {
+ State.Bricks.Add(new Brick
+ {
+ Position = new Vector2(x * brickWidth, 2 + y),
+ Width = brickWidth - 0.5f,
+ Height = 1,
+ Type = BrickType.Normal,
+ HitPoints = 1
+ });
+ }
+ }
+ ResetBallAndPaddle();
+ }
+}
diff --git a/CSharpBible/Games/Arkanoid.Base/Models/Ball.cs b/CSharpBible/Games/Arkanoid.Base/Models/Ball.cs
new file mode 100644
index 000000000..fef28322d
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Models/Ball.cs
@@ -0,0 +1,34 @@
+namespace Arkanoid.Base.Models;
+///
+/// The ball object in the Arkanoid game.
+///
+///
+public class Ball : IGameObject
+{
+ ///
+ /// Gets or sets the current world-space position of the ball in game units.
+ ///
+ ///
+ /// The position represents the center of the ball and is typically updated each frame
+ /// based on and elapsed time.
+ ///
+ public Vector2 Position { get; set; } = new(10, 10);
+
+ ///
+ /// Gets or sets the linear velocity of the ball in game units per second.
+ ///
+ ///
+ /// Positive X moves the ball to the right, and positive Y moves it upward, assuming a
+ /// conventional Cartesian coordinate system.
+ ///
+ public Vector2 Velocity { get; set; } = new(10, -10); // units per second
+
+ ///
+ /// Gets or sets the radius of the ball in game units.
+ ///
+ ///
+ /// The radius is used for collision detection and rendering. The ball's diameter is
+ /// 2 * Radius.
+ ///
+ public float Radius { get; set; } = 0.5f;
+}
diff --git a/CSharpBible/Games/Arkanoid.Base/Models/Brick.cs b/CSharpBible/Games/Arkanoid.Base/Models/Brick.cs
new file mode 100644
index 000000000..4dcd6b7a1
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Models/Brick.cs
@@ -0,0 +1,51 @@
+namespace Arkanoid.Base.Models;
+
+///
+/// Represents a single brick in the game arena, including its position, size, type,
+/// durability, and destruction state.
+///
+///
+/// A brick can be breakable or unbreakable depending on its . The
+/// value defines how many hits are required to destroy it.
+/// The property reflects whether the brick should be
+/// considered removed from play.
+///
+public class Brick : IGameObject
+{
+ ///
+ /// Gets or sets the top-left position of the brick in world coordinates.
+ ///
+ public Vector2 Position { get; set; } = new(0, 0);
+
+ ///
+ /// Gets or sets the width of the brick in world units.
+ ///
+ public float Width { get; set; } = 3f;
+
+ ///
+ /// Gets or sets the height of the brick in world units.
+ ///
+ public float Height { get; set; } = 1f;
+
+ ///
+ /// Gets or sets the brick's type, which determines its behavior (e.g., breakable or unbreakable).
+ ///
+ public BrickType Type { get; set; }
+
+ ///
+ /// Gets or sets the current hit points of the brick.
+ ///
+ ///
+ /// When this value reaches zero or below, the brick is considered destroyed
+ /// unless it is of type .
+ ///
+ public int HitPoints { get; set; } = 1;
+
+ ///
+ /// Gets a value indicating whether the brick is destroyed and should be removed from play.
+ ///
+ ///
+ /// Unbreakable bricks are never destroyed even if is zero or negative.
+ ///
+ public bool IsDestroyed => HitPoints <= 0 && Type != BrickType.Unbreakable;
+}
\ No newline at end of file
diff --git a/CSharpBible/Games/Arkanoid.Base/Models/BrickType.cs b/CSharpBible/Games/Arkanoid.Base/Models/BrickType.cs
new file mode 100644
index 000000000..f7f21c797
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Models/BrickType.cs
@@ -0,0 +1,23 @@
+namespace Arkanoid.Base.Models;
+
+///
+/// Defines the available brick categories used by the game logic, rendering, and collision handling
+/// to determine durability and behavior when hit by a ball.
+///
+public enum BrickType
+{
+ ///
+ /// A standard brick that is destroyed after a single hit.
+ ///
+ Normal,
+
+ ///
+ /// A reinforced brick that requires multiple hits to break.
+ ///
+ Strong,
+
+ ///
+ /// An indestructible brick that never breaks when hit.
+ ///
+ Unbreakable
+}
diff --git a/CSharpBible/Games/Arkanoid.Base/Models/GameState.cs b/CSharpBible/Games/Arkanoid.Base/Models/GameState.cs
new file mode 100644
index 000000000..0ee604c9f
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Models/GameState.cs
@@ -0,0 +1,83 @@
+namespace Arkanoid.Base.Models;
+
+///
+/// Represents the complete mutable state of an Arkanoid game session, including
+/// player control, ball physics, level geometry, scoring, and terminal flags.
+///
+///
+/// This type is intended to be the single source of truth for the game loop,
+/// allowing rendering and simulation to read and update a unified model.
+///
+public class GameState
+{
+ ///
+ /// Gets the player's paddle, which is responsible for reflecting the ball.
+ ///
+ ///
+ /// The paddle position and size are typically updated by player input and
+ /// used during collision checks with the ball.
+ ///
+ public Paddle Paddle { get; } = new();
+
+ ///
+ /// Gets the active ball instance used for movement, collisions, and scoring.
+ ///
+ ///
+ /// The ball's position and velocity are advanced each tick of the game loop
+ /// and are evaluated against the field bounds, paddle, and bricks.
+ ///
+ public Ball Ball { get; } = new();
+
+ ///
+ /// Gets the collection of bricks currently present in the playfield.
+ ///
+ ///
+ /// Bricks are typically removed when hit by the ball and may contribute
+ /// to the score or trigger power-ups in extended implementations.
+ ///
+ public List Bricks { get; } = new();
+
+ ///
+ /// Gets or sets the player's current score.
+ ///
+ ///
+ /// This value is generally increased when the ball destroys bricks or
+ /// completes objectives, and may be used for high score tracking.
+ ///
+ public int Score { get; set; }
+
+ ///
+ /// Gets or sets the number of remaining lives.
+ ///
+ ///
+ /// A life is typically lost when the ball exits the bottom boundary of the field.
+ /// When this value reaches zero, the game is considered over.
+ ///
+ public int Lives { get; set; } = 3;
+
+ ///
+ /// Gets or sets the width of the playable field in game units.
+ ///
+ ///
+ /// Used to clamp paddle movement and to reflect the ball from the left and right walls.
+ ///
+ public float FieldWidth { get; set; } = 80;
+
+ ///
+ /// Gets or sets the height of the playable field in game units.
+ ///
+ ///
+ /// Used to determine the top boundary for ball reflection and the bottom
+ /// boundary for life loss.
+ ///
+ public float FieldHeight { get; set; } = 40;
+
+ ///
+ /// Gets or sets a value indicating whether the game has ended.
+ ///
+ ///
+ /// This flag is typically set when reaches zero or when
+ /// all bricks have been cleared, depending on game rules.
+ ///
+ public bool IsGameOver { get; set; }
+}
diff --git a/CSharpBible/Games/Arkanoid.Base/Models/IGameObject.cs b/CSharpBible/Games/Arkanoid.Base/Models/IGameObject.cs
new file mode 100644
index 000000000..e9e51160e
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Models/IGameObject.cs
@@ -0,0 +1,14 @@
+namespace Arkanoid.Base.Models;
+///
+/// Interface IGameObject
+///
+public interface IGameObject
+{
+ ///
+ /// Gets or sets the position.
+ ///
+ ///
+ /// The position.
+ ///
+ Vector2 Position { get; set; }
+}
\ No newline at end of file
diff --git a/CSharpBible/Games/Arkanoid.Base/Models/Paddle.cs b/CSharpBible/Games/Arkanoid.Base/Models/Paddle.cs
new file mode 100644
index 000000000..60ee3568d
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Models/Paddle.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+
+namespace Arkanoid.Base.Models;
+
+///
+/// Represents the player-controlled paddle used to deflect the ball in the game.
+///
+///
+/// The paddle is modeled as a horizontal segment positioned in world coordinates.
+/// Movement is typically constrained to the horizontal axis by input handling elsewhere.
+///
+public class Paddle : IGameObject
+{
+ ///
+ /// Gets or sets the world-space position of the paddle's reference point.
+ ///
+ ///
+ /// The exact interpretation of the reference point (e.g., center or left edge)
+ /// is defined by the rendering and collision systems that consume this model.
+ ///
+ public Vector2 Position { get; set; } = new(10, 20);
+
+ ///
+ /// Gets or sets the paddle width expressed in world units.
+ ///
+ ///
+ /// This value is used for collision checks and rendering to determine the paddle's span.
+ ///
+ public float Width { get; set; } = 6f;
+
+ ///
+ /// Gets or sets the movement speed of the paddle in world units per second.
+ ///
+ ///
+ /// Higher values allow faster horizontal movement when input is applied.
+ ///
+ public float Speed { get; set; } = 25f; // units per second
+}
diff --git a/CSharpBible/Games/Arkanoid.Base/Models/Vector2.cs b/CSharpBible/Games/Arkanoid.Base/Models/Vector2.cs
new file mode 100644
index 000000000..278f9d64a
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Base/Models/Vector2.cs
@@ -0,0 +1,14 @@
+namespace Arkanoid.Base.Models;
+
+///
+/// Represents a two-dimensional vector with single-precision floating-point components,
+/// commonly used to describe positions, directions, or sizes in 2D space.
+///
+///
+/// The horizontal component of the vector, where positive values typically indicate movement or offset to the right.
+///
+///
+/// The vertical component of the vector, where positive values typically indicate movement or offset downward in screen space,
+/// depending on the coordinate system used by the game.
+///
+public record Vector2(float X, float Y);
\ No newline at end of file
diff --git a/CSharpBible/Games/Arkanoid.Cons/Arkanoid.Cons.csproj b/CSharpBible/Games/Arkanoid.Cons/Arkanoid.Cons.csproj
new file mode 100644
index 000000000..aeb6601b0
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Cons/Arkanoid.Cons.csproj
@@ -0,0 +1,31 @@
+
+
+
+ Exe
+ net8.0
+ enable
+ true
+ Arkanoid.Cons
+
+
+
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpBible/Games/Arkanoid.Cons/Program.cs b/CSharpBible/Games/Arkanoid.Cons/Program.cs
new file mode 100644
index 000000000..5138efed3
--- /dev/null
+++ b/CSharpBible/Games/Arkanoid.Cons/Program.cs
@@ -0,0 +1,154 @@
+using Arkanoid.Base;
+using BaseLib.Interfaces;
+using BaseLib.Models;
+using ConsoleDisplay.View;
+using ConsoleLib;
+using ConsoleLib.Interfaces;
+using System;
+using System.Threading;
+
+namespace Arkanoid.Cons
+{
+ internal class Program
+ {
+ static void Main(string[] args)
+ {
+ IConsole console = new ConsoleProxy();
+ console.CursorVisible = false;
+ var engine = new GameEngine();
+
+ var displayWidth = (int)engine.State.FieldWidth;
+ var displayHeight = (int)engine.State.FieldHeight;
+ var display = new Display(0, 0, displayWidth, displayHeight);
+
+ // ExtendedConsole initialisieren, um echte Key-/Maus-Events zu bekommen
+ var extConsole = new ExtendedConsole();
+
+ bool leftDown = false;
+ bool rightDown = false;
+ bool useMouse = true;
+
+ float paddleVelocity = 0f;
+ const float paddleAcceleration = 60f;
+ const float paddleFriction = 40f;
+
+ // Key-Events (KeyDown/KeyUp)
+ extConsole.KeyEvent += (s, e) =>
+ {
+ // Virtuelle Keycodes der Pfeiltasten
+ const ushort VK_LEFT = 0x25;
+ const ushort VK_RIGHT = 0x27;
+
+ if (e.usKeyCode == VK_LEFT)
+ {
+ leftDown = e.bKeyDown;
+ if (e.bKeyDown) rightDown = false;
+ e.Handled = true;
+ }
+ else if (e.usKeyCode == VK_RIGHT)
+ {
+ rightDown = e.bKeyDown;
+ if (e.bKeyDown) leftDown = false;
+ e.Handled = true;
+ }
+ else if (e.usKeyCode == (ushort)ConsoleKey.Escape && e.bKeyDown)
+ {
+ // ESC zum Beenden
+ extConsole.Stop();
+ engine.State.IsGameOver = true;
+ e.Handled = true;
+ }
+ };
+
+ // Maussteuerung: Paddle per Maus-X-Position bewegen
+ extConsole.MouseEvent += (s, me) =>
+ {
+ if (!useMouse) return;
+
+ if (me.MouseMoved || me.ButtonEvent)
+ {
+ var mouseX = me.MousePos.X;
+ // Paddle-Mittelpunkt an Maus-X ausrichten
+ var newX = mouseX - engine.State.Paddle.Width / 2f;
+ newX = Math.Clamp(newX, 0, engine.State.FieldWidth - engine.State.Paddle.Width);
+ engine.State.Paddle.Position = new Arkanoid.Base.Models.Vector2(newX, engine.State.Paddle.Position.Y);
+ me.Handled = true;
+ }
+ };
+
+ var lastTime = DateTime.UtcNow;
+
+ while (!engine.State.IsGameOver)
+ {
+ var now = DateTime.UtcNow;
+ var delta = (float)(now - lastTime).TotalSeconds;
+ if (delta <= 0f) delta = 0.001f;
+ lastTime = now;
+
+ // Tastatursteuerung (wenn Maus nicht benutzt wird)
+ if (!useMouse)
+ {
+ float moveDir = 0f;
+ if (leftDown && !rightDown) moveDir = -1f;
+ else if (rightDown && !leftDown) moveDir = 1f;
+ else
+ {
+ // Reibung, wenn keine Richtung gehalten wird
+ if (paddleVelocity > 0)
+ {
+ paddleVelocity -= paddleFriction * delta;
+ if (paddleVelocity < 0) paddleVelocity = 0;
+ }
+ else if (paddleVelocity < 0)
+ {
+ paddleVelocity += paddleFriction * delta;
+ if (paddleVelocity > 0) paddleVelocity = 0;
+ }
+ }
+
+ if (moveDir != 0f)
+ {
+ paddleVelocity += moveDir * paddleAcceleration * delta;
+ }
+
+ if (paddleVelocity != 0f)
+ {
+ var direction = Math.Sign(paddleVelocity);
+ engine.MovePaddle(direction, delta);
+ }
+ }
+
+ engine.Update(delta);
+
+ // render
+ display.Clear();
+
+ // paddle
+ for (int x = 0; x < (int)engine.State.Paddle.Width; x++)
+ {
+ display.PutPixel((int)(engine.State.Paddle.Position.X + x), (int)engine.State.Paddle.Position.Y, ConsoleColor.Green);
+ }
+
+ // ball
+ display.PutPixel((int)engine.State.Ball.Position.X, (int)engine.State.Ball.Position.Y, ConsoleColor.Yellow);
+
+ // bricks
+ foreach (var brick in engine.State.Bricks)
+ {
+ if (brick.IsDestroyed) continue;
+ for (int bx = 0; bx < (int)brick.Width; bx++)
+ {
+ display.PutPixel((int)(brick.Position.X + bx), (int)brick.Position.Y, ConsoleColor.Red);
+ }
+ }
+
+ display.Update();
+
+ Thread.Sleep(10);
+ }
+
+ console.ResetColor();
+ console.CursorVisible = true;
+ }
+ }
+}
diff --git a/CSharpBible/Games/Asteroids/Asteroids_net.csproj b/CSharpBible/Games/Asteroids/Asteroids_net.csproj
index b549cb479..373fabcf2 100644
--- a/CSharpBible/Games/Asteroids/Asteroids_net.csproj
+++ b/CSharpBible/Games/Asteroids/Asteroids_net.csproj
@@ -14,7 +14,7 @@
-
+
@@ -24,4 +24,7 @@
+
+
+
diff --git a/CSharpBible/Games/AsteroidsModernEngine.Tests/Abstractions/ColorTests.cs b/CSharpBible/Games/AsteroidsModernEngine.Tests/Abstractions/ColorTests.cs
index 54f409eac..a8c7196ad 100644
--- a/CSharpBible/Games/AsteroidsModernEngine.Tests/Abstractions/ColorTests.cs
+++ b/CSharpBible/Games/AsteroidsModernEngine.Tests/Abstractions/ColorTests.cs
@@ -1,4 +1,5 @@
using AsteroidsModern.Engine.Abstractions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/CSharpBible/Games/AsteroidsModernEngine.Tests/AsteroidsModernEngine.Tests.csproj b/CSharpBible/Games/AsteroidsModernEngine.Tests/AsteroidsModernEngine.Tests.csproj
index 69a877585..4cd9f96aa 100644
--- a/CSharpBible/Games/AsteroidsModernEngine.Tests/AsteroidsModernEngine.Tests.csproj
+++ b/CSharpBible/Games/AsteroidsModernEngine.Tests/AsteroidsModernEngine.Tests.csproj
@@ -1,16 +1,28 @@
-
+
+
- net8.0
+ net6.0;net7.0;net8.0
false
true
- enable
- enable
+
+
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
+
+
+
+
+
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -18,4 +30,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/AsteroidsModernEngine.Tests/Fakes.cs b/CSharpBible/Games/AsteroidsModernEngine.Tests/Fakes.cs
index 19b3211c7..637ce2867 100644
--- a/CSharpBible/Games/AsteroidsModernEngine.Tests/Fakes.cs
+++ b/CSharpBible/Games/AsteroidsModernEngine.Tests/Fakes.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
using System.Numerics;
using AsteroidsModern.Engine.Abstractions;
diff --git a/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/GameWorldTests.cs b/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/GameWorldTests.cs
index 1522c17bc..6e00b31e4 100644
--- a/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/GameWorldTests.cs
+++ b/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/GameWorldTests.cs
@@ -4,6 +4,8 @@
using AsteroidsModern.Engine.Model;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NSubstitute;
+using System.Collections.Generic;
+using System;
namespace AsteroidsModernEngine.Tests.Services;
@@ -40,8 +42,8 @@ public void Reset_ShouldPlaceShipCenterAndSpawnAsteroids()
{
var gw = CreateWorld(new(100, 80));
Assert.AreEqual(new Vector2(50, 40), gw.Ship.Position);
- Assert.IsTrue(gw.Asteroids.Count > 0);
- Assert.AreEqual(0, gw.Bullets.Count);
+ Assert.IsNotEmpty(gw.Asteroids);
+ Assert.IsEmpty(gw.Bullets);
}
[TestMethod]
@@ -54,7 +56,7 @@ public void Update_Thrust_IncreasesVelocityAndCallsSound()
var velBefore = gw.Ship.Velocity;
gw.Update(_input, _time, _sound);
- Assert.IsTrue(gw.Ship.Velocity.Length() > velBefore.Length());
+ Assert.IsGreaterThan(velBefore.Length(), gw.Ship.Velocity.Length());
_sound.Received().PlayThrust();
}
@@ -85,18 +87,18 @@ public void Fire_SpawnsBullet_WithCooldown()
// t=0, first shot
_time.TotalTime.Returns(0.0);
gw.Update(_input, _time, _sound);
- Assert.AreEqual(1, gw.Bullets.Count);
+ Assert.HasCount(1, gw.Bullets);
_sound.Received().PlayShoot();
// t=0.1, still cooldown, no extra bullet
_time.TotalTime.Returns(0.1);
gw.Update(_input, _time, _sound);
- Assert.AreEqual(1, gw.Bullets.Count);
+ Assert.HasCount(1, gw.Bullets);
// t=0.2, second shot
_time.TotalTime.Returns(0.2);
gw.Update(_input, _time, _sound);
- Assert.AreEqual(2, gw.Bullets.Count);
+ Assert.HasCount(2, gw.Bullets);
}
[TestMethod]
@@ -108,7 +110,7 @@ public void Bullets_Expire_ByLife()
_time.DeltaTime.Returns(0.016);
_time.TotalTime.Returns(0.0);
gw.Update(_input, _time, _sound);
- Assert.AreEqual(1, gw.Bullets.Count);
+ Assert.HasCount(1, gw.Bullets);
// Advance life beyond bullet life
for (int i = 0; i < 100; i++)
@@ -116,7 +118,7 @@ public void Bullets_Expire_ByLife()
_time.TotalTime.Returns(i * 0.05);
gw.Update(_input, _time, _sound);
}
- Assert.AreEqual(0, gw.Bullets.Count);
+ Assert.IsEmpty(gw.Bullets);
}
[TestMethod]
@@ -174,8 +176,8 @@ public void Collision_BulletWithAsteroid_SplitsOrRemoves()
gw.Update(_input, _time, _sound);
_sound.Received().PlayBang();
- Assert.IsTrue(gw.Asteroids.Count >= 1); // split into 2 if large, or removed if small
- Assert.AreEqual(0, gw.Bullets.Count);
+ Assert.IsGreaterThanOrEqualTo(1, gw.Asteroids.Count); // split into 2 if large, or removed if small
+ Assert.IsEmpty(gw.Bullets);
}
[TestMethod]
diff --git a/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/TitleScreenTests.cs b/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/TitleScreenTests.cs
index 84187639c..de0af92a8 100644
--- a/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/TitleScreenTests.cs
+++ b/CSharpBible/Games/AsteroidsModernEngine.Tests/Services/TitleScreenTests.cs
@@ -126,7 +126,7 @@ private static string GetScreenName(TitleScreen ts)
// Tests
- [DataTestMethod]
+ [TestMethod]
[DataRow(true)]
public void StartGame_FireOnTitle_RaisesEvent(bool _)
{
@@ -139,7 +139,7 @@ public void StartGame_FireOnTitle_RaisesEvent(bool _)
Assert.AreEqual(1, startEvents, "StartGameRequested sollte genau einmal ausgelst werden.");
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(true)]
public void StartGame_ThrustOnTitle_RaisesEvent(bool _)
{
@@ -152,7 +152,7 @@ public void StartGame_ThrustOnTitle_RaisesEvent(bool _)
Assert.AreEqual(1, startEvents, "StartGameRequested sollte genau einmal ausgelst werden.");
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(1, "Options")]
[DataRow(2, "Highscores")]
[DataRow(3, "Credits")]
@@ -168,7 +168,7 @@ public void Title_NavigateRight_Fire_OpensExpectedScreen(int stepsRight, string
Assert.AreEqual(expectedScreen, GetScreenName(ts));
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(true)]
public void Title_NavigateLeft_Wraps_ToCredits(bool _)
{
@@ -180,7 +180,7 @@ public void Title_NavigateLeft_Wraps_ToCredits(bool _)
Assert.AreEqual("Credits", GetScreenName(ts));
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(true, 4)]
[DataRow(false, 2)]
public void Options_ToggleSound_And_ChangeLives_OneStep(bool increase, int expectedLives)
@@ -210,7 +210,7 @@ public void Options_ToggleSound_And_ChangeLives_OneStep(bool increase, int expec
Assert.AreEqual(expectedLives, ts.StartLives);
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(20, 9)]
[DataRow(-20, 1)]
public void Options_StartLives_Clamped(int steps, int expectedLives)
@@ -238,7 +238,7 @@ public void Options_StartLives_Clamped(int steps, int expectedLives)
Assert.AreEqual(expectedLives, ts.StartLives);
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(50, 50)]
public void SetLastScore_UpdatesHighscore_And_ReturnsToTitle(int score, int expectedHigh)
{
@@ -254,7 +254,7 @@ public void SetLastScore_UpdatesHighscore_And_ReturnsToTitle(int score, int expe
Assert.AreEqual(expectedHigh, ts.HighScore);
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(true)]
public void SetLastScore_DoesNotLowerHighscore(bool _)
{
@@ -268,7 +268,7 @@ public void SetLastScore_DoesNotLowerHighscore(bool _)
Assert.AreEqual("Title", GetScreenName(ts));
}
- [DataTestMethod]
+ [TestMethod]
[DataRow(true)]
public void Options_EdgeDetection_NoRepeatOnHold(bool _)
{
diff --git a/CSharpBible/Games/AsteroidsModernEngine/AsteroidsModernEngine.csproj b/CSharpBible/Games/AsteroidsModernEngine/AsteroidsModernEngine.csproj
index 6acc27ca0..9794b1f17 100644
--- a/CSharpBible/Games/AsteroidsModernEngine/AsteroidsModernEngine.csproj
+++ b/CSharpBible/Games/AsteroidsModernEngine/AsteroidsModernEngine.csproj
@@ -1,22 +1,30 @@
-
+
+
- enable
- enable
- preview
+ net6.0;net7.0;net8.0
AsteroidsModernEngine
AsteroidsModern.Engine
-
-
- <_SdkVersion>$(NETCoreSdkVersion)
-
- net6.0
- $(TargetFrameworks);net7.0
- $(TargetFrameworks);net8.0
- $(TargetFrameworks);net9.0
+
+
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpBible/Games/AsteroidsModernEngine/Services/Interfaces/IGameWorld.cs b/CSharpBible/Games/AsteroidsModernEngine/Services/Interfaces/IGameWorld.cs
index 6ab677030..932cc5019 100644
--- a/CSharpBible/Games/AsteroidsModernEngine/Services/Interfaces/IGameWorld.cs
+++ b/CSharpBible/Games/AsteroidsModernEngine/Services/Interfaces/IGameWorld.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
using System.Numerics;
using AsteroidsModern.Engine.Abstractions;
using AsteroidsModern.Engine.Model.Interfaces;
diff --git a/CSharpBible/Games/AsteroidsModernEngineTests/Services/TitleScreenTests.cs b/CSharpBible/Games/AsteroidsModernEngineTests/Services/TitleScreenTests.cs
deleted file mode 100644
index 3638183a7..000000000
--- a/CSharpBible/Games/AsteroidsModernEngineTests/Services/TitleScreenTests.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AsteroidsModernEngineTests.Services
-{
- internal class TitleScreenTests
- {
- }
-}
diff --git a/CSharpBible/Games/AsteroidsModernUI/AsteroidsModernUI.csproj b/CSharpBible/Games/AsteroidsModernUI/AsteroidsModernUI.csproj
index ce4dcdcc0..0e04f0b85 100644
--- a/CSharpBible/Games/AsteroidsModernUI/AsteroidsModernUI.csproj
+++ b/CSharpBible/Games/AsteroidsModernUI/AsteroidsModernUI.csproj
@@ -10,13 +10,26 @@
AsteroidsModern.UI
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CSharpBible/Games/Asteroids_Base/Asteroids_Base.csproj b/CSharpBible/Games/Asteroids_Base/Asteroids_Base.csproj
index a373f81b1..0e590c436 100644
--- a/CSharpBible/Games/Asteroids_Base/Asteroids_Base.csproj
+++ b/CSharpBible/Games/Asteroids_Base/Asteroids_Base.csproj
@@ -1,7 +1,7 @@
- net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows
+ net6.0-windows;net7.0-windows;net8.0-windows
true
diff --git a/CSharpBible/Games/BoxFlight/BoxFlight.csproj b/CSharpBible/Games/BoxFlight/BoxFlight.csproj
index bf9bb1374..a9f1db40f 100644
--- a/CSharpBible/Games/BoxFlight/BoxFlight.csproj
+++ b/CSharpBible/Games/BoxFlight/BoxFlight.csproj
@@ -8,7 +8,11 @@
preview
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/BoxFlight/ViewModels/BoxFlightViewModel.cs b/CSharpBible/Games/BoxFlight/ViewModels/BoxFlightViewModel.cs
index c729f0bac..68b81a521 100644
--- a/CSharpBible/Games/BoxFlight/ViewModels/BoxFlightViewModel.cs
+++ b/CSharpBible/Games/BoxFlight/ViewModels/BoxFlightViewModel.cs
@@ -36,7 +36,7 @@ public BoxFlightViewModel(IGameWorld world)
{
_world = world;
- int width = 640, height = 360;
+ int width = 1280, height = 720;
Frame = new WriteableBitmap(width, height, 96, 96, PixelFormats.Bgra32, null);
MiniMap = new WriteableBitmap(400, 400, 96, 96, PixelFormats.Bgra32, null);
_render = new RenderEntry[width];
@@ -128,7 +128,7 @@ private void DrawRenderEntries(int bd2)
for (int x = 0; x < _render.Length; x++)
{
var re = _render[x];
- if (re.Height > re.Shad / 2)
+ if (re.Shad !=0 && re.Height > re.Shad / 2)
DrawVLine(buffer, stride, x, bd2 + re.Shad, bd2 + re.Shad / 2, Colors.Black);
int c1 = Math.Clamp(re.Light, 0, 255);
diff --git a/CSharpBible/Games/BoxFlight/World/GameWorld.cs b/CSharpBible/Games/BoxFlight/World/GameWorld.cs
index d93f45ce2..9b352a558 100644
--- a/CSharpBible/Games/BoxFlight/World/GameWorld.cs
+++ b/CSharpBible/Games/BoxFlight/World/GameWorld.cs
@@ -71,17 +71,15 @@ public void Step(int time, bool stereo, int scrollOffset, int focusX, int maxHei
var lCv2 = new Vector(lCv1.Y, -lCv1.X);
_cMove = _cPoint - cMoveOld;
+
_cPoint.X -= Math.Truncate(_cPoint.X / 400.0) * 400.0;
_cPoint.Y -= Math.Truncate(_cPoint.Y / 400.0) * 400.0;
- var sPnt = _cPoint;
- if (stereo) { _cPoint.X += _cView.Y * 0.4; _cPoint.Y += -_cView.X * 0.4; }
- else { _cPoint.X += -_cView.Y * 0.4; _cPoint.Y += _cView.X * 0.4; }
- sPnt.X += _cView.X; sPnt.Y += _cView.Y;
foreach (var o in Objects)
{
- o.Visible = false; o.Hit = false;
+ o.Visible = false;
+ o.Hit = false;
if (o.Size <= 0) continue;
var vp = new Vector(o.Pos.X, o.Pos.Y) + (Vector)_cPoint + new Vector(400, 400);
vp -= new Vector(Math.Floor(vp.X / 400.0) * 400.0, Math.Floor(vp.Y / 400.0) * 400.0);
@@ -95,20 +93,38 @@ public void Step(int time, bool stereo, int scrollOffset, int focusX, int maxHei
o.Visible = vis;
}
+
int half = render.Length / 2;
int hrc2 = half / 2;
int obj = -1;
- for (int j = 0; j < render.Length; j++)
+ Parallel.For (0,render.Length, (j)=>
{
+ var sPnt = _cPoint;
double s, c;
- if (j <= half) { s = Math.Sin((hrc2 - j) * 0.6 / hrc2); c = Math.Cos((hrc2 - j) * 0.6 / hrc2); }
- else { s = Math.Sin((-j + hrc2 * 3) * 0.6 / hrc2); c = Math.Cos((-j + hrc2 * 3) * 0.6 / hrc2); }
+ if (stereo)
+ if (j <= half)
+ {
+ sPnt.X -= _cView.Y * 0.4;
+ sPnt.Y += _cView.X * 0.4;
+ s = Math.Sin((hrc2 - j) * 0.6 / hrc2);
+ c = Math.Cos((hrc2 - j) * 0.6 / hrc2);
+ }
+ else
+ {
+ sPnt.X += _cView.Y * 0.4;
+ sPnt.Y -= _cView.X * 0.4;
+ s = Math.Sin((-j + hrc2 * 3) * 0.6 / hrc2);
+ c = Math.Cos((-j + hrc2 * 3) * 0.6 / hrc2);
+ }
+ else
+ {
+ s = Math.Sin((half - j) * 0.6 / half);
+ c = Math.Cos((half - j) * 0.6 / half);
+ }
var renDir = new Vector(_cView.X * c + _cView.Y * s, -_cView.X * s + _cView.Y * c);
render[j] = Trace(maxHeight, sPnt, obj, renDir, j == focusX);
- }
+ });
- if (stereo) { _cPoint.X += -_cView.Y * 0.8; _cPoint.Y += _cView.X * 0.8; }
- else { _cPoint.X += _cView.Y * 0.8; _cPoint.Y += -_cView.X * 0.8; }
cPoint2 = _cPoint2; cPoint3 = _cPoint3;
}
@@ -118,10 +134,10 @@ private RenderEntry Trace(int maxHeight, Point sPnt, int obj, Vector renDir, boo
float rDistQ, r;
double rDist; double rr = 0; int hObj = obj;
var entry = new RenderEntry { Oo1 = -1, Oo2 = -1, Light = 0, Height = 0, Light2 = 0, Height2 = 0, Shad = 0 };
- if (obj >= 0 && Objects[obj].HitTest(_cPoint, renDir, out rDistQ, out r) && rDistQ > 2 && rDistQ < 300) { rDist = rDistQ; rr = r; }
+ if (obj >= 0 && Objects[obj].HitTest(sPnt, renDir, out rDistQ, out r) && rDistQ > 2 && rDistQ < 300) { rDist = rDistQ; rr = r; }
else { obj = -1; rDist = 300.0; }
- ObjHit(_cPoint, renDir, -1, ref obj, ref rDist, ref rr);
+ ObjHit(sPnt, renDir, -1, ref obj, ref rDist, ref rr);
if (obj >= 0)
{
var o = Objects[obj];
@@ -155,7 +171,8 @@ private RenderEntry Trace(int maxHeight, Point sPnt, int obj, Vector renDir, boo
int lsobj = hObj; double shDist = 300.0; double shRr = 0.0;
ObjHit(sPnt, renDir, -1, ref lsobj, ref shDist, ref shRr);
- if (lsobj >= 0) entry.Shad = (int)(maxHeight / (shDist + 1.0)); else entry.Shad = 0;
+ // if (lsobj >= 0) entry.Shad = (int)(maxHeight / (shDist + 1.0)); else
+ entry.Shad = 0;
return entry;
}
diff --git a/CSharpBible/Games/CONTRIBUTING.md b/CSharpBible/Games/CONTRIBUTING.md
new file mode 100644
index 000000000..eb11d2db4
--- /dev/null
+++ b/CSharpBible/Games/CONTRIBUTING.md
@@ -0,0 +1,33 @@
+# Contributing Guidelines
+
+## Coding Standards & Patterns
+
+### Architecture
+- **MVVM (Model-View-ViewModel):** We strictly follow the MVVM pattern for UI applications.
+- **Dependency Injection (DI):** Use DI for loose coupling and testability.
+- **File Structure:** Adhere to the "One Class per File" rule.
+- **Strict Separation of Concerns:** Each class should have a single responsibility.
+- **Strict Separation of Code and generated Stuff:** The code you write should be separate from any generated code.
+- **I18n/L10n:** All user-facing strings must be localized.
+- Files should be encoded in UTF-8 with BOM.
+- Prefer short methods (max about. 20 lines). If a method exceeds this, consider refactoring.
+- Try to achieve high code-coverage with unit tests.
+- Detailed XML documentation is required for all public members.
+ - Use ``, ``, and `` tags where appropriate.
+ - Also document Methods, longer than 5 lines, with remarks about their behavior.
+
+
+### Testing & TDD
+- **Test-Driven Development (TDD):** Tests must be created *before* the implementation.
+- **Frameworks:**
+ - **Testing Framework:** MSTestv4
+ - **Mocking:** NSubstitute
+ - **MVVM Support:** CommunityToolkit.Mvvm
+
+### Build Configuration
+- **Warnings as Errors:** `TreatWarningsAsErrors` is enabled. Ensure your code compiles without warnings.
+
+## Workflow
+1. Create a failing test (Red).
+2. Implement the minimal code to pass the test (Green).
+3. Refactor.
diff --git a/CSharpBible/Games/CreateCards/CreateCards.csproj b/CSharpBible/Games/CreateCards/CreateCards.csproj
index 90887b382..b7fa7a8c0 100644
--- a/CSharpBible/Games/CreateCards/CreateCards.csproj
+++ b/CSharpBible/Games/CreateCards/CreateCards.csproj
@@ -2,12 +2,21 @@
Exe
- net6.0;net7.0;net8.0;net9.0
+ net6.0;net7.0;net8.0
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
+
+
+
-
+
diff --git a/CSharpBible/Games/CreateCards/Model/Card.cs b/CSharpBible/Games/CreateCards/Model/Card.cs
index 47f853d43..d70a7a245 100644
--- a/CSharpBible/Games/CreateCards/Model/Card.cs
+++ b/CSharpBible/Games/CreateCards/Model/Card.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.Drawing.Drawing2D;
using System.Drawing;
@@ -11,6 +12,23 @@ public enum CardValues
public class Card
{
+ // Helper methods for color manipulation (replacing ControlPaint)
+ private static Color DarkenColor(Color color, float factor)
+ {
+ int r = (int)(color.R * (1 - factor));
+ int g = (int)(color.G * (1 - factor));
+ int b = (int)(color.B * (1 - factor));
+ return Color.FromArgb(color.A, System.Math.Max(0, r), System.Math.Max(0, g), System.Math.Max(0, b));
+ }
+
+ private static Color LightenColor(Color color, float factor)
+ {
+ int r = (int)(color.R + (255 - color.R) * factor);
+ int g = (int)(color.G + (255 - color.G) * factor);
+ int b = (int)(color.B + (255 - color.B) * factor);
+ return Color.FromArgb(color.A, System.Math.Min(255, r), System.Math.Min(255, g), System.Math.Min(255, b));
+ }
+
public static Dictionary DrawDef = new() {
{ CardValues.Ace ,new("A",0.8){
PntSuits=new[]{new PointF(0.5f,0.5f) } } },
@@ -40,18 +58,14 @@ public class Card
new PointF(0.3f, 0.375f), new PointF(0.7f, 0.375f), new PointF(0.3f, 0.625f), new PointF(0.7f, 0.625f),
new PointF(0.5f, 0.3125f),new PointF(0.5f, 0.6825f) } } },
{ CardValues.Jack ,new("J"){
- PntSuits=new[]{ new PointF(0.7f, 0.25f), new PointF(0.7f, 0.35f), new PointF(0.7f, 0.45f), new PointF(0.7f, 0.55f),new PointF(0.7f, 0.65f),
- new PointF(0.6f, 0.75f),new PointF(0.5f, 0.75f),new PointF(0.4f, 0.75f), new PointF(0.3f, 0.65f) } } },
+ CustomDraw = (gfx, rect, color, suit) => DrawJack(gfx, rect, color, suit)
+ }},
{ CardValues.Queen ,new("Q"){
- PntSuits=new[]{ new PointF(0.3f, 0.35f), new PointF(0.3f, 0.45f), new PointF(0.3f, 0.55f),new PointF(0.3f, 0.65f),
- new PointF(0.7f, 0.35f), new PointF(0.7f, 0.45f), new PointF(0.7f, 0.55f), new PointF(0.7f, 0.75f),
- new PointF(0.4f, 0.3f), new PointF(0.5f, 0.25f),new PointF(0.6f, 0.3f),
- new PointF(0.4f, 0.7f), new PointF(0.5f, 0.75f),new PointF(0.6f, 0.65f),
- new PointF(0.5f, 0.55f) } } },
+ CustomDraw = (gfx, rect, color, suit) => DrawQueen(gfx, rect, color, suit)
+ }},
{ CardValues.King ,new("K"){
- PntSuits=new[]{ new PointF(0.3f, 0.25f), new PointF(0.3f, 0.35f), new PointF(0.3f, 0.45f), new PointF(0.3f, 0.55f),new PointF(0.3f, 0.75f),
- new PointF(0.3f, 0.65f), new PointF(0.4f, 0.55f), new PointF(0.5f, 0.45f), new PointF(0.6f, 0.35f), new PointF(0.7f, 0.25f),
- new PointF(0.566667f, 0.55f), new PointF(0.63333f, 0.65f), new PointF(0.7f, 0.75f) } } },
+ CustomDraw = (gfx, rect, color, suit) => DrawKing(gfx, rect, color, suit)
+ }},
};
public string Suit { get; set; }
public CardValues Value { get; set; }
@@ -86,13 +100,25 @@ public void DrawCard(int width, int height, Graphics g)
if (DrawDef.TryGetValue(Value, out var drawDef))
{
- foreach (var pnt in drawDef.PntVals)
- DrawText(rect, drawDef.PrintValue, drawDef.ValSize, pnt, g);
- foreach (var pnt in drawDef.PntSVals)
- DrawText(rect, Suit, drawDef.ValSize, pnt, g);
- foreach (var pnt in drawDef.PntSuits)
- DrawText(rect, Suit, drawDef.SuitSize, pnt, g);
+ if (drawDef.CustomDraw != null)
+ {
+ // Face card or custom layout
+ drawDef.CustomDraw(g, rect, Color, Suit);
+ foreach (var pnt in drawDef.PntVals)
+ DrawText(rect, drawDef.PrintValue, drawDef.ValSize, pnt, g);
+ foreach (var pnt in drawDef.PntSVals)
+ DrawText(rect, Suit, drawDef.ValSize, pnt, g);
+ }
+ else
+ {
+ foreach (var pnt in drawDef.PntVals)
+ DrawText(rect, drawDef.PrintValue, drawDef.ValSize, pnt, g);
+ foreach (var pnt in drawDef.PntSVals)
+ DrawText(rect, Suit, drawDef.ValSize, pnt, g);
+ foreach (var pnt in drawDef.PntSuits)
+ DrawText(rect, Suit, drawDef.SuitSize, pnt, g);
+ }
}
void DrawText(Rectangle rect, string sP, double fSize, PointF fpOffs, Graphics g)
@@ -108,6 +134,1325 @@ void DrawText(Rectangle rect, string sP, double fSize, PointF fpOffs, Graphics g
}
}
+ private static void DrawJack(Graphics g, Rectangle rect, Color color, string suit)
+ {
+ // French-style Jack (Valet) - elaborate mirrored double-headed design
+ float penW = System.Math.Max(1f, rect.Width / 120f);
+ using var outlinePen = new Pen(Color.FromArgb(50, 30, 15), penW);
+ using var thinPen = new Pen(Color.FromArgb(50, 30, 15), penW * 0.5f);
+ using var shadowPen = new Pen(Color.FromArgb(80, 0, 0, 0), penW * 0.4f);
+
+ // Colors - rich palette
+ Color cream = Color.FromArgb(255, 252, 245);
+ Color gold = Color.FromArgb(212, 175, 55);
+ Color darkGold = Color.FromArgb(170, 135, 30);
+ Color lightGold = Color.FromArgb(255, 223, 120);
+ Color skinTone = Color.FromArgb(255, 220, 185);
+ Color skinShadow = Color.FromArgb(235, 190, 150);
+ Color hairColor = Color.FromArgb(120, 75, 35);
+ Color hairHighlight = Color.FromArgb(160, 110, 60);
+
+ // Draw decorative frame with gradient effect
+ RectangleF frameRect = new RectangleF(rect.X + rect.Width * 0.10f, rect.Y + rect.Height * 0.06f,
+ rect.Width * 0.80f, rect.Height * 0.88f);
+
+ // Ornate frame background with subtle pattern
+ using var frameBrush = new LinearGradientBrush(frameRect, cream, Color.FromArgb(250, 245, 235), 45f);
+ g.FillRectangle(frameBrush, frameRect);
+
+ // Draw diagonal pattern in frame
+ using var patternPen = new Pen(Color.FromArgb(15, color), penW * 0.3f);
+ for (float i = frameRect.X; i < frameRect.Right + frameRect.Height; i += rect.Width * 0.04f)
+ {
+ g.DrawLine(patternPen, i, frameRect.Y, i - frameRect.Height * 0.3f, frameRect.Y + frameRect.Height * 0.3f);
+ }
+
+ // Inner decorative border - double line with gold
+ float borderInset = rect.Width * 0.02f;
+ RectangleF innerFrame = RectangleF.Inflate(frameRect, -borderInset * 2, -borderInset * 2);
+ using var borderPen = new Pen(color, penW * 1.2f);
+ using var goldBorderPen = new Pen(gold, penW * 0.6f);
+ g.DrawRectangle(borderPen, innerFrame.X, innerFrame.Y, innerFrame.Width, innerFrame.Height);
+ g.DrawRectangle(goldBorderPen, innerFrame.X - penW, innerFrame.Y - penW, innerFrame.Width + penW * 2, innerFrame.Height + penW * 2);
+
+ // Corner ornaments
+ DrawCornerOrnament(g, innerFrame.X, innerFrame.Y, rect.Width * 0.08f, gold, outlinePen, false, false);
+ DrawCornerOrnament(g, innerFrame.Right, innerFrame.Y, rect.Width * 0.08f, gold, outlinePen, true, false);
+ DrawCornerOrnament(g, innerFrame.X, innerFrame.Bottom, rect.Width * 0.08f, gold, outlinePen, false, true);
+ DrawCornerOrnament(g, innerFrame.Right, innerFrame.Bottom, rect.Width * 0.08f, gold, outlinePen, true, true);
+
+ // Draw upper half figure
+ DrawJackHalf(g, innerFrame, color, suit, false, outlinePen, thinPen, shadowPen,
+ skinTone, skinShadow, hairColor, hairHighlight, gold, darkGold, lightGold);
+
+ // Draw lower half figure (mirrored)
+ DrawJackHalf(g, innerFrame, color, suit, true, outlinePen, thinPen, shadowPen,
+ skinTone, skinShadow, hairColor, hairHighlight, gold, darkGold, lightGold);
+
+ // Center medallion with suit symbol
+ float centerY = innerFrame.Y + innerFrame.Height / 2;
+ float medalSize = innerFrame.Width * 0.22f;
+ RectangleF medalRect = new RectangleF(innerFrame.X + innerFrame.Width / 2 - medalSize / 2,
+ centerY - medalSize / 2, medalSize, medalSize);
+
+ // Medallion with gradient
+ using var medalGradient = new LinearGradientBrush(medalRect, Color.White, Color.FromArgb(240, 235, 220), 135f);
+ g.FillEllipse(medalGradient, medalRect);
+ using var medalBorderPen = new Pen(gold, penW * 1.5f);
+ g.DrawEllipse(medalBorderPen, medalRect);
+ g.DrawEllipse(outlinePen, RectangleF.Inflate(medalRect, penW, penW));
+
+ // Suit symbol in center
+ using var suitFont = new Font("Segoe UI Symbol", medalSize * 0.5f, FontStyle.Bold);
+ using var suitBrush = new SolidBrush(color);
+ StringFormat sf = new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
+ g.DrawString(suit, suitFont, suitBrush, medalRect, sf);
+ }
+
+ private static void DrawCornerOrnament(Graphics g, float x, float y, float size, Color gold, Pen outlinePen, bool flipH, bool flipV)
+ {
+ var state = g.Save();
+ g.TranslateTransform(x, y);
+ if (flipH) g.ScaleTransform(-1, 1);
+ if (flipV) g.ScaleTransform(1, -1);
+
+ using var goldBrush = new SolidBrush(gold);
+ // Fleur-de-lis style corner
+ PointF[] ornament = {
+ new PointF(0, 0),
+ new PointF(size * 0.3f, 0),
+ new PointF(size * 0.15f, size * 0.15f),
+ new PointF(size * 0.4f, size * 0.1f),
+ new PointF(size * 0.2f, size * 0.3f),
+ new PointF(size * 0.1f, size * 0.4f),
+ new PointF(size * 0.15f, size * 0.15f),
+ new PointF(0, size * 0.3f)
+ };
+ g.FillPolygon(goldBrush, ornament);
+ g.DrawPolygon(outlinePen, ornament);
+
+ g.Restore(state);
+ }
+
+ private static void DrawJackHalf(Graphics g, RectangleF rect, Color color, string suit, bool mirrored,
+ Pen outlinePen, Pen thinPen, Pen shadowPen, Color skinTone, Color skinShadow,
+ Color hairColor, Color hairHighlight, Color gold, Color darkGold, Color lightGold)
+ {
+ var state = g.Save();
+
+ if (mirrored)
+ {
+ g.TranslateTransform(rect.X + rect.Width / 2, rect.Y + rect.Height / 2);
+ g.RotateTransform(180);
+ g.TranslateTransform(-(rect.X + rect.Width / 2), -(rect.Y + rect.Height / 2));
+ }
+
+ float halfH = rect.Height * 0.47f;
+ RectangleF half = new RectangleF(rect.X, rect.Y, rect.Width, halfH);
+
+ // Shadow layer for depth
+ using var shadowBrush = new SolidBrush(Color.FromArgb(30, 0, 0, 0));
+
+ // Tunic with gradient and folds
+ RectangleF tunicRect = new RectangleF(half.X + half.Width * 0.18f, half.Y + half.Height * 0.4f,
+ half.Width * 0.64f, half.Height * 0.6f);
+ using var tunicGradient = new LinearGradientBrush(tunicRect,
+ Color.FromArgb(255, color), Color.FromArgb(200, DarkenColor(color, 0.2f)), 0f);
+
+ PointF[] tunic = {
+ new PointF(half.X + half.Width * 0.22f, half.Bottom),
+ new PointF(half.X + half.Width * 0.18f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.28f, half.Y + half.Height * 0.46f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.42f),
+ new PointF(half.X + half.Width * 0.72f, half.Y + half.Height * 0.46f),
+ new PointF(half.X + half.Width * 0.82f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.78f, half.Bottom)
+ };
+ g.FillPolygon(tunicGradient, tunic);
+ g.DrawPolygon(outlinePen, tunic);
+
+ // Tunic folds/creases for texture
+ using var foldPen = new Pen(Color.FromArgb(60, 0, 0, 0), thinPen.Width);
+ using var highlightPen = new Pen(Color.FromArgb(80, 255, 255, 255), thinPen.Width);
+ g.DrawLine(foldPen, half.X + half.Width * 0.35f, half.Y + half.Height * 0.55f,
+ half.X + half.Width * 0.32f, half.Bottom);
+ g.DrawLine(highlightPen, half.X + half.Width * 0.37f, half.Y + half.Height * 0.55f,
+ half.X + half.Width * 0.35f, half.Bottom);
+ g.DrawLine(foldPen, half.X + half.Width * 0.65f, half.Y + half.Height * 0.55f,
+ half.X + half.Width * 0.68f, half.Bottom);
+
+ // Decorative trim on tunic
+ using var trimPen = new Pen(gold, outlinePen.Width * 1.2f);
+ g.DrawLine(trimPen, half.X + half.Width * 0.5f, half.Y + half.Height * 0.45f,
+ half.X + half.Width * 0.5f, half.Bottom);
+
+ // Elaborate collar with lace detail
+ using var collarBrush = new SolidBrush(Color.White);
+ PointF[] collar = {
+ new PointF(half.X + half.Width * 0.35f, half.Y + half.Height * 0.46f),
+ new PointF(half.X + half.Width * 0.42f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.55f),
+ new PointF(half.X + half.Width * 0.58f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.65f, half.Y + half.Height * 0.46f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.42f)
+ };
+ g.FillPolygon(collarBrush, collar);
+ g.DrawPolygon(thinPen, collar);
+
+ // Lace pattern on collar
+ using var lacePen = new Pen(Color.FromArgb(100, 150, 150, 150), thinPen.Width * 0.5f);
+ for (float lx = half.X + half.Width * 0.4f; lx < half.X + half.Width * 0.6f; lx += half.Width * 0.03f)
+ {
+ g.DrawLine(lacePen, lx, half.Y + half.Height * 0.48f, lx + half.Width * 0.015f, half.Y + half.Height * 0.52f);
+ }
+
+ // Head with shading
+ float headW = half.Width * 0.24f;
+ float headH = half.Height * 0.34f;
+ RectangleF headRect = new RectangleF(half.X + half.Width * 0.5f - headW / 2,
+ half.Y + half.Height * 0.10f, headW, headH);
+
+ // Hair with texture
+ using var hairGradient = new LinearGradientBrush(
+ new RectangleF(headRect.X - headW * 0.15f, headRect.Y - headH * 0.1f, headW * 1.3f, headH * 0.6f),
+ hairHighlight, hairColor, 45f);
+ RectangleF hairRect = new RectangleF(headRect.X - headW * 0.12f, headRect.Y - headH * 0.08f,
+ headW * 1.24f, headH * 0.55f);
+ g.FillEllipse(hairGradient, hairRect);
+
+ // Hair strands
+ using var strandPen = new Pen(Color.FromArgb(80, 60, 40, 20), thinPen.Width * 0.6f);
+ for (int i = 0; i < 5; i++)
+ {
+ float sx = headRect.X + headW * (0.1f + i * 0.2f);
+ g.DrawBezier(strandPen,
+ new PointF(sx, headRect.Y),
+ new PointF(sx - headW * 0.05f, headRect.Y + headH * 0.1f),
+ new PointF(sx + headW * 0.05f, headRect.Y + headH * 0.2f),
+ new PointF(sx, headRect.Y + headH * 0.3f));
+ }
+
+ // Face with gradient for 3D effect
+ using var faceGradient = new LinearGradientBrush(headRect, skinTone, skinShadow, 120f);
+ g.FillEllipse(faceGradient, headRect);
+ g.DrawEllipse(outlinePen, headRect);
+
+ // Cheek blush
+ using var blushBrush = new SolidBrush(Color.FromArgb(40, 255, 150, 150));
+ g.FillEllipse(blushBrush, headRect.X + headW * 0.6f, headRect.Y + headH * 0.45f, headW * 0.25f, headH * 0.15f);
+
+ // Elaborate beret/cap with feather
+ RectangleF capRect = new RectangleF(headRect.X - headW * 0.2f, headRect.Y - headH * 0.35f, headW * 1.6f, headH * 0.6f);
+ using var capGradient = new LinearGradientBrush(capRect,
+ LightenColor(color, 0.2f), color, 90f);
+ PointF[] cap = {
+ new PointF(headRect.X - headW * 0.18f, headRect.Y + headH * 0.18f),
+ new PointF(headRect.X + headW * 0.1f, headRect.Y - headH * 0.15f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y - headH * 0.28f),
+ new PointF(headRect.Right + headW * 0.35f, headRect.Y - headH * 0.12f),
+ new PointF(headRect.Right + headW * 0.2f, headRect.Y + headH * 0.22f)
+ };
+ g.FillPolygon(capGradient, cap);
+ g.DrawPolygon(outlinePen, cap);
+
+ // Cap band
+ using var bandBrush = new SolidBrush(gold);
+ g.FillRectangle(bandBrush, headRect.X - headW * 0.1f, headRect.Y + headH * 0.08f, headW * 1.2f, headH * 0.08f);
+
+ // Jewel on cap
+ using var jewelBrush = new SolidBrush(Color.FromArgb(220, 20, 60));
+ float jewelSize = headW * 0.12f;
+ g.FillEllipse(jewelBrush, headRect.X + headW * 0.4f, headRect.Y + headH * 0.02f, jewelSize, jewelSize);
+ g.DrawEllipse(thinPen, headRect.X + headW * 0.4f, headRect.Y + headH * 0.02f, jewelSize, jewelSize);
+
+ // Elaborate feather with multiple strands
+ using var featherGradient = new LinearGradientBrush(
+ new RectangleF(headRect.Right, headRect.Y - headH * 0.7f, headW * 0.8f, headH * 0.8f),
+ lightGold, gold, 45f);
+ using var featherPen = new Pen(featherGradient, outlinePen.Width * 2f);
+
+ // Main feather curve
+ g.DrawBezier(featherPen,
+ new PointF(headRect.Right + headW * 0.25f, headRect.Y - headH * 0.05f),
+ new PointF(headRect.Right + headW * 0.6f, headRect.Y - headH * 0.35f),
+ new PointF(headRect.Right + headW * 0.5f, headRect.Y - headH * 0.55f),
+ new PointF(headRect.Right + headW * 0.15f, headRect.Y - headH * 0.45f));
+
+ // Feather barbs
+ using var barbPen = new Pen(gold, thinPen.Width * 0.8f);
+ for (int i = 0; i < 6; i++)
+ {
+ float t = i / 6f;
+ float bx = headRect.Right + headW * (0.25f + t * 0.25f);
+ float by = headRect.Y - headH * (0.05f + t * 0.35f);
+ g.DrawLine(barbPen, bx, by, bx + headW * 0.15f, by - headH * 0.08f);
+ g.DrawLine(barbPen, bx, by, bx - headW * 0.1f, by - headH * 0.12f);
+ }
+
+ // Eyes - two symmetric eyes (front view like Queen and King)
+ float eyeW = headW * 0.12f;
+ float eyeH = headH * 0.07f;
+ float eyeY = headRect.Y + headH * 0.36f;
+
+ // Left eye
+ float leftEyeX = headRect.X + headW * 0.22f;
+ DrawJackEye(g, leftEyeX, eyeY, eyeW, eyeH, thinPen);
+
+ // Right eye
+ float rightEyeX = headRect.X + headW * 0.66f;
+ DrawJackEye(g, rightEyeX, eyeY, eyeW, eyeH, thinPen);
+
+ // Eyebrows
+ using var browPen = new Pen(hairColor, thinPen.Width * 1.2f);
+ g.DrawArc(browPen, leftEyeX - eyeW * 0.1f, eyeY - eyeH * 1.0f, eyeW * 1.2f, eyeH, 200, 70);
+ g.DrawArc(browPen, rightEyeX - eyeW * 0.1f, eyeY - eyeH * 1.0f, eyeW * 1.2f, eyeH, 250, 70);
+
+ // Nose (centered)
+ g.DrawBezier(thinPen,
+ new PointF(headRect.X + headW * 0.48f, headRect.Y + headH * 0.4f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.48f),
+ new PointF(headRect.X + headW * 0.52f, headRect.Y + headH * 0.54f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.56f));
+
+ // Mouth (centered)
+ using var lipPen = new Pen(Color.FromArgb(180, 100, 90), thinPen.Width);
+ g.DrawArc(lipPen, headRect.X + headW * 0.4f, headRect.Y + headH * 0.62f, headW * 0.2f, headH * 0.1f, 0, 180);
+
+ // Halberd with detailed blade
+ float shaftX = half.X + half.Width * 0.10f;
+
+ // Shaft with wood grain
+ RectangleF shaftRect = new RectangleF(shaftX, half.Y + half.Height * 0.08f, half.Width * 0.028f, half.Height * 0.88f);
+ using var shaftGradient = new LinearGradientBrush(shaftRect,
+ Color.FromArgb(160, 110, 60), Color.FromArgb(100, 65, 30), 0f);
+ g.FillRectangle(shaftGradient, shaftRect);
+ g.DrawRectangle(outlinePen, shaftRect.X, shaftRect.Y, shaftRect.Width, shaftRect.Height);
+
+ // Wood grain lines
+ using var grainPen = new Pen(Color.FromArgb(50, 60, 40, 20), thinPen.Width * 0.3f);
+ for (float gy = shaftRect.Y; gy < shaftRect.Bottom; gy += half.Height * 0.05f)
+ {
+ g.DrawLine(grainPen, shaftRect.X + shaftRect.Width * 0.2f, gy,
+ shaftRect.X + shaftRect.Width * 0.8f, gy + half.Height * 0.02f);
+ }
+
+ // Elaborate blade with engraving
+ using var bladeGradient = new LinearGradientBrush(
+ new RectangleF(shaftX, half.Y, half.Width * 0.15f, half.Height * 0.3f),
+ Color.FromArgb(220, 220, 230), Color.FromArgb(160, 165, 175), 90f);
+ PointF[] blade = {
+ new PointF(shaftX + half.Width * 0.028f, half.Y + half.Height * 0.12f),
+ new PointF(shaftX + half.Width * 0.08f, half.Y + half.Height * 0.04f),
+ new PointF(shaftX + half.Width * 0.14f, half.Y + half.Height * 0.06f),
+ new PointF(shaftX + half.Width * 0.12f, half.Y + half.Height * 0.18f),
+ new PointF(shaftX + half.Width * 0.08f, half.Y + half.Height * 0.28f),
+ new PointF(shaftX + half.Width * 0.028f, half.Y + half.Height * 0.24f)
+ };
+ g.FillPolygon(bladeGradient, blade);
+ g.DrawPolygon(outlinePen, blade);
+
+ // Blade edge highlight
+ using var edgePen = new Pen(Color.FromArgb(150, 255, 255, 255), thinPen.Width * 0.5f);
+ g.DrawLine(edgePen, blade[1], blade[2]);
+
+ // Axe spike
+ PointF[] spike = {
+ new PointF(shaftX + half.Width * 0.014f, half.Y + half.Height * 0.08f),
+ new PointF(shaftX + half.Width * 0.014f, half.Y),
+ new PointF(shaftX + half.Width * 0.028f, half.Y + half.Height * 0.08f)
+ };
+ g.FillPolygon(bladeGradient, spike);
+ g.DrawPolygon(outlinePen, spike);
+
+ g.Restore(state);
+ }
+
+ private static void DrawQueen(Graphics g, Rectangle rect, Color color, string suit)
+ {
+ // French-style Queen (Dame) - elaborate mirrored double-headed design
+ float penW = System.Math.Max(1f, rect.Width / 120f);
+ using var outlinePen = new Pen(Color.FromArgb(50, 30, 15), penW);
+ using var thinPen = new Pen(Color.FromArgb(50, 30, 15), penW * 0.5f);
+
+ // Colors - elegant palette
+ Color cream = Color.FromArgb(255, 252, 245);
+ Color gold = Color.FromArgb(212, 175, 55);
+ Color lightGold = Color.FromArgb(255, 223, 120);
+ Color skinTone = Color.FromArgb(255, 225, 200);
+ Color skinShadow = Color.FromArgb(240, 200, 175);
+ Color hairColor = Color.FromArgb(180, 140, 60);
+ Color hairHighlight = Color.FromArgb(220, 190, 100);
+
+ // Draw decorative frame with gradient
+ RectangleF frameRect = new RectangleF(rect.X + rect.Width * 0.10f, rect.Y + rect.Height * 0.06f,
+ rect.Width * 0.80f, rect.Height * 0.88f);
+ using var frameBrush = new LinearGradientBrush(frameRect, cream, Color.FromArgb(250, 245, 235), 45f);
+ g.FillRectangle(frameBrush, frameRect);
+
+ // Elegant floral pattern in background
+ using var patternPen = new Pen(Color.FromArgb(12, color), penW * 0.4f);
+ for (float px = frameRect.X; px < frameRect.Right; px += rect.Width * 0.06f)
+ {
+ for (float py = frameRect.Y; py < frameRect.Bottom; py += rect.Height * 0.05f)
+ {
+ g.DrawEllipse(patternPen, px, py, rect.Width * 0.02f, rect.Width * 0.02f);
+ }
+ }
+
+ // Inner decorative border - double line
+ float borderInset = rect.Width * 0.02f;
+ RectangleF innerFrame = RectangleF.Inflate(frameRect, -borderInset * 2, -borderInset * 2);
+ using var borderPen = new Pen(color, penW * 1.2f);
+ using var goldBorderPen = new Pen(gold, penW * 0.6f);
+ g.DrawRectangle(borderPen, innerFrame.X, innerFrame.Y, innerFrame.Width, innerFrame.Height);
+ g.DrawRectangle(goldBorderPen, innerFrame.X - penW, innerFrame.Y - penW, innerFrame.Width + penW * 2, innerFrame.Height + penW * 2);
+
+ // Floral corner ornaments
+ DrawFloralCorner(g, innerFrame.X, innerFrame.Y, rect.Width * 0.1f, gold, color, outlinePen, false, false);
+ DrawFloralCorner(g, innerFrame.Right, innerFrame.Y, rect.Width * 0.1f, gold, color, outlinePen, true, false);
+ DrawFloralCorner(g, innerFrame.X, innerFrame.Bottom, rect.Width * 0.1f, gold, color, outlinePen, false, true);
+ DrawFloralCorner(g, innerFrame.Right, innerFrame.Bottom, rect.Width * 0.1f, gold, color, outlinePen, true, true);
+
+ // Draw upper half figure
+ DrawQueenHalf(g, innerFrame, color, suit, false, outlinePen, thinPen, skinTone, skinShadow, hairColor, hairHighlight, gold, lightGold);
+
+ // Draw lower half figure (mirrored)
+ DrawQueenHalf(g, innerFrame, color, suit, true, outlinePen, thinPen, skinTone, skinShadow, hairColor, hairHighlight, gold, lightGold);
+
+ // Center medallion with suit symbol
+ float centerY = innerFrame.Y + innerFrame.Height / 2;
+ float medalSize = innerFrame.Width * 0.24f;
+ RectangleF medalRect = new RectangleF(innerFrame.X + innerFrame.Width / 2 - medalSize / 2,
+ centerY - medalSize / 2, medalSize, medalSize);
+
+ // Ornate medallion
+ using var medalGradient = new LinearGradientBrush(medalRect, Color.White, Color.FromArgb(245, 240, 230), 135f);
+ g.FillEllipse(medalGradient, medalRect);
+
+ // Decorative ring around medallion
+ using var ringPen = new Pen(gold, penW * 2f);
+ g.DrawEllipse(ringPen, medalRect);
+ using var innerRingPen = new Pen(color, penW * 0.8f);
+ g.DrawEllipse(innerRingPen, RectangleF.Inflate(medalRect, -penW * 2, -penW * 2));
+
+ // Suit symbol
+ using var suitFont = new Font("Segoe UI Symbol", medalSize * 0.45f, FontStyle.Bold);
+ using var suitBrush = new SolidBrush(color);
+ StringFormat sf = new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
+ g.DrawString(suit, suitFont, suitBrush, medalRect, sf);
+ }
+
+ private static void DrawFloralCorner(Graphics g, float x, float y, float size, Color gold, Color accent, Pen outlinePen, bool flipH, bool flipV)
+ {
+ var state = g.Save();
+ g.TranslateTransform(x, y);
+ if (flipH) g.ScaleTransform(-1, 1);
+ if (flipV) g.ScaleTransform(1, -1);
+
+ using var goldBrush = new SolidBrush(gold);
+ using var accentBrush = new SolidBrush(accent);
+
+ // Main curved vine
+ using var vinePen = new Pen(gold, outlinePen.Width * 1.2f);
+ g.DrawBezier(vinePen,
+ new PointF(0, size * 0.5f),
+ new PointF(size * 0.2f, size * 0.3f),
+ new PointF(size * 0.3f, size * 0.2f),
+ new PointF(size * 0.5f, 0));
+
+ // Small leaves
+ PointF[] leaf1 = {
+ new PointF(size * 0.15f, size * 0.35f),
+ new PointF(size * 0.05f, size * 0.15f),
+ new PointF(size * 0.25f, size * 0.25f)
+ };
+ g.FillPolygon(goldBrush, leaf1);
+
+ PointF[] leaf2 = {
+ new PointF(size * 0.35f, size * 0.15f),
+ new PointF(size * 0.15f, size * 0.05f),
+ new PointF(size * 0.25f, size * 0.25f)
+ };
+ g.FillPolygon(goldBrush, leaf2);
+
+ // Small flower
+ float flowerX = size * 0.08f;
+ float flowerY = size * 0.08f;
+ float petalR = size * 0.06f;
+ g.FillEllipse(accentBrush, flowerX - petalR, flowerY - petalR * 1.5f, petalR * 2, petalR * 2);
+ g.FillEllipse(accentBrush, flowerX - petalR * 1.5f, flowerY - petalR, petalR * 2, petalR * 2);
+ g.FillEllipse(goldBrush, flowerX - petalR * 0.5f, flowerY - petalR * 0.5f, petalR, petalR);
+
+ g.Restore(state);
+ }
+
+ private static void DrawQueenHalf(Graphics g, RectangleF rect, Color color, string suit, bool mirrored,
+ Pen outlinePen, Pen thinPen, Color skinTone, Color skinShadow, Color hairColor, Color hairHighlight, Color gold, Color lightGold)
+ {
+ var state = g.Save();
+
+ if (mirrored)
+ {
+ g.TranslateTransform(rect.X + rect.Width / 2, rect.Y + rect.Height / 2);
+ g.RotateTransform(180);
+ g.TranslateTransform(-(rect.X + rect.Width / 2), -(rect.Y + rect.Height / 2));
+ }
+
+ float halfH = rect.Height * 0.47f;
+ RectangleF half = new RectangleF(rect.X, rect.Y, rect.Width, halfH);
+
+ // Elaborate gown with gradient and layers
+ RectangleF gownRect = new RectangleF(half.X + half.Width * 0.12f, half.Y + half.Height * 0.42f,
+ half.Width * 0.76f, half.Height * 0.58f);
+ using var gownGradient = new LinearGradientBrush(gownRect,
+ Color.FromArgb(255, color), Color.FromArgb(200, DarkenColor(color, 0.15f)), 90f);
+
+ // Full gown shape
+ PointF[] gown = {
+ new PointF(half.X + half.Width * 0.12f, half.Bottom),
+ new PointF(half.X + half.Width * 0.15f, half.Y + half.Height * 0.58f),
+ new PointF(half.X + half.Width * 0.22f, half.Y + half.Height * 0.5f),
+ new PointF(half.X + half.Width * 0.32f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.42f),
+ new PointF(half.X + half.Width * 0.68f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.78f, half.Y + half.Height * 0.5f),
+ new PointF(half.X + half.Width * 0.85f, half.Y + half.Height * 0.58f),
+ new PointF(half.X + half.Width * 0.88f, half.Bottom)
+ };
+ g.FillPolygon(gownGradient, gown);
+ g.DrawPolygon(outlinePen, gown);
+
+ // Gown folds for depth
+ using var foldPen = new Pen(Color.FromArgb(50, 0, 0, 0), thinPen.Width);
+ using var highlightPen = new Pen(Color.FromArgb(60, 255, 255, 255), thinPen.Width);
+ g.DrawBezier(foldPen,
+ new PointF(half.X + half.Width * 0.3f, half.Y + half.Height * 0.5f),
+ new PointF(half.X + half.Width * 0.28f, half.Y + half.Height * 0.7f),
+ new PointF(half.X + half.Width * 0.25f, half.Y + half.Height * 0.85f),
+ new PointF(half.X + half.Width * 0.22f, half.Bottom));
+ g.DrawBezier(highlightPen,
+ new PointF(half.X + half.Width * 0.32f, half.Y + half.Height * 0.5f),
+ new PointF(half.X + half.Width * 0.3f, half.Y + half.Height * 0.7f),
+ new PointF(half.X + half.Width * 0.28f, half.Y + half.Height * 0.85f),
+ new PointF(half.X + half.Width * 0.26f, half.Bottom));
+ g.DrawBezier(foldPen,
+ new PointF(half.X + half.Width * 0.7f, half.Y + half.Height * 0.5f),
+ new PointF(half.X + half.Width * 0.72f, half.Y + half.Height * 0.7f),
+ new PointF(half.X + half.Width * 0.75f, half.Y + half.Height * 0.85f),
+ new PointF(half.X + half.Width * 0.78f, half.Bottom));
+
+ // Decorative embroidery on gown
+ using var embPen = new Pen(gold, thinPen.Width * 1.2f);
+ // Vertical ornament
+ g.DrawLine(embPen, half.X + half.Width * 0.5f, half.Y + half.Height * 0.5f,
+ half.X + half.Width * 0.5f, half.Bottom);
+ // Small diamonds along the line
+ for (float ey = half.Y + half.Height * 0.55f; ey < half.Bottom - half.Height * 0.1f; ey += half.Height * 0.1f)
+ {
+ PointF[] diamond = {
+ new PointF(half.X + half.Width * 0.5f, ey - half.Height * 0.02f),
+ new PointF(half.X + half.Width * 0.52f, ey),
+ new PointF(half.X + half.Width * 0.5f, ey + half.Height * 0.02f),
+ new PointF(half.X + half.Width * 0.48f, ey)
+ };
+ using var diamondBrush = new SolidBrush(gold);
+ g.FillPolygon(diamondBrush, diamond);
+ }
+
+ // Elaborate neckline with lace
+ using var laceBrush = new SolidBrush(Color.White);
+ PointF[] neckLace = {
+ new PointF(half.X + half.Width * 0.32f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.38f, half.Y + half.Height * 0.5f),
+ new PointF(half.X + half.Width * 0.44f, half.Y + half.Height * 0.53f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.55f),
+ new PointF(half.X + half.Width * 0.56f, half.Y + half.Height * 0.53f),
+ new PointF(half.X + half.Width * 0.62f, half.Y + half.Height * 0.5f),
+ new PointF(half.X + half.Width * 0.68f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.42f)
+ };
+ g.FillPolygon(laceBrush, neckLace);
+ g.DrawPolygon(thinPen, neckLace);
+
+ // Lace scalloped edge
+ using var scallopPen = new Pen(Color.FromArgb(120, 120, 120), thinPen.Width * 0.6f);
+ for (float sx = half.X + half.Width * 0.36f; sx < half.X + half.Width * 0.64f; sx += half.Width * 0.04f)
+ {
+ g.DrawArc(scallopPen, sx, half.Y + half.Height * 0.51f, half.Width * 0.04f, half.Height * 0.03f, 0, 180);
+ }
+
+ // Necklace with pendant
+ using var necklacePen = new Pen(gold, thinPen.Width * 1.5f);
+ g.DrawArc(necklacePen, half.X + half.Width * 0.38f, half.Y + half.Height * 0.42f,
+ half.Width * 0.24f, half.Height * 0.12f, 0, 180);
+
+ // Pendant
+ using var pendantBrush = new SolidBrush(color);
+ using var goldBrush = new SolidBrush(gold);
+ float pendX = half.X + half.Width * 0.5f;
+ float pendY = half.Y + half.Height * 0.52f;
+ g.FillEllipse(goldBrush, pendX - half.Width * 0.025f, pendY, half.Width * 0.05f, half.Width * 0.05f);
+ g.FillEllipse(pendantBrush, pendX - half.Width * 0.018f, pendY + half.Width * 0.007f,
+ half.Width * 0.036f, half.Width * 0.036f);
+
+ // Elaborate hair with curls
+ float headW = half.Width * 0.22f;
+ float headH = half.Height * 0.3f;
+ RectangleF headRect = new RectangleF(half.X + half.Width * 0.5f - headW / 2,
+ half.Y + half.Height * 0.12f, headW, headH);
+
+ // Hair base with gradient
+ using var hairGradient = new LinearGradientBrush(
+ new RectangleF(headRect.X - headW * 0.3f, headRect.Y - headH * 0.15f, headW * 1.6f, headH * 1.2f),
+ hairHighlight, hairColor, 60f);
+
+ // Main hair volume
+ RectangleF hairOuter = new RectangleF(headRect.X - headW * 0.28f, headRect.Y - headH * 0.12f,
+ headW * 1.56f, headH * 1.15f);
+ g.FillEllipse(hairGradient, hairOuter);
+
+ // Hair curls on sides
+ using var curlPen = new Pen(Color.FromArgb(100, 60, 25), thinPen.Width * 0.8f);
+ // Left curls
+ g.DrawBezier(curlPen,
+ new PointF(headRect.X - headW * 0.15f, headRect.Y + headH * 0.3f),
+ new PointF(headRect.X - headW * 0.3f, headRect.Y + headH * 0.5f),
+ new PointF(headRect.X - headW * 0.25f, headRect.Y + headH * 0.7f),
+ new PointF(headRect.X - headW * 0.1f, headRect.Y + headH * 0.6f));
+ g.DrawBezier(curlPen,
+ new PointF(headRect.X - headW * 0.1f, headRect.Y + headH * 0.5f),
+ new PointF(headRect.X - headW * 0.22f, headRect.Y + headH * 0.65f),
+ new PointF(headRect.X - headW * 0.18f, headRect.Y + headH * 0.8f),
+ new PointF(headRect.X - headW * 0.05f, headRect.Y + headH * 0.75f));
+ // Right curls
+ g.DrawBezier(curlPen,
+ new PointF(headRect.Right + headW * 0.15f, headRect.Y + headH * 0.3f),
+ new PointF(headRect.Right + headW * 0.3f, headRect.Y + headH * 0.5f),
+ new PointF(headRect.Right + headW * 0.25f, headRect.Y + headH * 0.7f),
+ new PointF(headRect.Right + headW * 0.1f, headRect.Y + headH * 0.6f));
+
+ // Face with 3D shading
+ using var faceGradient = new LinearGradientBrush(headRect, skinTone, skinShadow, 130f);
+ g.FillEllipse(faceGradient, headRect);
+ g.DrawEllipse(outlinePen, headRect);
+
+ // Rosy cheeks
+ using var blushBrush = new SolidBrush(Color.FromArgb(35, 255, 130, 130));
+ g.FillEllipse(blushBrush, headRect.X + headW * 0.08f, headRect.Y + headH * 0.45f, headW * 0.22f, headH * 0.15f);
+ g.FillEllipse(blushBrush, headRect.X + headW * 0.7f, headRect.Y + headH * 0.45f, headW * 0.22f, headH * 0.15f);
+
+ // Elegant tiara crown
+ float crownH = headH * 0.45f;
+ float crownW = headW * 1.4f;
+ float crownX = headRect.X - headW * 0.2f;
+ float crownY = headRect.Y - crownH * 0.55f;
+
+ // Crown with gradient
+ using var crownGradient = new LinearGradientBrush(
+ new RectangleF(crownX, crownY, crownW, crownH), lightGold, gold, 90f);
+
+ PointF[] crown = {
+ new PointF(crownX, crownY + crownH),
+ new PointF(crownX + crownW * 0.08f, crownY + crownH * 0.35f),
+ new PointF(crownX + crownW * 0.18f, crownY + crownH * 0.75f),
+ new PointF(crownX + crownW * 0.28f, crownY + crownH * 0.15f),
+ new PointF(crownX + crownW * 0.38f, crownY + crownH * 0.6f),
+ new PointF(crownX + crownW * 0.5f, crownY - crownH * 0.1f),
+ new PointF(crownX + crownW * 0.62f, crownY + crownH * 0.6f),
+ new PointF(crownX + crownW * 0.72f, crownY + crownH * 0.15f),
+ new PointF(crownX + crownW * 0.82f, crownY + crownH * 0.75f),
+ new PointF(crownX + crownW * 0.92f, crownY + crownH * 0.35f),
+ new PointF(crownX + crownW, crownY + crownH)
+ };
+ g.FillPolygon(crownGradient, crown);
+ g.DrawPolygon(outlinePen, crown);
+
+ // Crown jewels
+ float jewelSize = crownW * 0.065f;
+ using var rubyBrush = new SolidBrush(Color.FromArgb(220, 20, 60));
+ using var sapphireBrush = new SolidBrush(Color.FromArgb(30, 80, 180));
+ using var pearlBrush = new SolidBrush(Color.FromArgb(255, 250, 245));
+
+ // Center jewel (ruby)
+ g.FillEllipse(rubyBrush, crownX + crownW * 0.5f - jewelSize * 0.7f, crownY - crownH * 0.1f - jewelSize * 0.3f,
+ jewelSize * 1.4f, jewelSize * 1.4f);
+ g.DrawEllipse(thinPen, crownX + crownW * 0.5f - jewelSize * 0.7f, crownY - crownH * 0.1f - jewelSize * 0.3f,
+ jewelSize * 1.4f, jewelSize * 1.4f);
+
+ // Side jewels
+ g.FillEllipse(sapphireBrush, crownX + crownW * 0.28f - jewelSize/2, crownY + crownH * 0.1f, jewelSize, jewelSize);
+ g.FillEllipse(sapphireBrush, crownX + crownW * 0.72f - jewelSize/2, crownY + crownH * 0.1f, jewelSize, jewelSize);
+
+ // Pearls
+ g.FillEllipse(pearlBrush, crownX + crownW * 0.08f - jewelSize * 0.4f, crownY + crownH * 0.3f, jewelSize * 0.8f, jewelSize * 0.8f);
+ g.FillEllipse(pearlBrush, crownX + crownW * 0.92f - jewelSize * 0.4f, crownY + crownH * 0.3f, jewelSize * 0.8f, jewelSize * 0.8f);
+
+ // Detailed eyes
+ float eyeW = headW * 0.12f;
+ float eyeH = headH * 0.07f;
+
+ // Left eye
+ DrawDetailedEye(g, headRect.X + headW * 0.22f, headRect.Y + headH * 0.38f, eyeW, eyeH,
+ Color.FromArgb(100, 80, 60), thinPen);
+ // Right eye
+ DrawDetailedEye(g, headRect.X + headW * 0.66f, headRect.Y + headH * 0.38f, eyeW, eyeH,
+ Color.FromArgb(100, 80, 60), thinPen);
+
+ // Eyebrows
+ using var browPen = new Pen(Color.FromArgb(120, 90, 50), thinPen.Width);
+ g.DrawArc(browPen, headRect.X + headW * 0.18f, headRect.Y + headH * 0.28f, eyeW * 1.3f, eyeH, 200, 70);
+ g.DrawArc(browPen, headRect.X + headW * 0.62f, headRect.Y + headH * 0.28f, eyeW * 1.3f, eyeH, 250, 70);
+
+ // Elegant nose
+ g.DrawBezier(thinPen,
+ new PointF(headRect.X + headW * 0.48f, headRect.Y + headH * 0.4f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.5f),
+ new PointF(headRect.X + headW * 0.52f, headRect.Y + headH * 0.55f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.58f));
+
+ // Lips with detail
+ using var lipBrush = new SolidBrush(Color.FromArgb(200, 90, 90));
+ using var lipHighlight = new SolidBrush(Color.FromArgb(100, 255, 200, 200));
+
+ // Upper lip
+ PointF[] upperLip = {
+ new PointF(headRect.X + headW * 0.38f, headRect.Y + headH * 0.68f),
+ new PointF(headRect.X + headW * 0.45f, headRect.Y + headH * 0.65f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.67f),
+ new PointF(headRect.X + headW * 0.55f, headRect.Y + headH * 0.65f),
+ new PointF(headRect.X + headW * 0.62f, headRect.Y + headH * 0.68f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.72f)
+ };
+ g.FillPolygon(lipBrush, upperLip);
+
+ // Lower lip
+ g.FillEllipse(lipBrush, headRect.X + headW * 0.4f, headRect.Y + headH * 0.69f, headW * 0.2f, headH * 0.08f);
+ g.FillEllipse(lipHighlight, headRect.X + headW * 0.44f, headRect.Y + headH * 0.71f, headW * 0.08f, headH * 0.03f);
+
+ // Elegant flower scepter
+ float flowerX = half.X + half.Width * 0.85f;
+ float flowerY = half.Y + half.Height * 0.25f;
+ DrawElaborateFlower(g, flowerX, flowerY, half.Width * 0.1f, color, gold, outlinePen, thinPen);
+
+ // Flower stem
+ using var stemPen = new Pen(Color.FromArgb(80, 120, 60), outlinePen.Width * 1.2f);
+ g.DrawBezier(stemPen,
+ new PointF(flowerX, flowerY + half.Width * 0.08f),
+ new PointF(flowerX - half.Width * 0.02f, flowerY + half.Height * 0.3f),
+ new PointF(flowerX + half.Width * 0.02f, flowerY + half.Height * 0.5f),
+ new PointF(flowerX - half.Width * 0.01f, half.Bottom));
+
+ // Small leaves on stem
+ using var leafBrush = new SolidBrush(Color.FromArgb(100, 140, 80));
+ PointF[] leaf1 = {
+ new PointF(flowerX, flowerY + half.Height * 0.35f),
+ new PointF(flowerX + half.Width * 0.06f, flowerY + half.Height * 0.32f),
+ new PointF(flowerX + half.Width * 0.02f, flowerY + half.Height * 0.4f)
+ };
+ g.FillPolygon(leafBrush, leaf1);
+
+ g.Restore(state);
+ }
+
+ private static void DrawDetailedEye(Graphics g, float x, float y, float w, float h, Color irisColor, Pen outlinePen)
+ {
+ // Eye white
+ using var whiteBrush = new SolidBrush(Color.FromArgb(252, 252, 252));
+ g.FillEllipse(whiteBrush, x, y, w, h);
+
+ // Iris
+ using var irisBrush = new SolidBrush(irisColor);
+ float irisW = w * 0.5f;
+ float irisH = h * 0.85f;
+ g.FillEllipse(irisBrush, x + w * 0.25f, y + h * 0.08f, irisW, irisH);
+
+ // Pupil
+ using var pupilBrush = new SolidBrush(Color.Black);
+ g.FillEllipse(pupilBrush, x + w * 0.35f, y + h * 0.2f, irisW * 0.6f, irisH * 0.6f);
+
+ // Highlight
+ using var highlightBrush = new SolidBrush(Color.White);
+ g.FillEllipse(highlightBrush, x + w * 0.32f, y + h * 0.15f, w * 0.12f, h * 0.25f);
+
+ // Eye outline
+ g.DrawEllipse(outlinePen, x, y, w, h);
+
+ // Eyelashes
+ using var lashPen = new Pen(Color.FromArgb(60, 40, 30), outlinePen.Width * 0.4f);
+ for (int i = 0; i < 4; i++)
+ {
+ float lx = x + w * (0.15f + i * 0.22f);
+ g.DrawLine(lashPen, lx, y, lx - w * 0.02f, y - h * 0.15f);
+ }
+ }
+
+ private static void DrawElaborateFlower(Graphics g, float x, float y, float size, Color petalColor, Color centerColor, Pen outlinePen, Pen thinPen)
+ {
+ // Outer petals
+ RectangleF petalRect = new RectangleF(x - size, y - size, size * 2, size * 2);
+ using var petalGradient = new LinearGradientBrush(petalRect,
+ LightenColor(petalColor, 0.3f), petalColor, 45f);
+
+ for (int i = 0; i < 6; i++)
+ {
+ float angle = i * 60 * (float)System.Math.PI / 180;
+ float px = x + (float)System.Math.Cos(angle) * size * 0.7f;
+ float py = y + (float)System.Math.Sin(angle) * size * 0.7f;
+
+ g.FillEllipse(petalGradient, px - size * 0.45f, py - size * 0.45f, size * 0.9f, size * 0.9f);
+ g.DrawEllipse(thinPen, px - size * 0.45f, py - size * 0.45f, size * 0.9f, size * 0.9f);
+ }
+
+ // Inner petals
+ for (int i = 0; i < 6; i++)
+ {
+ float angle = (i * 60 + 30) * (float)System.Math.PI / 180;
+ float px = x + (float)System.Math.Cos(angle) * size * 0.4f;
+ float py = y + (float)System.Math.Sin(angle) * size * 0.4f;
+
+ using var innerBrush = new SolidBrush(LightenColor(petalColor, 0.2f));
+ g.FillEllipse(innerBrush, px - size * 0.3f, py - size * 0.3f, size * 0.6f, size * 0.6f);
+ }
+
+ // Center
+ using var centerBrush = new SolidBrush(centerColor);
+ g.FillEllipse(centerBrush, x - size * 0.25f, y - size * 0.25f, size * 0.5f, size * 0.5f);
+ g.DrawEllipse(thinPen, x - size * 0.25f, y - size * 0.25f, size * 0.5f, size * 0.5f);
+
+ // Center dots
+ using var dotBrush = new SolidBrush(Color.FromArgb(180, 140, 40));
+ for (int i = 0; i < 5; i++)
+ {
+ float angle = i * 72 * (float)System.Math.PI / 180;
+ float dx = x + (float)System.Math.Cos(angle) * size * 0.12f;
+ float dy = y + (float)System.Math.Sin(angle) * size * 0.12f;
+ g.FillEllipse(dotBrush, dx - size * 0.04f, dy - size * 0.04f, size * 0.08f, size * 0.08f);
+ }
+ }
+
+ private static void DrawJackEye(Graphics g, float x, float y, float w, float h, Pen outlinePen)
+ {
+ // Eye white
+ using var whiteBrush = new SolidBrush(Color.FromArgb(252, 252, 252));
+ g.FillEllipse(whiteBrush, x, y, w, h);
+
+ // Iris
+ using var irisBrush = new SolidBrush(Color.FromArgb(80, 60, 40));
+ float irisW = w * 0.5f;
+ float irisH = h * 0.85f;
+ g.FillEllipse(irisBrush, x + w * 0.25f, y + h * 0.08f, irisW, irisH);
+
+ // Pupil
+ using var pupilBrush = new SolidBrush(Color.Black);
+ g.FillEllipse(pupilBrush, x + w * 0.35f, y + h * 0.2f, irisW * 0.6f, irisH * 0.6f);
+
+ // Highlight
+ using var highlightBrush = new SolidBrush(Color.White);
+ g.FillEllipse(highlightBrush, x + w * 0.32f, y + h * 0.15f, w * 0.12f, h * 0.25f);
+
+ // Eye outline
+ g.DrawEllipse(outlinePen, x, y, w, h);
+ }
+
+ private static void DrawKing(Graphics g, Rectangle rect, Color color, string suit)
+ {
+ // French-style King (Roi) - elaborate mirrored double-headed design
+ float penW = System.Math.Max(1f, rect.Width / 120f);
+ using var outlinePen = new Pen(Color.FromArgb(50, 30, 15), penW);
+ using var thinPen = new Pen(Color.FromArgb(50, 30, 15), penW * 0.5f);
+
+ // Colors - royal palette
+ Color cream = Color.FromArgb(255, 252, 245);
+ Color gold = Color.FromArgb(212, 175, 55);
+ Color darkGold = Color.FromArgb(170, 135, 30);
+ Color lightGold = Color.FromArgb(255, 223, 120);
+ Color skinTone = Color.FromArgb(255, 218, 185);
+ Color skinShadow = Color.FromArgb(235, 190, 160);
+ Color beardColor = Color.FromArgb(110, 75, 40);
+ Color beardHighlight = Color.FromArgb(150, 110, 65);
+
+ // Draw decorative frame with gradient
+ RectangleF frameRect = new RectangleF(rect.X + rect.Width * 0.10f, rect.Y + rect.Height * 0.06f,
+ rect.Width * 0.80f, rect.Height * 0.88f);
+ using var frameBrush = new LinearGradientBrush(frameRect, cream, Color.FromArgb(250, 245, 235), 45f);
+ g.FillRectangle(frameBrush, frameRect);
+
+ // Royal cross-hatch pattern in background
+ using var patternPen = new Pen(Color.FromArgb(10, color), penW * 0.3f);
+ for (float i = frameRect.X; i < frameRect.Right + frameRect.Height; i += rect.Width * 0.035f)
+ {
+ g.DrawLine(patternPen, i, frameRect.Y, i - frameRect.Height * 0.4f, frameRect.Bottom);
+ g.DrawLine(patternPen, i - frameRect.Height * 0.4f, frameRect.Y, i, frameRect.Bottom);
+ }
+
+ // Inner decorative border - triple line royal style
+ float borderInset = rect.Width * 0.02f;
+ RectangleF innerFrame = RectangleF.Inflate(frameRect, -borderInset * 2, -borderInset * 2);
+ using var borderPen = new Pen(color, penW * 1.2f);
+ using var goldBorderPen = new Pen(gold, penW * 0.6f);
+ g.DrawRectangle(borderPen, innerFrame.X, innerFrame.Y, innerFrame.Width, innerFrame.Height);
+ g.DrawRectangle(goldBorderPen, innerFrame.X - penW, innerFrame.Y - penW, innerFrame.Width + penW * 2, innerFrame.Height + penW * 2);
+ g.DrawRectangle(goldBorderPen, innerFrame.X + penW * 2, innerFrame.Y + penW * 2, innerFrame.Width - penW * 4, innerFrame.Height - penW * 4);
+
+ // Royal crown corner ornaments
+ DrawRoyalCorner(g, innerFrame.X, innerFrame.Y, rect.Width * 0.1f, gold, color, outlinePen, false, false);
+ DrawRoyalCorner(g, innerFrame.Right, innerFrame.Y, rect.Width * 0.1f, gold, color, outlinePen, true, false);
+ DrawRoyalCorner(g, innerFrame.X, innerFrame.Bottom, rect.Width * 0.1f, gold, color, outlinePen, false, true);
+ DrawRoyalCorner(g, innerFrame.Right, innerFrame.Bottom, rect.Width * 0.1f, gold, color, outlinePen, true, true);
+
+ // Draw upper half figure
+ DrawKingHalf(g, innerFrame, color, suit, false, outlinePen, thinPen, skinTone, skinShadow, beardColor, beardHighlight, gold, darkGold, lightGold);
+
+ // Draw lower half figure (mirrored)
+ DrawKingHalf(g, innerFrame, color, suit, true, outlinePen, thinPen, skinTone, skinShadow, beardColor, beardHighlight, gold, darkGold, lightGold);
+
+ // Center medallion with suit symbol and royal seal
+ float centerY = innerFrame.Y + innerFrame.Height / 2;
+ float medalSize = innerFrame.Width * 0.26f;
+ RectangleF medalRect = new RectangleF(innerFrame.X + innerFrame.Width / 2 - medalSize / 2,
+ centerY - medalSize / 2, medalSize, medalSize);
+
+ // Royal seal medallion with multiple rings
+ using var sealGradient = new LinearGradientBrush(medalRect, Color.White, Color.FromArgb(245, 240, 225), 135f);
+ g.FillEllipse(sealGradient, medalRect);
+
+ // Decorative rings
+ using var outerRingPen = new Pen(gold, penW * 2.5f);
+ g.DrawEllipse(outerRingPen, medalRect);
+ using var innerRingPen = new Pen(color, penW * 1.2f);
+ g.DrawEllipse(innerRingPen, RectangleF.Inflate(medalRect, -penW * 3, -penW * 3));
+ using var centerRingPen = new Pen(gold, penW * 0.8f);
+ g.DrawEllipse(centerRingPen, RectangleF.Inflate(medalRect, -penW * 5, -penW * 5));
+
+ // Suit symbol
+ using var suitFont = new Font("Segoe UI Symbol", medalSize * 0.4f, FontStyle.Bold);
+ using var suitBrush = new SolidBrush(color);
+ StringFormat sf = new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
+ g.DrawString(suit, suitFont, suitBrush, medalRect, sf);
+ }
+
+ private static void DrawRoyalCorner(Graphics g, float x, float y, float size, Color gold, Color accent, Pen outlinePen, bool flipH, bool flipV)
+ {
+ var state = g.Save();
+ g.TranslateTransform(x, y);
+ if (flipH) g.ScaleTransform(-1, 1);
+ if (flipV) g.ScaleTransform(1, -1);
+
+ using var goldBrush = new SolidBrush(gold);
+ using var accentBrush = new SolidBrush(accent);
+
+ // Crown-like corner ornament
+ PointF[] crownOrn = {
+ new PointF(0, 0),
+ new PointF(size * 0.4f, 0),
+ new PointF(size * 0.3f, size * 0.15f),
+ new PointF(size * 0.5f, size * 0.08f),
+ new PointF(size * 0.35f, size * 0.25f),
+ new PointF(size * 0.25f, size * 0.35f),
+ new PointF(size * 0.08f, size * 0.5f),
+ new PointF(size * 0.15f, size * 0.3f),
+ new PointF(0, size * 0.4f)
+ };
+ g.FillPolygon(goldBrush, crownOrn);
+ g.DrawPolygon(outlinePen, crownOrn);
+
+ // Small jewel
+ float jewelX = size * 0.12f;
+ float jewelY = size * 0.12f;
+ float jewelSize = size * 0.1f;
+ g.FillEllipse(accentBrush, jewelX, jewelY, jewelSize, jewelSize);
+
+ g.Restore(state);
+ }
+
+ private static void DrawKingHalf(Graphics g, RectangleF rect, Color color, string suit, bool mirrored,
+ Pen outlinePen, Pen thinPen, Color skinTone, Color skinShadow, Color beardColor, Color beardHighlight,
+ Color gold, Color darkGold, Color lightGold)
+ {
+ var state = g.Save();
+
+ if (mirrored)
+ {
+ g.TranslateTransform(rect.X + rect.Width / 2, rect.Y + rect.Height / 2);
+ g.RotateTransform(180);
+ g.TranslateTransform(-(rect.X + rect.Width / 2), -(rect.Y + rect.Height / 2));
+ }
+
+ float halfH = rect.Height * 0.47f;
+ RectangleF half = new RectangleF(rect.X, rect.Y, rect.Width, halfH);
+
+ // Royal robe with rich gradient and ermine trim
+ RectangleF robeRect = new RectangleF(half.X + half.Width * 0.1f, half.Y + half.Height * 0.38f,
+ half.Width * 0.8f, half.Height * 0.62f);
+ using var robeGradient = new LinearGradientBrush(robeRect,
+ Color.FromArgb(255, color), Color.FromArgb(200, DarkenColor(color, 0.2f)), 90f);
+
+ PointF[] robe = {
+ new PointF(half.X + half.Width * 0.1f, half.Bottom),
+ new PointF(half.X + half.Width * 0.15f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.22f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.38f),
+ new PointF(half.X + half.Width * 0.78f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.85f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.9f, half.Bottom)
+ };
+ g.FillPolygon(robeGradient, robe);
+ g.DrawPolygon(outlinePen, robe);
+
+ // Robe folds
+ using var foldPen = new Pen(Color.FromArgb(50, 0, 0, 0), thinPen.Width);
+ using var highlightPen = new Pen(Color.FromArgb(60, 255, 255, 255), thinPen.Width);
+ g.DrawBezier(foldPen,
+ new PointF(half.X + half.Width * 0.35f, half.Y + half.Height * 0.48f),
+ new PointF(half.X + half.Width * 0.32f, half.Y + half.Height * 0.65f),
+ new PointF(half.X + half.Width * 0.28f, half.Y + half.Height * 0.8f),
+ new PointF(half.X + half.Width * 0.22f, half.Bottom));
+ g.DrawBezier(highlightPen,
+ new PointF(half.X + half.Width * 0.38f, half.Y + half.Height * 0.48f),
+ new PointF(half.X + half.Width * 0.36f, half.Y + half.Height * 0.65f),
+ new PointF(half.X + half.Width * 0.33f, half.Y + half.Height * 0.8f),
+ new PointF(half.X + half.Width * 0.28f, half.Bottom));
+ g.DrawBezier(foldPen,
+ new PointF(half.X + half.Width * 0.65f, half.Y + half.Height * 0.48f),
+ new PointF(half.X + half.Width * 0.68f, half.Y + half.Height * 0.65f),
+ new PointF(half.X + half.Width * 0.72f, half.Y + half.Height * 0.8f),
+ new PointF(half.X + half.Width * 0.78f, half.Bottom));
+
+ // Elaborate ermine collar with spots
+ using var ermineBrush = new SolidBrush(Color.FromArgb(255, 252, 248));
+ PointF[] collar = {
+ new PointF(half.X + half.Width * 0.25f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.32f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.42f, half.Y + half.Height * 0.56f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.58f),
+ new PointF(half.X + half.Width * 0.58f, half.Y + half.Height * 0.56f),
+ new PointF(half.X + half.Width * 0.68f, half.Y + half.Height * 0.52f),
+ new PointF(half.X + half.Width * 0.75f, half.Y + half.Height * 0.45f),
+ new PointF(half.X + half.Width * 0.5f, half.Y + half.Height * 0.38f)
+ };
+ g.FillPolygon(ermineBrush, collar);
+ g.DrawPolygon(thinPen, collar);
+
+ // Ermine spots (black tail tips)
+ using var spotBrush = new SolidBrush(Color.FromArgb(35, 25, 15));
+ float spotH = half.Width * 0.012f;
+ float spotW = spotH * 0.6f;
+ float[] spotXs = { 0.35f, 0.42f, 0.5f, 0.58f, 0.65f };
+ float[] spotYs = { 0.48f, 0.52f, 0.54f, 0.52f, 0.48f };
+ for (int i = 0; i < spotXs.Length; i++)
+ {
+ g.FillEllipse(spotBrush, half.X + half.Width * spotXs[i], half.Y + half.Height * spotYs[i], spotW, spotH * 2.5f);
+ }
+ // Second row
+ float[] spotXs2 = { 0.38f, 0.46f, 0.54f, 0.62f };
+ for (int i = 0; i < spotXs2.Length; i++)
+ {
+ g.FillEllipse(spotBrush, half.X + half.Width * spotXs2[i], half.Y + half.Height * 0.44f, spotW, spotH * 2.5f);
+ }
+
+ // Royal chain with medallion
+ using var chainPen = new Pen(gold, outlinePen.Width * 2f);
+ g.DrawArc(chainPen, half.X + half.Width * 0.35f, half.Y + half.Height * 0.48f,
+ half.Width * 0.3f, half.Height * 0.16f, 0, 180);
+
+ // Chain links detail
+ using var linkPen = new Pen(darkGold, thinPen.Width);
+ for (float lx = half.X + half.Width * 0.38f; lx < half.X + half.Width * 0.62f; lx += half.Width * 0.04f)
+ {
+ float ly = half.Y + half.Height * 0.52f + (float)System.Math.Sin((lx - half.X) * 0.1f) * half.Height * 0.04f;
+ g.DrawEllipse(linkPen, lx, ly, half.Width * 0.025f, half.Height * 0.02f);
+ }
+
+ // Royal medallion on chain
+ using var medalGradient = new LinearGradientBrush(
+ new RectangleF(half.X + half.Width * 0.44f, half.Y + half.Height * 0.58f, half.Width * 0.12f, half.Width * 0.12f),
+ lightGold, gold, 135f);
+ float medalX = half.X + half.Width * 0.5f;
+ float medalY = half.Y + half.Height * 0.62f;
+ float medalSize = half.Width * 0.1f;
+ g.FillEllipse(medalGradient, medalX - medalSize / 2, medalY, medalSize, medalSize);
+ g.DrawEllipse(outlinePen, medalX - medalSize / 2, medalY, medalSize, medalSize);
+
+ // Cross on medallion
+ using var crossPen = new Pen(color, thinPen.Width * 1.5f);
+ g.DrawLine(crossPen, medalX, medalY + medalSize * 0.2f, medalX, medalY + medalSize * 0.8f);
+ g.DrawLine(crossPen, medalX - medalSize * 0.3f, medalY + medalSize * 0.5f, medalX + medalSize * 0.3f, medalY + medalSize * 0.5f);
+
+ // Head with detailed shading
+ float headW = half.Width * 0.24f;
+ float headH = half.Height * 0.32f;
+ RectangleF headRect = new RectangleF(half.X + half.Width * 0.5f - headW / 2,
+ half.Y + half.Height * 0.08f, headW, headH);
+
+ // Face with gradient
+ using var faceGradient = new LinearGradientBrush(headRect, skinTone, skinShadow, 130f);
+ g.FillEllipse(faceGradient, headRect);
+ g.DrawEllipse(outlinePen, headRect);
+
+ // Elaborate beard with gradient and texture
+ using var beardGradient = new LinearGradientBrush(
+ new RectangleF(headRect.X + headW * 0.1f, headRect.Y + headH * 0.45f, headW * 0.8f, headH * 0.7f),
+ beardHighlight, beardColor, 90f);
+
+ // Main beard shape
+ PointF[] beard = {
+ new PointF(headRect.X + headW * 0.15f, headRect.Y + headH * 0.5f),
+ new PointF(headRect.X + headW * 0.1f, headRect.Y + headH * 0.7f),
+ new PointF(headRect.X + headW * 0.2f, headRect.Y + headH * 0.9f),
+ new PointF(headRect.X + headW * 0.35f, headRect.Y + headH * 1.05f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 1.1f),
+ new PointF(headRect.X + headW * 0.65f, headRect.Y + headH * 1.05f),
+ new PointF(headRect.X + headW * 0.8f, headRect.Y + headH * 0.9f),
+ new PointF(headRect.X + headW * 0.9f, headRect.Y + headH * 0.7f),
+ new PointF(headRect.X + headW * 0.85f, headRect.Y + headH * 0.5f)
+ };
+ g.FillPolygon(beardGradient, beard);
+ g.DrawPolygon(thinPen, beard);
+
+ // Beard texture (wavy lines)
+ using var beardTexturePen = new Pen(Color.FromArgb(60, 80, 55, 30), thinPen.Width * 0.5f);
+ for (int i = 0; i < 5; i++)
+ {
+ float bx = headRect.X + headW * (0.25f + i * 0.12f);
+ g.DrawBezier(beardTexturePen,
+ new PointF(bx, headRect.Y + headH * 0.55f),
+ new PointF(bx - headW * 0.03f, headRect.Y + headH * 0.7f),
+ new PointF(bx + headW * 0.03f, headRect.Y + headH * 0.85f),
+ new PointF(bx, headRect.Y + headH * 1.0f));
+ }
+
+ // Mustache with detail
+ using var mustacheBrush = new SolidBrush(beardColor);
+ PointF[] leftMustache = {
+ new PointF(headRect.X + headW * 0.48f, headRect.Y + headH * 0.52f),
+ new PointF(headRect.X + headW * 0.3f, headRect.Y + headH * 0.48f),
+ new PointF(headRect.X + headW * 0.15f, headRect.Y + headH * 0.55f),
+ new PointF(headRect.X + headW * 0.2f, headRect.Y + headH * 0.6f),
+ new PointF(headRect.X + headW * 0.35f, headRect.Y + headH * 0.58f),
+ new PointF(headRect.X + headW * 0.48f, headRect.Y + headH * 0.6f)
+ };
+ g.FillPolygon(mustacheBrush, leftMustache);
+
+ PointF[] rightMustache = {
+ new PointF(headRect.X + headW * 0.52f, headRect.Y + headH * 0.52f),
+ new PointF(headRect.X + headW * 0.7f, headRect.Y + headH * 0.48f),
+ new PointF(headRect.X + headW * 0.85f, headRect.Y + headH * 0.55f),
+ new PointF(headRect.X + headW * 0.8f, headRect.Y + headH * 0.6f),
+ new PointF(headRect.X + headW * 0.65f, headRect.Y + headH * 0.58f),
+ new PointF(headRect.X + headW * 0.52f, headRect.Y + headH * 0.6f)
+ };
+ g.FillPolygon(mustacheBrush, rightMustache);
+
+ // Detailed eyes
+ float eyeW = headW * 0.13f;
+ float eyeH = headH * 0.07f;
+ DrawKingEye(g, headRect.X + headW * 0.22f, headRect.Y + headH * 0.32f, eyeW, eyeH, thinPen);
+ DrawKingEye(g, headRect.X + headW * 0.65f, headRect.Y + headH * 0.32f, eyeW, eyeH, thinPen);
+
+ // Stern eyebrows
+ using var browPen = new Pen(beardColor, thinPen.Width * 1.5f);
+ g.DrawLine(browPen, headRect.X + headW * 0.18f, headRect.Y + headH * 0.28f,
+ headRect.X + headW * 0.38f, headRect.Y + headH * 0.25f);
+ g.DrawLine(browPen, headRect.X + headW * 0.62f, headRect.Y + headH * 0.25f,
+ headRect.X + headW * 0.82f, headRect.Y + headH * 0.28f);
+
+ // Nose
+ g.DrawBezier(thinPen,
+ new PointF(headRect.X + headW * 0.48f, headRect.Y + headH * 0.35f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.42f),
+ new PointF(headRect.X + headW * 0.52f, headRect.Y + headH * 0.48f),
+ new PointF(headRect.X + headW * 0.5f, headRect.Y + headH * 0.5f));
+
+ // Elaborate royal crown with cross
+ float crownH = headH * 0.6f;
+ float crownW = headW * 1.5f;
+ float crownX = headRect.X - headW * 0.25f;
+ float crownY = headRect.Y - crownH * 0.45f;
+
+ // Crown base band
+ using var crownBaseGradient = new LinearGradientBrush(
+ new RectangleF(crownX, crownY + crownH * 0.55f, crownW, crownH * 0.45f),
+ lightGold, gold, 90f);
+ RectangleF crownBase = new RectangleF(crownX, crownY + crownH * 0.55f, crownW, crownH * 0.45f);
+ g.FillRectangle(crownBaseGradient, crownBase);
+ g.DrawRectangle(outlinePen, crownBase.X, crownBase.Y, crownBase.Width, crownBase.Height);
+
+ // Velvet interior (visible above base)
+ using var velvetBrush = new SolidBrush(color);
+ RectangleF velvetRect = new RectangleF(crownX + crownW * 0.08f, crownY + crownH * 0.4f,
+ crownW * 0.84f, crownH * 0.2f);
+ g.FillRectangle(velvetBrush, velvetRect);
+
+ // Crown arches with gradient
+ using var archGradient = new LinearGradientBrush(
+ new RectangleF(crownX, crownY, crownW, crownH * 0.6f), lightGold, gold, 90f);
+
+ PointF[] crownArch = {
+ new PointF(crownX + crownW * 0.08f, crownY + crownH * 0.55f),
+ new PointF(crownX + crownW * 0.15f, crownY + crownH * 0.2f),
+ new PointF(crownX + crownW * 0.3f, crownY + crownH * 0.35f),
+ new PointF(crownX + crownW * 0.5f, crownY - crownH * 0.05f),
+ new PointF(crownX + crownW * 0.7f, crownY + crownH * 0.35f),
+ new PointF(crownX + crownW * 0.85f, crownY + crownH * 0.2f),
+ new PointF(crownX + crownW * 0.92f, crownY + crownH * 0.55f)
+ };
+ g.FillPolygon(archGradient, crownArch);
+ g.DrawPolygon(outlinePen, crownArch);
+
+ // Fleur-de-lis points on crown
+ DrawFleurDeLis(g, crownX + crownW * 0.15f, crownY + crownH * 0.15f, crownW * 0.08f, gold, outlinePen);
+ DrawFleurDeLis(g, crownX + crownW * 0.5f, crownY - crownH * 0.1f, crownW * 0.1f, gold, outlinePen);
+ DrawFleurDeLis(g, crownX + crownW * 0.85f, crownY + crownH * 0.15f, crownW * 0.08f, gold, outlinePen);
+
+ // Cross on top (monde)
+ float crossX = crownX + crownW * 0.5f;
+ float crossY = crownY - crownH * 0.15f;
+ float crossSize = crownW * 0.08f;
+
+ // Orb
+ using var orbGradient = new LinearGradientBrush(
+ new RectangleF(crossX - crossSize * 0.7f, crossY - crossSize * 0.3f, crossSize * 1.4f, crossSize * 1.4f),
+ lightGold, gold, 135f);
+ g.FillEllipse(orbGradient, crossX - crossSize * 0.5f, crossY, crossSize, crossSize);
+ g.DrawEllipse(outlinePen, crossX - crossSize * 0.5f, crossY, crossSize, crossSize);
+
+ // Cross on orb
+ using var crossBrush = new SolidBrush(gold);
+ g.FillRectangle(crossBrush, crossX - crossSize * 0.08f, crossY - crossSize * 0.5f, crossSize * 0.16f, crossSize * 0.6f);
+ g.FillRectangle(crossBrush, crossX - crossSize * 0.25f, crossY - crossSize * 0.3f, crossSize * 0.5f, crossSize * 0.12f);
+
+ // Crown jewels
+ float jewelSize = crownW * 0.055f;
+ using var rubyBrush = new SolidBrush(Color.FromArgb(180, 20, 40));
+ using var sapphireBrush = new SolidBrush(Color.FromArgb(30, 60, 150));
+ using var emeraldBrush = new SolidBrush(Color.FromArgb(30, 120, 60));
+
+ // Band jewels
+ g.FillEllipse(rubyBrush, crownX + crownW * 0.2f, crownY + crownH * 0.65f, jewelSize, jewelSize);
+ g.FillEllipse(sapphireBrush, crownX + crownW * 0.4f, crownY + crownH * 0.65f, jewelSize, jewelSize);
+ g.FillEllipse(emeraldBrush, crownX + crownW * 0.5f - jewelSize / 2, crownY + crownH * 0.62f, jewelSize * 1.2f, jewelSize * 1.2f);
+ g.FillEllipse(sapphireBrush, crownX + crownW * 0.6f, crownY + crownH * 0.65f, jewelSize, jewelSize);
+ g.FillEllipse(rubyBrush, crownX + crownW * 0.8f - jewelSize, crownY + crownH * 0.65f, jewelSize, jewelSize);
+
+ // Jewel highlights
+ using var jewelHighlight = new SolidBrush(Color.FromArgb(100, 255, 255, 255));
+ g.FillEllipse(jewelHighlight, crownX + crownW * 0.5f - jewelSize * 0.3f, crownY + crownH * 0.64f, jewelSize * 0.3f, jewelSize * 0.3f);
+
+ // Royal sword (behind shoulder)
+ DrawRoyalSword(g, half.X + half.Width * 0.06f, half.Y + half.Height * 0.02f, half.Width * 0.12f, half.Height * 0.95f,
+ gold, darkGold, outlinePen, thinPen);
+
+ g.Restore(state);
+ }
+
+ private static void DrawKingEye(Graphics g, float x, float y, float w, float h, Pen thinPen)
+ {
+ using var whiteBrush = new SolidBrush(Color.FromArgb(250, 250, 250));
+ g.FillEllipse(whiteBrush, x, y, w, h);
+
+ using var irisBrush = new SolidBrush(Color.FromArgb(70, 55, 45));
+ g.FillEllipse(irisBrush, x + w * 0.28f, y + h * 0.1f, w * 0.45f, h * 0.8f);
+
+ using var pupilBrush = new SolidBrush(Color.Black);
+ g.FillEllipse(pupilBrush, x + w * 0.38f, y + h * 0.22f, w * 0.25f, h * 0.56f);
+
+ using var highlightBrush = new SolidBrush(Color.White);
+ g.FillEllipse(highlightBrush, x + w * 0.35f, y + h * 0.18f, w * 0.12f, h * 0.25f);
+
+ g.DrawEllipse(thinPen, x, y, w, h);
+ }
+
+ private static void DrawFleurDeLis(Graphics g, float x, float y, float size, Color gold, Pen outlinePen)
+ {
+ using var goldBrush = new SolidBrush(gold);
+
+ // Center petal
+ PointF[] center = {
+ new PointF(x, y + size),
+ new PointF(x - size * 0.15f, y + size * 0.3f),
+ new PointF(x, y - size * 0.2f),
+ new PointF(x + size * 0.15f, y + size * 0.3f)
+ };
+ g.FillPolygon(goldBrush, center);
+
+ // Left petal
+ PointF[] left = {
+ new PointF(x - size * 0.1f, y + size * 0.5f),
+ new PointF(x - size * 0.4f, y),
+ new PointF(x - size * 0.35f, y + size * 0.6f)
+ };
+ g.FillPolygon(goldBrush, left);
+
+ // Right petal
+ PointF[] right = {
+ new PointF(x + size * 0.1f, y + size * 0.5f),
+ new PointF(x + size * 0.4f, y),
+ new PointF(x + size * 0.35f, y + size * 0.6f)
+ };
+ g.FillPolygon(goldBrush, right);
+ }
+
+ private static void DrawRoyalSword(Graphics g, float x, float y, float w, float h, Color gold, Color darkGold, Pen outlinePen, Pen thinPen)
+ {
+ // Blade with gradient
+ using var bladeGradient = new LinearGradientBrush(
+ new RectangleF(x, y, w, h * 0.7f),
+ Color.FromArgb(230, 235, 240), Color.FromArgb(180, 185, 195), 0f);
+
+ PointF[] blade = {
+ new PointF(x + w * 0.35f, y),
+ new PointF(x + w * 0.65f, y),
+ new PointF(x + w * 0.6f, y + h * 0.65f),
+ new PointF(x + w * 0.4f, y + h * 0.65f)
+ };
+ g.FillPolygon(bladeGradient, blade);
+ g.DrawPolygon(outlinePen, blade);
+
+ // Blade center line (fuller)
+ using var fullerPen = new Pen(Color.FromArgb(60, 100, 100, 100), thinPen.Width);
+ g.DrawLine(fullerPen, x + w * 0.5f, y + h * 0.05f, x + w * 0.5f, y + h * 0.55f);
+
+ // Elaborate crossguard
+ using var guardGradient = new LinearGradientBrush(
+ new RectangleF(x - w * 0.3f, y + h * 0.63f, w * 1.6f, h * 0.06f),
+ Color.FromArgb(255, 223, 120), gold, 90f);
+ RectangleF guard = new RectangleF(x - w * 0.2f, y + h * 0.64f, w * 1.4f, h * 0.04f);
+ g.FillRectangle(guardGradient, guard);
+ g.DrawRectangle(outlinePen, guard.X, guard.Y, guard.Width, guard.Height);
+
+ // Guard ends (quillons)
+ using var goldBrush = new SolidBrush(gold);
+ g.FillEllipse(goldBrush, x - w * 0.3f, y + h * 0.635f, w * 0.15f, h * 0.05f);
+ g.FillEllipse(goldBrush, x + w * 1.15f, y + h * 0.635f, w * 0.15f, h * 0.05f);
+
+ // Handle (grip) with wire wrapping
+ using var gripGradient = new LinearGradientBrush(
+ new RectangleF(x + w * 0.35f, y + h * 0.68f, w * 0.3f, h * 0.2f),
+ darkGold, Color.FromArgb(120, 85, 30), 0f);
+ RectangleF grip = new RectangleF(x + w * 0.38f, y + h * 0.68f, w * 0.24f, h * 0.18f);
+ g.FillRectangle(gripGradient, grip);
+ g.DrawRectangle(outlinePen, grip.X, grip.Y, grip.Width, grip.Height);
+
+ // Wire wrapping
+ using var wirePen = new Pen(gold, thinPen.Width * 0.7f);
+ for (float wy = grip.Y + h * 0.02f; wy < grip.Bottom - h * 0.01f; wy += h * 0.025f)
+ {
+ g.DrawLine(wirePen, grip.X, wy, grip.Right, wy + h * 0.01f);
+ }
+
+ // Pommel
+ using var pommelGradient = new LinearGradientBrush(
+ new RectangleF(x + w * 0.3f, y + h * 0.85f, w * 0.4f, w * 0.4f),
+ Color.FromArgb(255, 223, 120), gold, 135f);
+ g.FillEllipse(pommelGradient, x + w * 0.32f, y + h * 0.86f, w * 0.36f, w * 0.36f);
+ g.DrawEllipse(outlinePen, x + w * 0.32f, y + h * 0.86f, w * 0.36f, w * 0.36f);
+
+ // Jewel in pommel
+ using var jewelBrush = new SolidBrush(Color.FromArgb(150, 20, 40));
+ float jewelSize = w * 0.12f;
+ g.FillEllipse(jewelBrush, x + w * 0.5f - jewelSize / 2, y + h * 0.88f, jewelSize, jewelSize);
+ }
+
private GraphicsPath RoundedRectangle(Rectangle r, int d)
{
GraphicsPath path = new GraphicsPath();
diff --git a/CSharpBible/Games/CreateCards/Model/CardDrawDef.cs b/CSharpBible/Games/CreateCards/Model/CardDrawDef.cs
index d1ed02f54..e40f45257 100644
--- a/CSharpBible/Games/CreateCards/Model/CardDrawDef.cs
+++ b/CSharpBible/Games/CreateCards/Model/CardDrawDef.cs
@@ -1,4 +1,5 @@
-using System.Drawing;
+using System;
+using System.Drawing;
namespace CreateCards.Model
{
@@ -12,6 +13,10 @@ public class CardDrawDef
public PointF[] PntVals = new[] { new PointF(hOffs, vOffs), new PointF(hOffs, 1f-vOffs), new PointF(1f-hOffs, vOffs), new PointF(1f-hOffs, 1f- vOffs) };
public PointF[] PntSVals = new[] { new PointF(hOffs, vOffs*2), new PointF(hOffs, 1f - vOffs*2), new PointF(1f-hOffs, vOffs*2), new PointF(1f-hOffs, 1f - vOffs*2) };
public PointF[] PntSuits = { };
+
+ // Optional custom drawing callback for face cards or other special layouts
+ public Action? CustomDraw;
+
public CardDrawDef(string _pv,double _ss=0.2d) {
PrintValue = _pv; SuitSize = _ss;
}
diff --git a/CSharpBible/Games/DetectiveGame.Console/DetectiveGame.Console.csproj b/CSharpBible/Games/DetectiveGame.Console/DetectiveGame.Console.csproj
index 874cdeb66..645c746ed 100644
--- a/CSharpBible/Games/DetectiveGame.Console/DetectiveGame.Console.csproj
+++ b/CSharpBible/Games/DetectiveGame.Console/DetectiveGame.Console.csproj
@@ -7,6 +7,11 @@
enable
latest
+
+
+
+
+
@@ -15,7 +20,11 @@
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/DetectiveGame.Console/ViewModels/GameViewModel.cs b/CSharpBible/Games/DetectiveGame.Console/ViewModels/GameViewModel.cs
index 68246ebdb..0d211d610 100644
--- a/CSharpBible/Games/DetectiveGame.Console/ViewModels/GameViewModel.cs
+++ b/CSharpBible/Games/DetectiveGame.Console/ViewModels/GameViewModel.cs
@@ -26,7 +26,7 @@ public partial class GameViewModel : ObservableObject, IGameViewModel
[ObservableProperty]
private string _currentTitle = "Detektivspiel";
- public bool CanInteract => _state != null && !_state.Finished;
+ public bool CanInteract => State != null && !State.Finished;
public Action DisplayHelp { get ; set; }
@@ -42,7 +42,8 @@ private void Start()
Players.Clear();
History.Clear();
State = ((IGameSetup)_service).CreateNew(new[] { "Alice", "Bob", "Carol" });
- foreach (var p in _state.Players)
+ if (State != null)
+ foreach (var p in State.Players)
Players.Add(p.Name);
History.Add("Spiel gestartet");
UpdateTitle();
@@ -51,22 +52,22 @@ private void Start()
[RelayCommand(CanExecute = nameof(CanInteract))]
private void Suggest()
{
- if (_state == null) return;
- var cur = State.Players[_state.CurrentPlayerIndex];
- var person = GameData.Persons.First();
- var weapon = GameData.Weapons.First();
- var room = GameData.Rooms.First();
- var sug = _service.MakeSuggestion(_state, cur.Id, person, weapon, room);
- History.Add($"V: {cur.Name}: {person.Name}/{weapon.Name}/{room.Name} -> {(sug.RefutingPlayerId is int id ? $"von {_state.Players.First(p=>p.Id==id).Name}" : "Keiner")}");
+ if (State == null) return;
+ var cur = State.Players[State.CurrentPlayerIndex];
+ var person = GameData.Persons[0];
+ var weapon = GameData.Weapons[0];
+ var room = GameData.Rooms[0];
+ var sug = _service.MakeSuggestion(State, cur.Id, person, weapon, room);
+ History.Add($"V: {cur.Name}: {person.Name}/{weapon.Name}/{room.Name} -> {(sug.RefutingPlayerId is int id ? $"von {State.Players.First(p=>p.Id==id).Name}" : "Keiner")}");
UpdateTitle();
}
[RelayCommand(CanExecute = nameof(CanInteract))]
private void Accuse()
{
- if (_state == null) return;
- var cur = State.Players[_state.CurrentPlayerIndex];
- var ok = _service.MakeAccusation(_state, cur.Id, GameData.Persons.First(), GameData.Weapons.First(), GameData.Rooms.First());
+ if (State == null) return;
+ var cur = State.Players[State.CurrentPlayerIndex];
+ var ok = _service.MakeAccusation(State, cur.Id, GameData.Persons.First(), GameData.Weapons.First(), GameData.Rooms.First());
History.Add(ok ? $"{cur.Name} gewinnt" : $"{cur.Name} falsch (inaktiv)");
UpdateTitle();
}
@@ -90,9 +91,9 @@ private void UpdateTitle()
if (State == null)
CurrentTitle = "Detektivspiel";
else if (State.Finished)
- CurrentTitle = $"Ende Sieger {_state.WinnerPlayerId}";
+ CurrentTitle = $"Ende Sieger {State.WinnerPlayerId}";
else
- CurrentTitle = $"Zug: {_state.Players[_state.CurrentPlayerIndex].Name}";
+ CurrentTitle = $"Zug: {State.Players[State.CurrentPlayerIndex].Name}";
}
}
diff --git a/CSharpBible/Games/DetectiveGame.Console/Views/SuggestionDialog.cs b/CSharpBible/Games/DetectiveGame.Console/Views/SuggestionDialog.cs
index da84771cc..89d796b9f 100644
--- a/CSharpBible/Games/DetectiveGame.Console/Views/SuggestionDialog.cs
+++ b/CSharpBible/Games/DetectiveGame.Console/Views/SuggestionDialog.cs
@@ -104,6 +104,6 @@ public void Hide()
public void Show()
{
Visible = true;
- (Parent as IGroupControl).BringToFront(this);
+ (Parent as IGroupControl)?.BringToFront(this);
}
}
diff --git a/CSharpBible/Games/DetectiveGame.Engine/DetectiveGame.Engine.csproj b/CSharpBible/Games/DetectiveGame.Engine/DetectiveGame.Engine.csproj
index 061486838..01e73ea11 100644
--- a/CSharpBible/Games/DetectiveGame.Engine/DetectiveGame.Engine.csproj
+++ b/CSharpBible/Games/DetectiveGame.Engine/DetectiveGame.Engine.csproj
@@ -6,4 +6,9 @@
latest
true
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/DetectiveGame.Tests/DetectiveGame.Tests.csproj b/CSharpBible/Games/DetectiveGame.Tests/DetectiveGame.Tests.csproj
index 16fd768dc..17c22cb15 100644
--- a/CSharpBible/Games/DetectiveGame.Tests/DetectiveGame.Tests.csproj
+++ b/CSharpBible/Games/DetectiveGame.Tests/DetectiveGame.Tests.csproj
@@ -5,10 +5,15 @@
enable
-
-
-
-
+
+
+
+
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -16,4 +21,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/DetectiveGame.Tests/SetupTests.cs b/CSharpBible/Games/DetectiveGame.Tests/SetupTests.cs
index a277a041c..2ed21f277 100644
--- a/CSharpBible/Games/DetectiveGame.Tests/SetupTests.cs
+++ b/CSharpBible/Games/DetectiveGame.Tests/SetupTests.cs
@@ -12,7 +12,7 @@ public void Distribution_Is_Fair()
var svc = new GameService();
var state = svc.CreateNew(new[] { "A", "B", "C", "D" });
var counts = state.Players.Select(p => p.Hand.Count).ToList();
- Assert.IsTrue(counts.Max() - counts.Min() <= 1);
+ Assert.IsLessThanOrEqualTo(1, counts.Max() - counts.Min());
// total cards should be 27 - 3 = 24
Assert.AreEqual(24, counts.Sum());
}
@@ -24,9 +24,9 @@ public void Solution_Cards_Not_In_Hands()
var state = svc.CreateNew(new[] { "A", "B", "C" });
foreach (var p in state.Players)
{
- Assert.IsFalse(p.Hand.Contains(state.Solution.Person));
- Assert.IsFalse(p.Hand.Contains(state.Solution.Weapon));
- Assert.IsFalse(p.Hand.Contains(state.Solution.Room));
+ Assert.DoesNotContain(state.Solution.Person, p.Hand);
+ Assert.DoesNotContain(state.Solution.Weapon, p.Hand);
+ Assert.DoesNotContain(state.Solution.Room, p.Hand);
}
}
}
\ No newline at end of file
diff --git a/CSharpBible/Games/DetectiveGame.Wpf/DetectiveGame.Wpf.csproj b/CSharpBible/Games/DetectiveGame.Wpf/DetectiveGame.Wpf.csproj
index fbee800a3..6139114ef 100644
--- a/CSharpBible/Games/DetectiveGame.Wpf/DetectiveGame.Wpf.csproj
+++ b/CSharpBible/Games/DetectiveGame.Wpf/DetectiveGame.Wpf.csproj
@@ -8,9 +8,12 @@
latest
-
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/Directory.Packages.props b/CSharpBible/Games/Directory.Packages.props
new file mode 100644
index 000000000..07fa7bc83
--- /dev/null
+++ b/CSharpBible/Games/Directory.Packages.props
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/Galaxia_Base/Models/CorActions/DoubleJump.cs b/CSharpBible/Games/Galaxia_Base/Models/CorActions/DoubleJump.cs
index c095cbafe..7f154a09c 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/CorActions/DoubleJump.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/CorActions/DoubleJump.cs
@@ -16,7 +16,7 @@ public class DoubleJump : JumpAction, ICorAction
///
/// Das Ziel-Sternensystem fr den Hyperjump.
///
- public IStarsystem TargetStarsystem { get; }
+ public IStarsystem? TargetStarsystem { get; }
///
/// Erstellt eine neue DoubleJump-Aktion.
@@ -24,7 +24,7 @@ public class DoubleJump : JumpAction, ICorAction
/// Die ausfhrende Corporation.
/// Die springende Flotte.
/// Das Ziel-Sternensystem.
- public DoubleJump(ICorporation corporation, IFleet fleet1, IFleet fleet2, IStarsystem targetStarsystem):base(corporation,fleet1)
+ public DoubleJump(ICorporation corporation, IFleet fleet1, IFleet fleet2, IStarsystem? targetStarsystem):base(corporation,fleet1)
{
Fleet2 = fleet2;
TargetStarsystem = targetStarsystem;
@@ -37,7 +37,7 @@ public DoubleJump(ICorporation corporation, IFleet fleet1, IFleet fleet2, IStars
public override bool Execute()
{
// berprfe, ob die Flotte zur Corporation gehrt und sich im Hyperspace befindet
- if (Fleet.Owner != Corporation || Fleet.Container is not IHyperSlot hs )
+ if (Fleet?.Owner != Corporation || Fleet.Container is not IHyperSlot hs )
return false;
// berprfe, ob die Flotte zur Corporation gehrt und sich im Hyperspace befindet
@@ -58,7 +58,7 @@ public override bool Execute()
// Die Flotte verlsst den HyperSlot und wird dem Zielsystem zugewiesen
// Dies kann je nach Implementierung variieren
TargetStarsystem.Sector.SetFleet(Fleet);
- TargetStarsystem.Sector.Fleet.Join(Fleet2);
+ TargetStarsystem.Sector.Fleet?.Join(Fleet2);
TargetStarsystem.SetFleet(Fleet);
return true;
}
diff --git a/CSharpBible/Games/Galaxia_Base/Models/CorActions/EmbarkFleet.cs b/CSharpBible/Games/Galaxia_Base/Models/CorActions/EmbarkFleet.cs
index 11ce31eff..8a3321cbe 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/CorActions/EmbarkFleet.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/CorActions/EmbarkFleet.cs
@@ -25,7 +25,7 @@ public class EmbarkFleet : ICorAction
///
/// Das Sternensystem, aus dem die Flotte startet.
///
- public IStarsystem SourceStarsystem { get; }
+ public IStarsystem? SourceStarsystem { get; }
///
/// Erstellt eine neue EmbarkFleet-Aktion.
@@ -33,7 +33,7 @@ public class EmbarkFleet : ICorAction
/// Die ausfhrende Corporation.
/// Die einzuschiffende Flotte.
/// Das Start-Sternensystem.
- public EmbarkFleet(ICorporation corporation, IFleet fleet, IStarsystem sourceStarsystem,float fleetSize =0f)
+ public EmbarkFleet(ICorporation corporation, IFleet? fleet, IStarsystem? sourceStarsystem,float fleetSize =0f)
{
Corporation = corporation;
Fleet = fleet;
@@ -52,13 +52,13 @@ public bool Execute()
return false;
// Versuche, die Flotte ins Hyperspace-System einzuschiffen
- if ((FleetSize > 1f) && (Fleet.Size > FleetSize))
+ if ((FleetSize > 1f) && (Fleet!.Size > FleetSize))
{
// Nicht genug Platz in den HyperSlots
- return Corporation.hyperspace.Embark(Fleet.Split(FleetSize));
+ return Corporation.hyperspace.Embark(Fleet.Split(FleetSize)!);
}
else
- return Corporation.hyperspace.Embark(Fleet);
+ return Corporation.hyperspace.Embark(Fleet!);
}
}
}
\ No newline at end of file
diff --git a/CSharpBible/Games/Galaxia_Base/Models/CorActions/JumpAction.cs b/CSharpBible/Games/Galaxia_Base/Models/CorActions/JumpAction.cs
index fd1c80e13..5a07e16ba 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/CorActions/JumpAction.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/CorActions/JumpAction.cs
@@ -1,11 +1,10 @@
using Galaxia.Models.Interfaces;
-namespace Galaxia.Models.CorActions
+namespace Galaxia.Models.CorActions;
+
+public abstract class JumpAction(ICorporation corporation, IFleet? fleet) : ICorAction
{
- public abstract class JumpAction(ICorporation corporation, IFleet? fleet) : ICorAction
- {
- public ICorporation Corporation => corporation;
- public IFleet? Fleet => fleet;
- public abstract bool Execute();
- }
+ public ICorporation Corporation => corporation;
+ public IFleet? Fleet => fleet;
+ public abstract bool Execute();
}
\ No newline at end of file
diff --git a/CSharpBible/Games/Galaxia_Base/Models/CorActions/SingleJump.cs b/CSharpBible/Games/Galaxia_Base/Models/CorActions/SingleJump.cs
index 14e33a12b..221703672 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/CorActions/SingleJump.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/CorActions/SingleJump.cs
@@ -8,20 +8,11 @@ namespace Galaxia.Models.CorActions
///
public class SingleJump : JumpAction, ICorAction
{
- ///
- /// Die Corporation, die die Aktion ausfhrt.
- ///
- public ICorporation Corporation { get; }
-
- ///
- /// Die Flotte, die den Hyperjump ausfhren soll.
- ///
- public IFleet Fleet { get; }
///
/// Das Ziel-Sternensystem fr den Hyperjump.
///
- public IStarsystem TargetStarsystem { get; }
+ public IStarsystem? TargetStarsystem { get; }
///
/// Erstellt eine neue SingleJump-Aktion.
@@ -29,7 +20,7 @@ public class SingleJump : JumpAction, ICorAction
/// Die ausfhrende Corporation.
/// Die springende Flotte.
/// Das Ziel-Sternensystem.
- public SingleJump(ICorporation corporation, IFleet fleet, IStarsystem targetStarsystem):base(corporation,fleet)
+ public SingleJump(ICorporation corporation, IFleet? fleet, IStarsystem? targetStarsystem):base(corporation,fleet)
{
TargetStarsystem = targetStarsystem;
}
@@ -41,7 +32,7 @@ public SingleJump(ICorporation corporation, IFleet fleet, IStarsystem targetStar
public override bool Execute()
{
// berprfe, ob die Flotte zur Corporation gehrt und sich im Hyperspace befindet
- if (Fleet.Owner != Corporation || Fleet.Container is not IHyperSlot hs )
+ if (Fleet?.Owner != Corporation || Fleet.Container is not IHyperSlot hs )
return false;
// berprfe, ob das Zielsystem erreichbar ist (optional, je nach Spielmechanik)
diff --git a/CSharpBible/Games/Galaxia_Base/Models/Corporation.cs b/CSharpBible/Games/Galaxia_Base/Models/Corporation.cs
index 9e1b59929..a924286a8 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/Corporation.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/Corporation.cs
@@ -77,7 +77,7 @@ public IList GetPossibleActions()
// Test if a double jump is possible (2 ships in hyperspace and combined reachable sectors)
if (!Actions.Any(a => a is JumpAction) && hyperspace.CombReachableSectors().Count() > 0)
{
- possibleActions.Add(new DoubleJump(this, hyperspace.HyperSlots[0].Fleet, hyperspace.HyperSlots[1].Fleet, null));
+ possibleActions.Add(new DoubleJump(this, hyperspace.HyperSlots[0].Fleet!, hyperspace.HyperSlots[1].Fleet!, null));
}
// test if a Hyperslot is free or gets free this turn -> Embark is possible
diff --git a/CSharpBible/Games/Galaxia_Base/Models/Interfaces/ICorAction.cs b/CSharpBible/Games/Galaxia_Base/Models/Interfaces/ICorAction.cs
index d93c5e527..ae19db31d 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/Interfaces/ICorAction.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/Interfaces/ICorAction.cs
@@ -7,7 +7,7 @@ public interface ICorAction
///
/// The corporation.
ICorporation Corporation { get; }
- IFleet Fleet { get; }
+ IFleet? Fleet { get; }
///
/// Executes this instance.
diff --git a/CSharpBible/Games/Galaxia_Base/Models/Interfaces/Point3d.cs b/CSharpBible/Games/Galaxia_Base/Models/Interfaces/Point3d.cs
index e24f3e442..da9f03e68 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/Interfaces/Point3d.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/Interfaces/Point3d.cs
@@ -2,9 +2,11 @@
namespace Galaxia.Models.Interfaces;
+#pragma warning disable CS0659 // Typ überschreibt Object.Equals(object o), überschreibt jedoch nicht Object.GetHashCode()
public struct Point3d
+#pragma warning restore CS0659 // Typ überschreibt Object.Equals(object o), überschreibt jedoch nicht Object.GetHashCode()
{
- internal static readonly Point3d Zero;
+ internal static readonly Point3d Zero=new();
public int X { get; }
public int Y { get; }
diff --git a/CSharpBible/Games/Galaxia_Base/Models/Starsystem.cs b/CSharpBible/Games/Galaxia_Base/Models/Starsystem.cs
index d47c69bc5..ad5634c7c 100644
--- a/CSharpBible/Games/Galaxia_Base/Models/Starsystem.cs
+++ b/CSharpBible/Games/Galaxia_Base/Models/Starsystem.cs
@@ -41,7 +41,7 @@ public bool SetFleet(IFleet? fleet)
if (Fleet != null)
{
if (!Fleet.Owner.Stars.Contains(this) && Fleet.Owner.Home != this)
- fleet.Owner.Stars.Remove(this);
+ Fleet.Owner.Stars.Remove(this);
}
Fleet = fleet;
diff --git a/CSharpBible/Games/Galaxia_BaseTests/Galaxia_BaseTests.csproj b/CSharpBible/Games/Galaxia_BaseTests/Galaxia_BaseTests.csproj
index 73b2e0cba..a994bb297 100644
--- a/CSharpBible/Games/Galaxia_BaseTests/Galaxia_BaseTests.csproj
+++ b/CSharpBible/Games/Galaxia_BaseTests/Galaxia_BaseTests.csproj
@@ -9,9 +9,9 @@
-
-
-
+
+
+
@@ -22,4 +22,9 @@
+
+
+
+
+
diff --git a/CSharpBible/Games/Galaxia_BaseTests/Models/SpaceTests.cs b/CSharpBible/Games/Galaxia_BaseTests/Models/SpaceTests.cs
index 21ddb7529..96a06a301 100644
--- a/CSharpBible/Games/Galaxia_BaseTests/Models/SpaceTests.cs
+++ b/CSharpBible/Games/Galaxia_BaseTests/Models/SpaceTests.cs
@@ -20,17 +20,17 @@ public void InitializeTest()
rnd.Next(Arg.Any()).Returns(x => _rnd++ % x.ArgAt(0));
space.Initialize();
Assert.IsNotNull(space.Sectors);
- Assert.AreEqual(24, space.Sectors.Count);
+ Assert.HasCount(24, space.Sectors);
foreach (var sector in space.Sectors.Values)
{
Assert.IsNotNull(sector);
Assert.IsNotNull(sector.Starsystems);
- Assert.AreEqual(2, sector.Starsystems.Count);
+ Assert.HasCount(2, sector.Starsystems);
foreach (var star in sector.Starsystems)
{
Assert.IsNotNull(star);
Assert.IsFalse(string.IsNullOrEmpty(star.Name));
- Assert.IsTrue(NamingHelper.existingNames.Contains(star.Name));
+ Assert.Contains(star.Name, NamingHelper.existingNames);
Debug.WriteLine($"Star System: {star.Name} at {star.Position.X},{star.Position.Y},{star.Position.Z} pop:{star.Population} res:{star.Resources}");
}
}
diff --git a/CSharpBible/Games/Galaxia_UI.Tests/Galaxia_UI.Tests.csproj b/CSharpBible/Games/Galaxia_UI.Tests/Galaxia_UI.Tests.csproj
index 4817a8c49..f021ee2da 100644
--- a/CSharpBible/Games/Galaxia_UI.Tests/Galaxia_UI.Tests.csproj
+++ b/CSharpBible/Games/Galaxia_UI.Tests/Galaxia_UI.Tests.csproj
@@ -4,8 +4,16 @@
false
enable
+
+
+
+
+
-
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/Galaxia_UI.Tests/ViewModels/MainViewModelTests.cs b/CSharpBible/Games/Galaxia_UI.Tests/ViewModels/MainViewModelTests.cs
index 968e7742d..4b1b7e464 100644
--- a/CSharpBible/Games/Galaxia_UI.Tests/ViewModels/MainViewModelTests.cs
+++ b/CSharpBible/Games/Galaxia_UI.Tests/ViewModels/MainViewModelTests.cs
@@ -30,7 +30,7 @@ public void Initialize_Populates_Sectors()
vm.InitializeCommand.Execute(null);
- Assert.IsTrue(vm.Sectors.Count > 0, "Sektoren sollten nach Initialisierung vorhanden sein.");
+ Assert.IsNotEmpty(vm.Sectors, "Sektoren sollten nach Initialisierung vorhanden sein.");
}
[TestMethod]
diff --git a/CSharpBible/Games/Galaxia_UI/Galaxia_UI.csproj b/CSharpBible/Games/Galaxia_UI/Galaxia_UI.csproj
index 8153d6a73..ee0a2795c 100644
--- a/CSharpBible/Games/Galaxia_UI/Galaxia_UI.csproj
+++ b/CSharpBible/Games/Galaxia_UI/Galaxia_UI.csproj
@@ -14,10 +14,15 @@
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSharpBible/Games/Game_Base/Game_Base.csproj b/CSharpBible/Games/Game_Base/Game_Base.csproj
index 81b845c47..f5968e276 100644
--- a/CSharpBible/Games/Game_Base/Game_Base.csproj
+++ b/CSharpBible/Games/Game_Base/Game_Base.csproj
@@ -2,16 +2,28 @@
Library
- net481;net48;net472;net462;net6.0;net7.0;net8.0;net9.0
+ net481;net48;net472;net462;net6.0;net7.0;net8.0
+ AnyCPU;x64
-
-
+
+ $(TargetFrameworks);net9.0
+
+
+ $(TargetFrameworks);net10.0
+
+
+
+
+
+
+
+
diff --git a/CSharpBible/Games/Game_Base/Model/Playfield2D.cs b/CSharpBible/Games/Game_Base/Model/Playfield2D.cs
index bcba6d9d2..7135267e2 100644
--- a/CSharpBible/Games/Game_Base/Model/Playfield2D.cs
+++ b/CSharpBible/Games/Game_Base/Model/Playfield2D.cs
@@ -109,7 +109,7 @@ public T? this[Point P]
po.Parent = (IHasChildren
-
+
+
+
+
diff --git a/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleLnx.csproj b/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleLnx.csproj
index a1746f9c2..b86e174c3 100644
--- a/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleLnx.csproj
+++ b/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleLnx.csproj
@@ -11,11 +11,13 @@
-
-
+
+
+
+
diff --git a/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleWin.csproj b/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleWin.csproj
index 558e581bc..3ce8e3c75 100644
--- a/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleWin.csproj
+++ b/CSharpBible/Games/HexaBan_Console/HexaBan_ConsoleWin.csproj
@@ -11,11 +11,13 @@
-
-
+
+
+
+
diff --git a/CSharpBible/Games/HexaBan_Console/Properties/launchSettings.json b/CSharpBible/Games/HexaBan_Console/Properties/launchSettings.json
new file mode 100644
index 000000000..30d002368
--- /dev/null
+++ b/CSharpBible/Games/HexaBan_Console/Properties/launchSettings.json
@@ -0,0 +1,14 @@
+{
+ "profiles": {
+ "HexaBan_Console": {
+ "commandName": "Project"
+ },
+ "Container (Dockerfile)": {
+ "commandName": "Docker"
+ },
+ "WSL": {
+ "commandName": "WSL2",
+ "distributionName": ""
+ }
+ }
+}
\ No newline at end of file
diff --git a/CSharpBible/Games/MVVM_TiledDisplay_net/MVVM_TiledDisplay_net.csproj b/CSharpBible/Games/MVVM_TiledDisplay_net/MVVM_TiledDisplay_net.csproj
index 14ad9931c..695194ea0 100644
--- a/CSharpBible/Games/MVVM_TiledDisplay_net/MVVM_TiledDisplay_net.csproj
+++ b/CSharpBible/Games/MVVM_TiledDisplay_net/MVVM_TiledDisplay_net.csproj
@@ -18,10 +18,14 @@
-
+
+
+
+
+
diff --git a/CSharpBible/Games/MVVM_TiledDisplay_net/View/Converter/TileDataArrToTileDisplay.cs b/CSharpBible/Games/MVVM_TiledDisplay_net/View/Converter/TileDataArrToTileDisplay.cs
index c4150f582..6154af87a 100644
--- a/CSharpBible/Games/MVVM_TiledDisplay_net/View/Converter/TileDataArrToTileDisplay.cs
+++ b/CSharpBible/Games/MVVM_TiledDisplay_net/View/Converter/TileDataArrToTileDisplay.cs
@@ -30,7 +30,7 @@ public class TileDataArrToTileDisplay : IValueConverter
/// Gets or sets the background.
///
/// The background.
- public Style ItemStyle { get; set; } = default;
+ public Style? ItemStyle { get; set; } = default;
public Brush background { get; set; } = Brushes.DarkBlue;
///
/// Gets or sets the size of the tile.
diff --git a/CSharpBible/Games/MVVM_TiledDisplay_net/ViewModels/MainViewViewModel.cs b/CSharpBible/Games/MVVM_TiledDisplay_net/ViewModels/MainViewViewModel.cs
index fdcacc6a8..b5ce765a2 100644
--- a/CSharpBible/Games/MVVM_TiledDisplay_net/ViewModels/MainViewViewModel.cs
+++ b/CSharpBible/Games/MVVM_TiledDisplay_net/ViewModels/MainViewViewModel.cs
@@ -11,8 +11,8 @@ namespace MVVM_TiledDisplay.ViewModel
public class MainViewViewModel : BaseViewModel
{
#region Properties
- public DelegateCommand