Finish v1.26

bcssov · Mar 12, 2024 · d1f5601 · d1f5601
2 parents b4ee19f + d51efef
commit d1f5601
Show file tree

Hide file tree

Showing 174 changed files with 6,947 additions and 4,340 deletions.
diff --git a/Credits/Credits.txt b/Credits/Credits.txt
@@ -28,7 +28,7 @@ license Type:MIT
 
 #########################
 Package:AutoMapper
-Version:12.0.1
+Version:13.0.1
 project URL:https://automapper.org/
 Description:A convention-based object-object mapper.
 licenseUrl:https://licenses.nuget.org/MIT
@@ -126,10 +126,10 @@ license Type:MIT
 
 #########################
 Package:CompareNETObjects
-Version:4.79.0
+Version:4.83.0
 project URL:https://github.com/GregFinzer/Compare-Net-Objects
 Description:What you have been waiting for. Perform a deep compare of any two .NET objects using reflection. Shows the differences between the two objects.
-licenseUrl:https://www.nuget.org/packages/CompareNETObjects/4.77.0/License
+licenseUrl:https://www.nuget.org/packages/CompareNETObjects/4.83.0/License
 license Type:Microsoft Public License (Ms-PL)
 
 #########################
@@ -142,7 +142,7 @@ license Type:MIT
 
 #########################
 Package:DiffPlex
-Version:1.7.1
+Version:1.7.2
 project URL:https://github.com/mmanela/diffplex/
 Description:DiffPlex is a diffing library that allows you to programatically create text diffs. DiffPlex is a fast and tested library.
 licenseUrl:https://licenses.nuget.org/Apache-2.0
@@ -158,7 +158,7 @@ license Type:BSD, Apache, zlib and MIT
 
 #########################
 Package:FluentAssertions
-Version:6.11.0
+Version:6.12.0
 project URL:https://www.fluentassertions.com/
 Description:A very extensive set of extension methods that allow you to more naturally specify the expected outcome of a TDD or
       BDD-style unit tests. Targets .NET Framework 4.7, .NET Core 2.1 and 3.0, .NET 6, as well as .NET Standard 2.0 and 2.1.
@@ -170,11 +170,9 @@ license Type:Apache-2.0
 
 #########################
 Package:FSharp.Core
-Version:7.0.300
+Version:8.0.200
 project URL:https://github.com/dotnet/fsharp
-Description:FSharp.Core redistributables from F# Tools version 12.4.0 For F# 7.0.  Contains code from the F# Software Foundation.
-licenseUrl:https://licenses.nuget.org/MIT
-license Type:MIT
+Description:FSharp.Core redistributables from F# Tools version 12.8.200 For F# 8.0.  Contains code from the F# Software Foundation.
 licenseUrl:https://licenses.nuget.org/MIT
 license Type:MIT
 
@@ -212,7 +210,7 @@ license Type:Apache-2.0
 
 #########################
 Package:Magick.NET-Q8-x64
-Version:13.1.3
+Version:13.6.0
 project URL:https://github.com/dlemstra/Magick.NET
 Description:ImageMagick is a powerful image manipulation library that supports over 100 major file formats (not including sub-formats). With Magick.NET you can use ImageMagick without having to install ImageMagick on your server or desktop. Visit https://github.com/dlemstra/Magick.NET/tree/main/docs before installing to help you decide the best version.
 licenseUrl:https://licenses.nuget.org/Apache-2.0
@@ -252,7 +250,7 @@ license Type:MIT
 
 #########################
 Package:Microsoft.Bcl.AsyncInterfaces
-Version:7.0.0
+Version:8.0.0
 project URL:https://dot.net/
 Description:Provides the IAsyncEnumerable<T> and IAsyncDisposable interfaces and helper types for .NET Standard 2.0. This package is not required starting with .NET Standard 2.1 and .NET Core 3.0.
 
@@ -265,8 +263,8 @@ license Type:MIT
 
 #########################
 Package:Microsoft.NET.Test.Sdk
