Develop

.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: |

.github/workflows/deploy-release.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch: # manual trigger
 
 permissions:
-  contents: read
+  contents: write
   pull-requests: write
   checks: write
   id-token: write
@@ -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"
@@ -27,12 +27,13 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
+        token: ${{ secrets.GITHUB_TOKEN }}
         ref: main
 
     - 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 +73,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: |
@@ -81,7 +83,8 @@ jobs:
 
     - name: Clone update-feed branch
       run: |
-        git clone --branch update-feed --single-branch https://github.com/${{ github.repository }} update-feed || mkdir update-feed
+        git fetch origin update-feed || git checkout -b update-feed
+        git switch update-feed
 
     - name: Generate AutoUpdater.NET files using template
       shell: pwsh
@@ -100,14 +103,6 @@ jobs:
           -replace "{{CHANGELOG_URL}}", $changelogUrl 
         $installerXml | Set-Content -Path "artifacts/update-installer.xml" -Encoding UTF8
 
-    - name: Create GitHub App Token
-      id: app-token
-      uses: actions/create-github-app-token@v2.0.5
-      with:
-        app-id: ${{ secrets.GH_APP_ID }}
-        private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-        repositories: CleanMyPosts
-
     - name: Commit and push update-feed branch
       shell: bash
       run: |
@@ -123,13 +118,11 @@ jobs:
           echo "No changes to commit"
         else
           git commit -m "Update for ${{ env.VERSION }}"
-          git push https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/${{ github.repository }} update-feed
+          git push origin update-feed
         fi
 
     - name: Create Git Tag
       run: |
-        git config user.name "github-actions[bot]"
-        git config user.email "github-actions[bot]@users.noreply.github.com"
         git tag -a "v${{ env.VERSION }}" -m "Release v${{ env.VERSION }}"
         git push origin "v${{ env.VERSION }}"
 

.gitignore

@@ -370,3 +370,4 @@ installer/Output
 
 github-stats.txt
 /CleanMyPosts.sln.lnk
+/CleanMyPosts.slnx.lnk

installer/Installer.iss

@@ -2,14 +2,14 @@
 #define MyAppPublisher "Thorsten Alpers"
 #define MyAppURL "https://github.com/thorstenalpers/CleanMyPosts"
 #define MyAppExeName "CleanMyPosts.exe"
-#define MyIconPath "..\src\UI\Assets\logo.ico"
+#define MyIconPath "..\src\CleanMyPosts\Assets\logo.ico"
 
 ; dynamically set in github actions, ifndef use local values
 #ifndef MyAppVersion	
   #define MyAppVersion "0.0.1"
 #endif
 #ifndef MyAppExePath
-  #define MyAppExePath "..\src\UI\bin\Release\net9.0-windows\win-x64\publish\*"
+  #define MyAppExePath "..\src\CleanMyPosts\bin\Release\net10.0-windows\win-x64\publish\*"
 #endif
 
 [Setup]

release-notes/v2.1.2.md

@@ -0,0 +1,3 @@
+### What's Changed
+
+* Refactoring: Migrated to .NET 10 for improved platform compatibility.

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>

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"

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
 {

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>

src/UI/Contracts/Activation/IActivationHandler.cs → src/CleanMyPosts/Contracts/Activation/IActivationHandler.cs

@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Contracts.Activation;
+namespace CleanMyPosts.Contracts.Activation;
 
 public interface IActivationHandler
 {

src/UI/Contracts/Services/IAppSetupService.cs → src/CleanMyPosts/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
 {

src/Core/Contracts/Services/IFileService.cs → src/CleanMyPosts/Contracts/Services/IFileService.cs

@@ -1,4 +1,4 @@
-namespace CleanMyPosts.Core.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IFileService
 {

src/UI/Contracts/Services/IHostService.cs → src/CleanMyPosts/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
 {

src/UI/Contracts/Services/INavigationService.cs → src/CleanMyPosts/Contracts/Services/INavigationService.cs

@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface INavigationService
 {

src/UI/Contracts/Services/IPageService.cs → src/CleanMyPosts/Contracts/Services/IPageService.cs

@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IPageService
 {

src/UI/Contracts/Services/IUserSettingsService.cs → src/CleanMyPosts/Contracts/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
 {

src/UI/Contracts/Services/IWebViewHostService.cs → src/CleanMyPosts/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
 {

src/UI/Contracts/Services/IWindowManagerService.cs → src/CleanMyPosts/Contracts/Services/IWindowManagerService.cs

@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IWindowManagerService
 {

src/UI/Contracts/Services/IXScriptService.cs → src/CleanMyPosts/Contracts/Services/IXScriptService.cs

@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Contracts.Services;
+namespace CleanMyPosts.Contracts.Services;
 
 public interface IXScriptService
 {

src/UI/Contracts/ViewModels/INavigationAware.cs → src/CleanMyPosts/Contracts/ViewModels/INavigationAware.cs

@@ -1,4 +1,4 @@
-namespace CleanMyPosts.UI.Contracts.ViewModels;
+namespace CleanMyPosts.Contracts.ViewModels;
 
 public interface INavigationAware
 {

src/UI/Contracts/Views/IShellDialogWindow.cs → src/CleanMyPosts/Contracts/Views/IShellDialogWindow.cs

@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Views;
+namespace CleanMyPosts.Contracts.Views;
 
 public interface IShellDialogWindow
 {

src/UI/Contracts/Views/IShellWindow.cs → src/CleanMyPosts/Contracts/Views/IShellWindow.cs

@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace CleanMyPosts.UI.Contracts.Views;
+namespace CleanMyPosts.Contracts.Views;
 
 public interface IShellWindow
 {