From 20ba2e111aca29475c5a371ebee7abcb6406cd03 Mon Sep 17 00:00:00 2001
From: halgari <tbaldridge@gmail.com>
Date: Thu, 3 Oct 2024 10:14:44 -0600
Subject: [PATCH] Update most of our core deps

---
 Directory.Packages.props                      | 44 +++++++++----------
 .../NexusMods.Abstractions.Loadouts.csproj    |  5 ---
 .../MessageBox/Ok/MessageBoxOkView.axaml.cs   |  1 +
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2951d87c9f..294362aaec 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,19 +4,17 @@
     <PackageVersion Include="Avalonia.Labs.Panels" Version="11.1.0" />
     <PackageVersion Include="Avalonia.Skia" Version="11.1.0" />
     <PackageVersion Include="AvaloniaEdit.TextMate" Version="11.1.0" />
-    <PackageVersion Include="FlatSharp.Compiler" Version="7.6.0" />
-    <PackageVersion Include="FlatSharp.Runtime" Version="7.6.0" />
     <PackageVersion Include="LinqGen" Version="0.3.1" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.8.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageVersion Include="Nerdbank.FullDuplexStream" Version="1.1.12" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.74" />
     <PackageVersion Include="NexusMods.Paths" Version="0.10.0" />
     <PackageVersion Include="NexusMods.MnemonicDB.Abstractions" Version="0.9.86" />
     <PackageVersion Include="NexusMods.MnemonicDB" Version="0.9.86" />
-    <PackageVersion Include="NexusMods.Hashing.xxHash64" Version="2.0.1" />
+    <PackageVersion Include="NexusMods.Hashing.xxHash64" Version="2.0.2" />
     <PackageVersion Include="NexusMods.Paths.Extensions.Nx" Version="0.10.0" />
-    <PackageVersion Include="NexusMods.Paths.TestingHelpers" Version="0.9.5" />
+    <PackageVersion Include="NexusMods.Paths.TestingHelpers" Version="0.10.0" />
     <PackageVersion Include="NexusMods.Archives.Nx" Version="0.5.0" />
     <PackageVersion Include="NexusMods.Telemetry.OpenTelemetry" Version="1.0.0" />
     <PackageVersion Include="FomodInstaller.Interface" Version="1.2.0" />
@@ -26,11 +24,11 @@
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="Noggog.CSharpExt" Version="2.64.0" />
     <PackageVersion Include="ObservableCollections" Version="2.2.0" />
-    <PackageVersion Include="ObservableCollections.R3" Version="3.0.1" />
+    <PackageVersion Include="ObservableCollections.R3" Version="3.1.0" />
     <PackageVersion Include="QoiSharp" Version="1.0.0" />
-    <PackageVersion Include="R3" Version="1.2.8" />
-    <PackageVersion Include="R3Extensions.Avalonia" Version="1.2.8" />
-    <PackageVersion Include="ReactiveUI" Version="20.1.1" />
+    <PackageVersion Include="R3" Version="1.2.9" />
+    <PackageVersion Include="R3Extensions.Avalonia" Version="1.2.9" />
+    <PackageVersion Include="ReactiveUI" Version="20.1.63" />
     <PackageVersion Include="Spectre.Console.Testing" Version="0.49.1" />
     <PackageVersion Include="StrawberryShake.Server" Version="13.9.12" />
     <PackageVersion Include="System.Linq" Version="4.3.0" />
@@ -39,8 +37,8 @@
     <PackageVersion Include="OpenTelemetry" Version="1.8.1" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
