Merge pull request #226 from PhantomGamers/new-dev

Author: PhantomGamers

.editorconfig

@@ -19,12 +19,12 @@ jobs:
     env:
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-dotnet@v4
+      - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: 10.x
           cache: true
           cache-dependency-path: '**/packages.lock.json'
       - run: dotnet restore --locked-mode

.github/workflows/build.yml

@@ -1,17 +1,19 @@
+exclude: '(?i)(?:^|[\/])external(?:[\/]|$)'
+
 ci:
   skip: [ dotnet-format ]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-added-large-files
       - id: check-json
       - id: check-merge-conflict
       - id: check-toml
       - id: check-yaml
-      - id: end-of-file-fixer
       - id: trailing-whitespace
+        args: [--markdown-linebreak-ext=md]
       - id: check-xml
       - id: detect-private-key
       - id: fix-byte-order-marker
@@ -22,5 +24,5 @@ repos:
       - id: dotnet-format
         name: dotnet-format
         language: system
-        entry: dotnet format --severity info --exclude 'external/' --include
+        entry: dotnet format --severity info --include
         types_or: [ "c#", "vb" ]

.github/workflows/codeql-analysis.yml

@@ -1,36 +1,36 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <NoWarn>NU1507</NoWarn>
-    <AvaloniaVersion>11.2.3</AvaloniaVersion>
+    <AvaloniaVersion>11.3.11</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-    <PackageVersion Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2" />
+    <PackageVersion Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3" />
     <PackageVersion Include="Flurl.Http" Version="4.0.2" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
     <PackageVersion Include="PuppeteerSharp" Version="8.0.0" />
-    <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.6.1" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
     <PackageVersion Include="Semver" Version="3.0.0" />
     <PackageVersion Include="PortableJsonSettingsProvider" Version="0.2.2" />
-    <PackageVersion Include="NLog" Version="5.3.4" />
-    <PackageVersion Include="MinVer" Version="6.0.0">
+    <PackageVersion Include="NLog" Version="6.1.0" />
+    <PackageVersion Include="MinVer" Version="7.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="ErrorProne.NET.CoreAnalyzers" Version="0.7.0-beta.1">
+    <PackageVersion Include="ErrorProne.NET.CoreAnalyzers" Version="0.8.2-beta.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="ErrorProne.NET.Structs" Version="0.6.1-beta.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="FileWatcherEx" Version="2.6.0" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.2.0" />
+    <PackageVersion Include="FileWatcherEx" Version="2.7.0" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="2.5.0" />
     <PackageVersion Include="WindowsShortcutFactory" Version="1.2.0" />
-    <PackageVersion Include="WmiLight" Version="6.9.1" />
+    <PackageVersion Include="WmiLight" Version="7.1.0" />
   </ItemGroup>
-</Project>
+</Project>

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".pre-commit-config.yaml" />
+    <File Path="createpublishedzip.ps1" />
+    <File Path="Directory.Packages.props" />
+    <File Path="README.md" />
+    <File Path="SFPCommon.props" />
+  </Folder>
+  <Folder Name="/Solution Items/.github/">
+    <File Path=".github/dependabot.yml" />
+    <File Path=".github/FUNDING.yml" />
+  </Folder>
+  <Folder Name="/Solution Items/.github/workflows/">
+    <File Path=".github/workflows/build.yml" />
+    <File Path=".github/workflows/publish.yml" />
+  </Folder>
+  <Project Path="SFP/SFP.csproj" />
+  <Project Path="SFP_UI/SFP_UI.csproj" />
+</Solution>

Directory.Packages.props

@@ -1,8 +1,10 @@
 #region
 
 using System.Text.Json.Serialization;
+
 using Flurl;
 using Flurl.Http;
+
 using SFP.Properties;
 
 #endregion
@@ -47,4 +49,4 @@ internal static async Task<BrowserEndpoint> GetBrowserEndpointAsync()
             throw;
         }
     }
-}
+}

SFP.sln

@@ -26,4 +26,4 @@ public class Patch
 public class MillenniumConfig
 {
     [JsonPropertyName("patch")] public IEnumerable<Patch> Patch { get; init; } = [];
-}
+}