thorstenalpers · thorstenalpers · Dec 16, 2025 · May 30, 2025 · May 30, 2025 · May 30, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: windows-latest
 
     env:
-      Solution: "src/CleanMyPosts.sln"
+      Solution: "src/CleanMyPosts.slnx"
       Test_Project: "src/Tests/Tests.csproj"
       FORCE_COLOR: "true"
       DOTNET_LOGGING__CONSOLE__COLORBEHAVIOR: Enabled
@@ -30,7 +30,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.x
+        dotnet-version: 10.x
 
     - name: Install .NET Tools (local)
       run: |

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -14,8 +14,8 @@ jobs:
     runs-on: windows-latest
 
     env:
-      Solution: "src/CleanMyPosts.sln"
-      UI_Project: "src/UI/UI.csproj"
+      Solution: "src/CleanMyPosts.slnx"
+      UI_Project: "src/CleanMyPosts/CleanMyPosts.csproj"
       Test_Project: "src/Tests/Tests.csproj"
       Installer_Script: "installer/Installer.iss"
       FORCE_COLOR: "true"
@@ -32,7 +32,7 @@ jobs:
     - name: Install .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.x
+        dotnet-version: 10.x
 
     - name: Install Inno Setup
       run: choco install innosetup --yes
@@ -72,7 +72,8 @@ jobs:
 
     - name: Build Installer x64
       run: |
-        iscc "/DMyAppVersion=${{ env.VERSION }}" "/DMyAppExePath=..\\artifacts\\publish-x64\\*" "${{ env.Installer_Script }}"
+        $exePath = "${{ github.workspace }}\artifacts\publish-x64\CleanMyPosts.exe"
+        iscc "/DMyAppVersion=${{ env.VERSION }}" "/DMyAppExePath=$exePath" "${{ env.Installer_Script }}"
 
     - name: Copy Installer Exe to Artifacts
       run: |

diff --git a/.gitignore b/.gitignore
@@ -370,3 +370,4 @@ installer/Output
 
 github-stats.txt
 /CleanMyPosts.sln.lnk
+/CleanMyPosts.slnx.lnk
diff --git a/release-notes/v2.1.2.md b/release-notes/v2.1.2.md
@@ -0,0 +1,3 @@
+### What's Changed
+
+* Refactoring: Migrated to .NET 10 for improved platform compatibility.
diff --git a/src/CleanMyPosts.sln b/src/CleanMyPosts.sln
diff --git a/src/CleanMyPosts.slnx b/src/CleanMyPosts.slnx
@@ -0,0 +1,16 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="../.editorconfig" />
+    <File Path="../.gitattributes" />
+    <File Path="../.gitignore" />
+    <File Path="../installer/Installer.iss" />
+    <File Path="../LICENSE.txt" />
+    <File Path="../README.md" />
+  </Folder>
+  <Folder Name="/Solution Items/workflows/">
+    <File Path="../.github/workflows/ci.yml" />
+    <File Path="../.github/workflows/deploy-release.yml" />
+  </Folder>
+  <Project Path="Tests/Tests.csproj" />
+  <Project Path="CleanMyPosts/CleanMyPosts.csproj" />
+</Solution>
diff --git a/src/UI/App.xaml → src/CleanMyPosts/App.xaml b/src/UI/App.xaml → src/CleanMyPosts/App.xaml
@@ -1,5 +1,5 @@
 <Application
-    x:Class="CleanMyPosts.UI.App"
+    x:Class="CleanMyPosts.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     DispatcherUnhandledException="OnDispatcherUnhandledException"

diff --git a/src/UI/App.xaml.cs → src/CleanMyPosts/App.xaml.cs b/src/UI/App.xaml.cs → src/CleanMyPosts/App.xaml.cs
@@ -1,13 +1,13 @@
 using System.Windows;
 using System.Windows.Threading;
-using CleanMyPosts.UI.Services;
-using CleanMyPosts.UI.ViewModels;
+using CleanMyPosts.Services;
+using CleanMyPosts.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Serilog;
 