-Version:17.6.2
-project URL:https://github.com/microsoft/vstest/
+Version:17.9.0
+project URL:https://github.com/microsoft/vstest
 Description:The MSbuild targets and properties for building .NET test projects.
 licenseUrl:https://www.nuget.org/packages/Microsoft.NET.Test.Sdk/17.3.0/License
 license Type:MICROSOFT SOFTWARE LICENSE TERMS
@@ -306,13 +304,19 @@ license Type:Apache-2.0
 
 #########################
 Package:Moq
-Version:4.18.4
-project URL:https://github.com/moq/moq4
+Version:4.20.70
+project URL:https://github.com/moq/moq
 Description:Moq is the most popular and friendly mocking framework for .NET.
+licenseUrl:https://licenses.nuget.org/BSD-3-Clause
+license Type:BSD-3-Clause
 
-Built from https://github.com/moq/moq4/tree/042a2ebbe
-licenseUrl:https://raw.githubusercontent.com/moq/moq4/main/License.txt
-license Type:BSD 3-Clause License
+#########################
+Package:NaturalSort.Extension
+Version:4.2.0+build.231
+project URL:https://github.com/tompazourek/NaturalSort.Extension
+Description:Extension method for StringComparison that adds support for natural sorting  (e.g. "abc1", "abc2", "abc10" instead of "abc1", "abc10", "abc2").
+licenseUrl:https://licenses.nuget.org/MIT
+license Type:MIT
 
 #########################
 Package:Nerdbank.GitVersioning
@@ -324,10 +328,10 @@ license Type:MIT
 
 #########################
 Package:NetSparkleUpdater.SparkleUpdater
-Version:2.2.3
+Version:2.3.0
 project URL:https://github.com/NetSparkleUpdater/NetSparkle
 Description:NetSparkleUpdater/NetSparkle is a C# .NET software update framework that allows you to easily download installer files and update your C# .NET Framework or .NET Core software. Built-in UIs are available for WinForms, WPF, and Avalonia; if you want a built-in UI, please reference a NetSparkleUpdater.UI package. You provide, somewhere on the internet, an XML appcast with software version information along with release notes in Markdown or HTML format. The NetSparkle framework then checks for an update in the background, displays the release notes to the user, and lets users download or skip the software update. The framework can also perform silent downloads so that you can present all of the UI yourself or set up your own silent software update system, as allowed by your software architecture. It was inspired by the Sparkle (https://sparkle-project.org/) project for Cocoa developers and the WinSparkle (https://winsparkle.org/) project (a Win32 port).
-licenseUrl:https://www.nuget.org/packages/NetSparkleUpdater.SparkleUpdater/2.2.3/License
+licenseUrl:https://www.nuget.org/packages/NetSparkleUpdater.SparkleUpdater/2.3.0/License
 license Type:MIT
 
 #########################
@@ -348,14 +352,14 @@ license Type:MIT
 
 #########################
 Package:NLog
-Version:5.2.0
+Version:5.2.8
 project URL:https://nlog-project.org/
 Description:NLog is a logging platform for .NET with rich log routing and management capabilities.
 NLog supports traditional logging, structured logging and the combination of both.
 
 Supported platforms:
 
-- .NET 5, 6 and 7
+- .NET 5, 6, 7 and 8
 - .NET Core 1, 2 and 3
 - .NET Standard 1.3+ and 2.0+
 - .NET Framework 3.5 - 4.8
@@ -376,7 +380,7 @@ license Type:MIT
 
 #########################
 Package:PommaLabs.MimeTypes
-Version:2.8.3+5c6b155
+Version:2.9.1+63b5125a
 project URL:https://gitlab.com/pommalabs/mime-types
 Description:MIME content type definitions mapped with file extensions and file signatures.
 licenseUrl:https://licenses.nuget.org/MIT
@@ -392,7 +396,7 @@ license Type:Adapted MIT License
 
 #########################
 Package:ReactiveUI