-      <PackageVersion Include="Polly.Core" Version="8.4.2" />
-      <PackageVersion Include="Polly" Version="8.4.2" />
+    <PackageVersion Include="Polly.Core" Version="8.4.2" />
+    <PackageVersion Include="Polly" Version="8.4.2" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="MemoryPack.Streaming" Version="1.21.1" />
@@ -60,8 +58,8 @@
     <PackageVersion Include="Avalonia.Headless" Version="11.1.3" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.1.3" />
     <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.1.3" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.3.0" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.1.0" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.1.0.1" />
     <PackageVersion Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-rc2" />
     <!-- keep this version in sync with Avalonia (https://github.com/whistyun/Markdown.Avalonia?tab=readme-ov-file#nuget) -->
     <PackageVersion Include="Markdown.Avalonia.Tight" Version="11.0.3-a1" />
@@ -71,7 +69,7 @@
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
@@ -82,7 +80,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
     <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2">
@@ -99,21 +97,21 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Verify.Xunit" Version="24.2.0" />
+    <PackageVersion Include="Verify.Xunit" Version="26.6.0" />
     <PackageVersion Include="Verify.ImageMagick" Version="3.4.2" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
-    <PackageVersion Include="xunit" Version="2.8.0" />
-    <PackageVersion Include="Xunit.DependencyInjection" Version="9.3.0" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="Xunit.DependencyInjection" Version="9.4.0" />
     <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="9.0.0" />
     <PackageVersion Include="Xunit.DependencyInjection.SkippableFact" Version="9.0.0" />
     <PackageVersion Include="xunit.extensibility.core" Version="2.6.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0">
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
@@ -132,7 +130,7 @@
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="Sewer56.BitStream" Version="1.3.0" />
     <PackageVersion Include="Spectre.Console" Version="0.48.0" />
-    <PackageVersion Include="Splat.Microsoft.Extensions.Logging" Version="15.0.1" />
+    <PackageVersion Include="Splat.Microsoft.Extensions.Logging" Version="15.2.22" />
     <PackageVersion Include="TransparentValueObjects" Version="1.0.1" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Abstractions/NexusMods.Abstractions.Loadouts/NexusMods.Abstractions.Loadouts.csproj b/src/Abstractions/NexusMods.Abstractions.Loadouts/NexusMods.Abstractions.Loadouts.csproj
index 58db729c5a..4e10f858f4 100644
--- a/src/Abstractions/NexusMods.Abstractions.Loadouts/NexusMods.Abstractions.Loadouts.csproj
+++ b/src/Abstractions/NexusMods.Abstractions.Loadouts/NexusMods.Abstractions.Loadouts.csproj
@@ -10,11 +10,6 @@
       <ProjectReference Include="..\NexusMods.Abstractions.Library.Models\NexusMods.Abstractions.Library.Models.csproj" />
       <ProjectReference Include="..\NexusMods.Abstractions.MnemonicDB.Analyzers\NexusMods.Abstractions.MnemonicDB.Analyzers.csproj" />
       <ProjectReference Include="..\NexusMods.Abstractions.Serialization\NexusMods.Abstractions.Serialization.csproj" />
-      <PackageReference Include="FlatSharp.Compiler">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="FlatSharp.Runtime" />
       <PackageReference Include="NexusMods.MnemonicDB.Abstractions" />
       <PackageReference Include="TransparentValueObjects" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
       <PackageReference Include="NexusMods.MnemonicDB.SourceGenerator" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
diff --git a/src/NexusMods.App.UI/Overlays/Generic/MessageBox/Ok/MessageBoxOkView.axaml.cs b/src/NexusMods.App.UI/Overlays/Generic/MessageBox/Ok/MessageBoxOkView.axaml.cs
index 695f2d689c..70b0004f89 100644
--- a/src/NexusMods.App.UI/Overlays/Generic/MessageBox/Ok/MessageBoxOkView.axaml.cs
+++ b/src/NexusMods.App.UI/Overlays/Generic/MessageBox/Ok/MessageBoxOkView.axaml.cs
@@ -3,6 +3,7 @@
 using NexusMods.App.UI.Resources;
 using R3;
 using ReactiveUI;
+using ReactiveCommand = ReactiveUI.ReactiveCommand;
 
 namespace NexusMods.App.UI.Overlays.Generic.MessageBox.Ok;