-namespace CleanMyPosts.UI;
+namespace CleanMyPosts;
 
 public partial class App : Application
 {

diff --git a/src/UI/AssemblyInfo.cs → src/CleanMyPosts/AssemblyInfo.cs b/src/UI/AssemblyInfo.cs → src/CleanMyPosts/AssemblyInfo.cs
diff --git a/src/UI/Assets/banner.png → src/CleanMyPosts/Assets/banner.png b/src/UI/Assets/banner.png → src/CleanMyPosts/Assets/banner.png
diff --git a/src/UI/Assets/logo.ico → src/CleanMyPosts/Assets/logo.ico b/src/UI/Assets/logo.ico → src/CleanMyPosts/Assets/logo.ico
diff --git a/src/UI/UI.csproj → src/CleanMyPosts/CleanMyPosts.csproj b/src/UI/UI.csproj → src/CleanMyPosts/CleanMyPosts.csproj
@@ -5,33 +5,37 @@
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ImplicitUsings>enable</ImplicitUsings>
-	<RootNamespace>CleanMyPosts.UI</RootNamespace>
-	<DefaultNamespace>CleanMyPosts.UI</DefaultNamespace>
+	<RootNamespace>CleanMyPosts</RootNamespace>
+	<DefaultNamespace>CleanMyPosts</DefaultNamespace>
 	<ApplicationIcon>Assets\logo.ico</ApplicationIcon>
 	<AssemblyName>CleanMyPosts</AssemblyName>
-	<TargetFramework>net9.0-windows</TargetFramework>
-	<Version>2.0.1</Version>
+	<TargetFramework>net10.0-windows</TargetFramework>
+	<Version>2.1.2</Version>
 	<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 	<AnalysisLevel>latest</AnalysisLevel>
  	<EnableNETAnalyzers>True</EnableNETAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>
+
+	<PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
+	<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
+	<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="5.1.0" />
-    <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.1.0" />
-    <PackageReference Include="MahApps.Metro.IconPacks.Material" Version="5.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.1" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.11" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="6.2.1" />
+    <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="6.2.1" />
+    <PackageReference Include="MahApps.Metro.IconPacks.Material" Version="6.2.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3650.58" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="10.10.0.116381">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="10.16.1.129956">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -43,10 +47,6 @@
 	</AssemblyAttribute>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
 	<Resource Include="Assets\logo.ico">
 	  <CopyToOutputDirectory>Never</CopyToOutputDirectory>

diff --git a/...ontracts/Activation/IActivationHandler.cs → ...ontracts/Activation/IActivationHandler.cs b/...ontracts/Activation/IActivationHandler.cs → ...ontracts/Activation/IActivationHandler.cs
@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Contracts.Activation;
+namespace CleanMyPosts.Contracts.Activation;
 
 public interface IActivationHandler
 {

diff --git a/...UI/Contracts/Services/IAppSetupService.cs → ...ts/Contracts/Services/IAppSetupService.cs b/...UI/Contracts/Services/IAppSetupService.cs → ...ts/Contracts/Services/IAppSetupService.cs
@@ -1,8 +1,8 @@
-using CleanMyPosts.UI.ViewModels;
+using CleanMyPosts.ViewModels;
 using Microsoft.Extensions.Configuration;
 using Serilog;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IAppSetupService
 {

diff --git a/src/Core/Contracts/Services/IFileService.cs → ...yPosts/Contracts/Services/IFileService.cs b/src/Core/Contracts/Services/IFileService.cs → ...yPosts/Contracts/Services/IFileService.cs
@@ -1,4 +1,4 @@
-namespace CleanMyPosts.Core.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IFileService
 {

diff --git a/src/UI/Contracts/Services/IHostService.cs → ...yPosts/Contracts/Services/IHostService.cs b/src/UI/Contracts/Services/IHostService.cs → ...yPosts/Contracts/Services/IHostService.cs
@@ -1,8 +1,8 @@
-using CleanMyPosts.UI.ViewModels;
+using CleanMyPosts.ViewModels;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IHostService
 {

diff --git a/.../Contracts/Services/INavigationService.cs → .../Contracts/Services/INavigationService.cs b/.../Contracts/Services/INavigationService.cs → .../Contracts/Services/INavigationService.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface INavigationService
 {

diff --git a/src/UI/Contracts/Services/IPageService.cs → ...yPosts/Contracts/Services/IPageService.cs b/src/UI/Contracts/Services/IPageService.cs → ...yPosts/Contracts/Services/IPageService.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IPageService
 {

diff --git a/...ontracts/Services/IUserSettingsService.cs → ...ontracts/Services/IUserSettingsService.cs b/...ontracts/Services/IUserSettingsService.cs → ...ontracts/Services/IUserSettingsService.cs
@@ -1,6 +1,6 @@
-using CleanMyPosts.UI.Models;
+using CleanMyPosts.Models;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IUserSettingsService
 {

diff --git a/...Contracts/Services/IWebViewHostService.cs → ...Contracts/Services/IWebViewHostService.cs b/...Contracts/Services/IWebViewHostService.cs → ...Contracts/Services/IWebViewHostService.cs
@@ -1,7 +1,7 @@
-using CleanMyPosts.UI.Models;
+using CleanMyPosts.Models;
 using Microsoft.Web.WebView2.Wpf;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IWebViewHostService
 {

diff --git a/...ntracts/Services/IWindowManagerService.cs → ...ntracts/Services/IWindowManagerService.cs b/...ntracts/Services/IWindowManagerService.cs → ...ntracts/Services/IWindowManagerService.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IWindowManagerService
 {

diff --git a/src/UI/Contracts/Services/IXScriptService.cs → ...sts/Contracts/Services/IXScriptService.cs b/src/UI/Contracts/Services/IXScriptService.cs → ...sts/Contracts/Services/IXScriptService.cs
@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IXScriptService
 {

diff --git a/.../Contracts/ViewModels/INavigationAware.cs → .../Contracts/ViewModels/INavigationAware.cs b/.../Contracts/ViewModels/INavigationAware.cs → .../Contracts/ViewModels/INavigationAware.cs
@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Contracts.ViewModels;
+namespace CleanMyPosts.Contracts.ViewModels;
 
 public interface INavigationAware
 {

diff --git a/src/UI/Contracts/Views/IShellDialogWindow.cs → ...sts/Contracts/Views/IShellDialogWindow.cs b/src/UI/Contracts/Views/IShellDialogWindow.cs → ...sts/Contracts/Views/IShellDialogWindow.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Views;
+namespace CleanMyPosts.Contracts.Views;
 
 public interface IShellDialogWindow
 {

diff --git a/src/UI/Contracts/Views/IShellWindow.cs → ...anMyPosts/Contracts/Views/IShellWindow.cs b/src/UI/Contracts/Views/IShellWindow.cs → ...anMyPosts/Contracts/Views/IShellWindow.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Views;
+namespace CleanMyPosts.Contracts.Views;
 
 public interface IShellWindow
 {

diff --git a/src/UI/Converters/EnumToBooleanConverter.cs → ...osts/Converters/EnumToBooleanConverter.cs b/src/UI/Converters/EnumToBooleanConverter.cs → ...osts/Converters/EnumToBooleanConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace CleanMyPosts.UI.Converters;
+namespace CleanMyPosts.Converters;
 
 public class EnumToBooleanConverter : IValueConverter
 {

diff --git a/src/Core/Exception/CleanMyPostsException.cs → ...Posts/Exceptions/CleanMyPostsException.cs b/src/Core/Exception/CleanMyPostsException.cs → ...Posts/Exceptions/CleanMyPostsException.cs
@@ -1,4 +1,4 @@
-namespace CleanMyPosts.Core.Exception;
+namespace CleanMyPosts.Exceptions;
 
 /// <summary>
 /// Represents errors that occur within the CleanMyPosts system.

diff --git a/src/UI/Extensions/FrameExtensions.cs → ...leanMyPosts/Extensions/FrameExtensions.cs b/src/UI/Extensions/FrameExtensions.cs → ...leanMyPosts/Extensions/FrameExtensions.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Extensions;
+namespace CleanMyPosts.Extensions;
 
 public static class FrameExtensions
 {

diff --git a/.../Extensions/LogViewModelSinkExtensions.cs → .../Extensions/LogViewModelSinkExtensions.cs b/.../Extensions/LogViewModelSinkExtensions.cs → .../Extensions/LogViewModelSinkExtensions.cs
@@ -1,9 +1,9 @@
-using CleanMyPosts.UI.Helpers;
-using CleanMyPosts.UI.ViewModels;
+using CleanMyPosts.Helpers;
+using CleanMyPosts.ViewModels;
 using Serilog;
 using Serilog.Configuration;
 
-namespace CleanMyPosts.UI.Extensions;
+namespace CleanMyPosts.Extensions;
 
 public static class LogViewModelSinkExtensions
 {

diff --git a/src/UI/Extensions/WindowExtensions.cs → ...eanMyPosts/Extensions/WindowExtensions.cs b/src/UI/Extensions/WindowExtensions.cs → ...eanMyPosts/Extensions/WindowExtensions.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Extensions;
+namespace CleanMyPosts.Extensions;
 
 public static class WindowExtensions
 {

diff --git a/src/UI/Helpers/Helper.cs → src/CleanMyPosts/Helpers/Helper.cs b/src/UI/Helpers/Helper.cs → src/CleanMyPosts/Helpers/Helper.cs
@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Helpers;
+namespace CleanMyPosts.Helpers;
 public static class Helper
 {
     public static string CleanJsonResult(string json)

diff --git a/src/UI/Helpers/LogViewModelSink.cs → src/CleanMyPosts/Helpers/LogViewModelSink.cs b/src/UI/Helpers/LogViewModelSink.cs → src/CleanMyPosts/Helpers/LogViewModelSink.cs
@@ -1,9 +1,10 @@
-using System.Text;
-using CleanMyPosts.UI.ViewModels;
+
+using System.Text;
+using CleanMyPosts.ViewModels;
 using Serilog.Core;
 using Serilog.Events;
 
-namespace CleanMyPosts.UI.Helpers;
+namespace CleanMyPosts.Helpers;
 
 public class LogViewModelSink(LogViewModel logViewModel) : ILogEventSink
 {

diff --git a/src/UI/Models/AppConfig.cs → src/CleanMyPosts/Models/AppConfig.cs b/src/UI/Models/AppConfig.cs → src/CleanMyPosts/Models/AppConfig.cs
@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Models;
+namespace CleanMyPosts.Models;
 
 
 public class AppConfig
Original file line number	Diff line number	Diff line change
Expand Up		@@ -370,3 +370,4 @@ installer/Output

		github-stats.txt
		/CleanMyPosts.sln.lnk
		/CleanMyPosts.slnx.lnk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### What's Changed

		* Refactoring: Migrated to .NET 10 for improved platform compatibility.