-Version:19.2.1
+Version:19.5.41
 project URL:https://reactiveui.net/
 Description:A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. This is the base package with the base platform implementations
 licenseUrl:https://licenses.nuget.org/MIT
@@ -403,7 +407,7 @@ Package:RepoDb
 Version:1.13.1
 project URL:https://repodb.net/
 Description:A hybrid ORM library for .NET.
-licenseUrl:https://www.nuget.org/packages/RepoDb/1.12.10/License
+licenseUrl:https://www.nuget.org/packages/RepoDb/1.13.1/License
 license Type:Apache License 2.0
 
 #########################
@@ -424,15 +428,15 @@ license Type:MIT
 
 #########################
 Package:SharpCompress
-Version:0.33.0
+Version:0.36.0
 project URL:https://github.com/adamhathcock/sharpcompress
 Description:SharpCompress is a compression library for NET Standard 2.0/2.1/NET 6.0/NET 7.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.
 licenseUrl:https://licenses.nuget.org/MIT
 license Type:MIT
 
 #########################
 Package:SimpleInjector
-Version:5.4.1
+Version:5.4.4
 project URL:https://simpleinjector.org/
 Description:Simple Injector is an easy, flexible and fast dependency injection library that uses best practice to guide your solutions toward the pit of success.
 licenseUrl:https://licenses.nuget.org/MIT
@@ -462,17 +466,26 @@ Description:An extension to ImageSharp that allows the drawing of images, paths,
 licenseUrl:https://licenses.nuget.org/Apache-2.0
 license Type:Apache-2.0
 
+#########################
+Package:SkiaSharp
+Version:2.88.7
+project URL:https://go.microsoft.com/fwlink/?linkid=868515
+Description:SkiaSharp is a cross-platform 2D graphics API for .NET platforms based on Google's Skia Graphics Library.
+It provides a comprehensive 2D API that can be used across mobile, server and desktop models to render images.
+licenseUrl:https://go.microsoft.com/fwlink/?linkid=868514
+license Type:MIT License
+
 #########################
 Package:SlimMessageBus.Host.Memory
-Version:2.1.8
+Version:2.2.3
 project URL:https://github.com/zarusz/SlimMessageBus
 Description:Simple provider for SlimMessageBus for in process message passing. Messages are stored in memory (state is transient).
 licenseUrl:https://licenses.nuget.org/Apache-2.0
 license Type:Apache-2.0
 
 #########################
 Package:SmartFormat
-Version:3.2.1
+Version:3.3.2
 project URL:https://github.com/axuno/SmartFormat
 Description:This package contains the core SmartFormat assemblies with core extensions built-in.
 
@@ -484,15 +497,15 @@ license Type:MIT
 
 #########################
 Package:Splat.NLog
-Version:14.6.37
+Version:14.8.12
 project URL:https://github.com/reactiveui/splat/
 Description:A library to make things cross-platform that should be.
 licenseUrl:https://licenses.nuget.org/MIT
 license Type:MIT
 
 #########################
 Package:Splat.SimpleInjector
-Version:14.6.37
+Version:14.8.12
 project URL:https://github.com/reactiveui/splat/
 Description:A library to make things cross-platform that should be.
 licenseUrl:https://licenses.nuget.org/MIT
@@ -583,7 +596,7 @@ license Type:MIT
 
 #########################
 Package:xunit
-Version:2.4.2
+Version:2.7.0
 project URL:https://github.com/xunit/xunit
 Description:xUnit.net is a developer testing framework, built to support Test Driven Development, with a design goal of extreme simplicity and alignment with framework features.
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,18 +18,21 @@
     <PathMap>$(MSBuildProjectDirectory)=$(MSBuildProjectName)</PathMap>
   </PropertyGroup>  
   <PropertyGroup>
