Bump a lot of deps to their 8.0 versions (#777)

* Bump a lot of deps to their 8.0 versions * Fix compile errors with dep upgrades (added notnull in some Rx Helpers)
Nexus-Mods · Nov 15, 2023 · fd90b03 · fd90b03
1 parent 69d6184
commit fd90b03
Showing 4 changed files with 38 additions and 35 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,8 +10,11 @@
     <PackageVersion Include="FomodInstaller.Scripting.XmlScript" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="all" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
     <PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta07" PrivateAssets="all" ExcludeAssets="compile;runtime" />
   </ItemGroup>
   <ItemGroup>
@@ -24,8 +27,8 @@
     <PackageVersion Include="Avalonia.Headless" Version="11.0.5" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.5" />
     <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.5" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="6.6.0-rc1.1" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.3" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="8.3.0" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.4" />
   </ItemGroup>
   <ItemGroup>
     <!-- System -->
@@ -38,14 +41,14 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Microsoft -->
-    <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.0-rc.2.23480.2" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.13" />
+    <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
   </ItemGroup>
   <ItemGroup>
@@ -56,49 +59,49 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="FluentAssertions.OneOf" Version="0.0.5" />
-    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.18.0">
+    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.26.0">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2">
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="NSubstitute" Version="5.0.0" />
+    <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.16">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="xunit" Version="2.5.0" />
-    <PackageVersion Include="Xunit.DependencyInjection" Version="8.7.2" />
+    <PackageVersion Include="xunit" Version="2.6.1" />
+    <PackageVersion Include="Xunit.DependencyInjection" Version="8.9.0" />
     <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.1.0" />
-    <PackageVersion Include="Xunit.DependencyInjection.SkippableFact" Version="8.0.1" />
-    <PackageVersion Include="xunit.extensibility.core" Version="2.5.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageVersion Include="Xunit.DependencyInjection.SkippableFact" Version="8.1.0" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.6.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
   <ItemGroup>
     <!-- Other -->
-    <PackageVersion Include="BenchmarkDotNet" Version="0.13.6" />
-    <PackageVersion Include="BitFaster.Caching" Version="2.2.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageVersion Include="BitFaster.Caching" Version="2.3.3" />
     <PackageVersion Include="CliWrap" Version="3.6.4" />
-    <PackageVersion Include="DynamicData" Version="7.14.2" />
+    <PackageVersion Include="DynamicData" Version="8.1.1" />
     <PackageVersion Include="GameFinder" Version="4.0.0" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="ini-parser-netstandard" Version="2.5.2" />
-    <PackageVersion Include="Mutagen.Bethesda.Skyrim" Version="0.41.0-pr002" />
-    <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.2" />
-    <PackageVersion Include="OneOf" Version="3.0.255" />
-    <PackageVersion Include="ReactiveUI.Fody" Version="19.4.1" />
+    <PackageVersion Include="Mutagen.Bethesda.Skyrim" Version="0.42.0" />
+    <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.5" />
+    <PackageVersion Include="OneOf" Version="3.0.263" />
+    <PackageVersion Include="ReactiveUI.Fody" Version="19.5.1" />
     <PackageVersion Include="Sewer56.BitStream" Version="1.3.0" />
     <PackageVersion Include="Spectre.Console" Version="0.47.0" />
-    <PackageVersion Include="Splat.Microsoft.Extensions.Logging" Version="14.6.37" />
-    <PackageVersion Include="Vogen" Version="3.0.20" />
+    <PackageVersion Include="Splat.Microsoft.Extensions.Logging" Version="14.8.6" />
+    <PackageVersion Include="Vogen" Version="3.0.23" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/NexusMods.App.UI/DynamicDataExtensions.cs b/src/NexusMods.App.UI/DynamicDataExtensions.cs
@@ -11,7 +11,7 @@ public static class DynamicDataExtensions
     /// </summary>
     public static IObservable<(TSource, TOut)> MergeManyWithSource<TSource, TOut>(
         this IObservable<IChangeSet<TSource>> source,
-        Func<TSource, IObservable<TOut>> observableSelector)
+        Func<TSource, IObservable<TOut>> observableSelector) where TSource : notnull
     {
         return Observable.Create<(TSource, TOut)>(observer =>
         {

diff --git a/src/NexusMods.App.UI/Extensions/ListAdapter.cs b/src/NexusMods.App.UI/Extensions/ListAdapter.cs
@@ -2,7 +2,7 @@
 
 namespace NexusMods.App.UI.Extensions;
 
-public class ListAdapter<T> : IChangeSetAdaptor<T>
+public class ListAdapter<T> : IChangeSetAdaptor<T> where T : notnull
 {
     private readonly IList<T> _source;
     public ListAdapter(IList<T> source)

diff --git a/src/NexusMods.DataModel/Extensions/ObservableExtensions.cs b/src/NexusMods.DataModel/Extensions/ObservableExtensions.cs
@@ -62,7 +62,7 @@ public static IObservable<IChangeSet<TOutV, TOutK>>
         ToDiffedChangeSet<TInV, TOutV, TOutK>(
             this IObservable<IEnumerable<TInV>> colls,
             Func<TInV, TOutK> keySelector, Func<TInV, TOutV> valueSelector)
-        where TOutK : notnull
+        where TOutK : notnull where TOutV : notnull
     {
         var changeSet =
             new SourceCache<TOutV, TOutK>(x =>