-    <MicrosoftExtensionsDependencyModelVersion>[7.0.0]</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETCorePlatformsVersion>[7.0.3]</MicrosoftNETCorePlatformsVersion>    
-    <MicrosoftExtensionsConfigurationBinder>[7.0.4]</MicrosoftExtensionsConfigurationBinder>
-    <MicrosoftExtensionsConfigurationJson>[7.0.0]</MicrosoftExtensionsConfigurationJson>
+    <MicrosoftExtensionsDependencyModelVersion>[8.0.0]</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftNETCorePlatformsVersion>[8.0.0-preview.7.23375.6]</MicrosoftNETCorePlatformsVersion>    
+    <MicrosoftExtensionsConfigurationBinder>[8.0.1]</MicrosoftExtensionsConfigurationBinder>
+    <MicrosoftExtensionsConfigurationJson>[8.0.0]</MicrosoftExtensionsConfigurationJson>
+	<Jot>[2.1.17]</Jot>
+	<!-- Non upgradeable stuff below  -->
+	<!-- Avalonia is not easily upgradeable too  -->
     <MaterialAvalonia>[2.5.1]</MaterialAvalonia>
     <MessageBoxAvalonia>[2.1.0]</MessageBoxAvalonia>
     <Avalonia>[0.10.22]</Avalonia>
     <AvaloniaEdit>[0.10.12.2]</AvaloniaEdit>
-    <Jot>[2.1.16]</Jot>
-	<!-- 2.5.0 version breaks tests  -->
+	<AvaloniaMaterialIcons>[1.1.10]</AvaloniaMaterialIcons>
+	<!-- 2.5.0 version breaks tests, 1.26 rev still broken. I really don't want to investigate  -->
 	<XUnitRunnerVS>[2.4.5]</XUnitRunnerVS>
-    <!-- Recently 2.0 version was released and not all packages were updated  -->
+    <!-- SixLabors should be removed at some point  -->
     <SixLaborsImageSharp>[1.0.4]</SixLaborsImageSharp>
     <SixLaborsImageSharpDrawing>[1.0.0-beta13.15]</SixLaborsImageSharpDrawing>
     <SixLaborsImageSharpTextures>[0.0.0-alpha.0.132]</SixLaborsImageSharpTextures>
@@ -40,4 +43,8 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <!-- Probably not needed but I've got so many dependencies -->
+    <RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
+  </ItemGroup>    
 </Project>
diff --git a/References/Direct/LiteDB.dll b/References/Direct/LiteDB.dll
diff --git a/Test.runsettings b/Test.runsettings
@@ -4,7 +4,7 @@
     <MaxCpuCount>2</MaxCpuCount>
     <TargetPlatform>x64</TargetPlatform>
     <ResultsDirectory>.\TestResults</ResultsDirectory>
-    <TargetFrameworkVersion>.NETCoreApp,Version=v3.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
   </RunConfiguration>
 
   <DataCollectionRunSettings>

diff --git a/...nResourceGenerator/src/LocalizationResourceGenerator/LocalizationResourceGenerator.csproj b/...nResourceGenerator/src/LocalizationResourceGenerator/LocalizationResourceGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/cmd/build-tools.bat b/cmd/build-tools.bat
@@ -5,6 +5,6 @@ dotnet build --configuration Release
 cd ..
 cd ..
 cd ..
-xcopy "Tools\LocalizationResourceGenerator\src\LocalizationResourceGenerator\bin\Release\net7.0\*.dll" "Tools\LocalizationResourceGenerator\" /Y /S /D
-xcopy "Tools\LocalizationResourceGenerator\src\LocalizationResourceGenerator\bin\Release\net7.0\*.exe" "Tools\LocalizationResourceGenerator\" /Y /S /D
-xcopy "Tools\LocalizationResourceGenerator\src\LocalizationResourceGenerator\bin\Release\net7.0\*.json" "Tools\LocalizationResourceGenerator\" /Y /S /D
+xcopy "Tools\LocalizationResourceGenerator\src\LocalizationResourceGenerator\bin\Release\net8.0\*.dll" "Tools\LocalizationResourceGenerator\" /Y /S /D
+xcopy "Tools\LocalizationResourceGenerator\src\LocalizationResourceGenerator\bin\Release\net8.0\*.exe" "Tools\LocalizationResourceGenerator\" /Y /S /D
+xcopy "Tools\LocalizationResourceGenerator\src\LocalizationResourceGenerator\bin\Release\net8.0\*.json" "Tools\LocalizationResourceGenerator\" /Y /S /D
diff --git a/publish/publish-linux-x64.bat b/publish/publish-linux-x64.bat
@@ -17,16 +17,16 @@ dotnet publish src\IronyModManager.Common\IronyModManager.Common.csproj  /p:Publ
 dotnet publish src\IronyModManager.Updater\IronyModManager.Updater.csproj  /p:PublishProfile=src\IronyModManager.Updater\Properties\PublishProfiles\linux-x64.pubxml --configuration linux-x64
 dotnet publish src\IronyModManager.GameHandler\IronyModManager.GameHandler.csproj  /p:PublishProfile=src\IronyModManager.GameHandler\Properties\PublishProfiles\linux-x64.pubxml --configuration linux-x64
 dotnet publish src\IronyModManager\IronyModManager.csproj  /p:PublishProfile=src\IronyModManager\Properties\PublishProfiles\linux-x64.pubxml --configuration linux-x64
-xcopy "src\IronyModManager\bin\linux-x64\net7.0\linux-x64\*.dll" "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\" /Y /S /D
-xcopy "src\IronyModManager\bin\linux-x64\net7.0\linux-x64\*.json" "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\" /Y /S /D
-xcopy "src\IronyModManager\bin\linux-x64\net7.0\linux-x64\*.pdb" "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\" /Y /S /D
-xcopy "src\IronyModManager.Updater\bin\x64\linux-x64\net7.0\publish\linux-x64\*.*" "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\" /Y /S /D
-xcopy "src\IronyModManager.GameHandler\bin\x64\linux-x64\net7.0\publish\linux-x64\*.*" "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\" /Y /S /D
-del "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\IronyModManager.runtimeconfig.dev.json" /S /Q
-del "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\IronyModManager.Updater.runtimeconfig.dev.json" /S /Q
-del "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\IronyModManager.GameHandler.runtimeconfig.dev.json" /S /Q
-del "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\steam_api64.dll" /S /Q
-xcopy "References\CopyAll\*.*" "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\" /Y /S /D
+xcopy "src\IronyModManager\bin\linux-x64\net8.0\linux-x64\*.dll" "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\" /Y /S /D
+xcopy "src\IronyModManager\bin\linux-x64\net8.0\linux-x64\*.json" "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\" /Y /S /D
+xcopy "src\IronyModManager\bin\linux-x64\net8.0\linux-x64\*.pdb" "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\" /Y /S /D
+xcopy "src\IronyModManager.Updater\bin\x64\linux-x64\net8.0\publish\linux-x64\*.*" "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\" /Y /S /D
+xcopy "src\IronyModManager.GameHandler\bin\x64\linux-x64\net8.0\publish\linux-x64\*.*" "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\" /Y /S /D
+del "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\IronyModManager.runtimeconfig.dev.json" /S /Q
+del "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\IronyModManager.Updater.runtimeconfig.dev.json" /S /Q
+del "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\IronyModManager.GameHandler.runtimeconfig.dev.json" /S /Q
+del "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\steam_api64.dll" /S /Q
+xcopy "References\CopyAll\*.*" "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\" /Y /S /D
 REM Why on earth cannot nuget include these? Also the documentation sucks in this regard
-xcopy "References\Conditional\Steamworks\OSX-Linux-x64\libsteam_api.so" "src\IronyModManager\bin\x64\linux-x64\net7.0\publish\linux-x64\" /Y /S /D
+xcopy "References\Conditional\Steamworks\OSX-Linux-x64\libsteam_api.so" "src\IronyModManager\bin\x64\linux-x64\net8.0\publish\linux-x64\" /Y /S /D
 cd publish