Nuget bump

Mutagen-Modding · Jul 29, 2024 · 0026704 · 0026704
1 parent 01682f2
commit 0026704
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 80 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,7 +3,9 @@
     <PackageVersion Include="Autofac">
       <Version>8.0.0</Version>
     </PackageVersion>
-    <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Autofac.Extensions.DependencyInjection">
+      <Version>9.0.0</Version>
+    </PackageVersion>
     <PackageVersion Include="AutoFixture">
       <Version>4.18.1</Version>
     </PackageVersion>
@@ -15,129 +17,142 @@
       <Version>6.12.0</Version>
     </PackageVersion>
     <PackageVersion Include="GitHubDependents" Version="1.2.0" />
-    <PackageVersion Include="GitInfo">
-      <Version>3.3.4</Version>
-      <PrivateAssets>all</PrivateAssets>
+    <PackageVersion Include="GitInfo" PrivateAssets="all">
+      <Version>3.3.5</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
-    <PackageVersion Include="LibGit2Sharp" Version="0.26.2" />
+    <PackageVersion Include="LibGit2Sharp">
+      <Version>0.30.0</Version>
+    </PackageVersion>
     <PackageVersion Include="Microsoft.Build">
-      <Version>17.7.2</Version>
+      <Version>17.10.4</Version>
     </PackageVersion>
     <PackageVersion Include="Microsoft.Build.Tasks.Core">
-      <Version>17.7.2</Version>
+      <Version>17.10.4</Version>
     </PackageVersion>
     <PackageVersion Include="Microsoft.CodeAnalysis">
-      <Version>4.9.2</Version>
+      <Version>4.10.0</Version>
     </PackageVersion>
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.SourceGenerators.Testing" Version="1.1.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.SourceGenerators.Testing" Version="1.1.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
-      <Version>4.9.2</Version>
+      <Version>4.10.0</Version>
     </PackageVersion>
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild">
-      <Version>4.9.2</Version>
+      <Version>4.10.0</Version>
     </PackageVersion>
     <PackageVersion Include="Microsoft.NET.Test.Sdk">
-      <Version>17.9.0</Version>
+      <Version>17.10.0</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda">
-      <Version>0.45.1.1-nightly-20240723-054229</Version>
+      <Version>0.45.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Autofac">
-      <Version>0.45.1.1-nightly-20240723-054229</Version>
+      <Version>0.45.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Core">
-      <Version>0.45.1.1-nightly-20240723-054229</Version>
+      <Version>0.45.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Json">
-      <Version>0.45.1.1-nightly-20240723-054229</Version>
+      <Version>0.45.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Kernel">
-      <Version>0.45.1.1-nightly-20240723-054229</Version>
+      <Version>0.45.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Testing">
-      <Version>0.45.1.1-nightly-20240723-054229</Version>
+      <Version>0.45.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.WPF">
-      <Version>0.45.1.1-nightly-20240723-054229</Version>
+      <Version>0.45.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.Autofac">
-      <Version>2.65.0-nightly-20240521-192763</Version>
+      <Version>2.65.0-nightly-20240727-092271</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.CSharpExt">
-      <Version>2.65.0-nightly-20240521-192763</Version>
+      <Version>2.65.0-nightly-20240727-092271</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.CSharpExt.Json">
-      <Version>2.65.0-nightly-20240521-192763</Version>
+      <Version>2.65.0-nightly-20240727-092271</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.CSharpExt.Windows">
-      <Version>2.65.0-nightly-20240521-192763</Version>
+      <Version>2.65.0-nightly-20240727-092271</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.GitRepository">
       <Version>1.2</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.SourceGenerators">
-      <Version>2.65.0-nightly-20240521-192763</Version>
+      <Version>2.65.0-nightly-20240727-092271</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.Testing">
-      <Version>2.65.0-nightly-20240521-192763</Version>
+      <Version>2.65.0-nightly-20240727-092271</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.WPF">
-      <Version>2.65.0-nightly-20240521-192763</Version>
+      <Version>2.65.0-nightly-20240727-092271</Version>
     </PackageVersion>
     <PackageVersion Include="NSubstitute">
       <Version>5.1.0</Version>
     </PackageVersion>
     <PackageVersion Include="NuGet.Versioning">
-      <Version>6.7.0</Version>
+      <Version>6.10.1</Version>
     </PackageVersion>
     <PackageVersion Include="NuGetizer">
-      <Version>1.2.1</Version>
+      <Version>1.2.2</Version>
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="ReactiveUI">
-      <Version>19.5.41</Version>
+      <Version>20.1.1</Version>
     </PackageVersion>
     <PackageVersion Include="ReactiveUI.Fody">
       <Version>19.5.41</Version>
     </PackageVersion>
     <PackageVersion Include="ReactiveUI.WPF">
-      <Version>19.5.41</Version>
+      <Version>20.1.1</Version>
+    </PackageVersion>
+    <PackageVersion Include="Serilog">
+      <Version>4.0.1</Version>
+    </PackageVersion>
+    <PackageVersion Include="Serilog.Enrichers.Thread">
+      <Version>4.0.0</Version>
+    </PackageVersion>
+    <PackageVersion Include="Serilog.Extensions.Logging">
+      <Version>8.0.0</Version>
+    </PackageVersion>
+    <PackageVersion Include="Serilog.Sinks.Console">
+      <Version>6.0.0</Version>
+    </PackageVersion>
+    <PackageVersion Include="Serilog.Sinks.File">
+      <Version>6.0.0</Version>
+    </PackageVersion>
+    <PackageVersion Include="Serilog.Sinks.Map">
+      <Version>2.0.0</Version>
     </PackageVersion>
-    <PackageVersion Include="Serilog" Version="2.12.0" />
-    <PackageVersion Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Map" Version="1.0.2" />
     <PackageVersion Include="StrongInject">
       <Version>1.4.4</Version>
     </PackageVersion>
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Reactive">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
+    </PackageVersion>
+    <PackageVersion Include="xunit">
+      <Version>2.9.0</Version>
+    </PackageVersion>
+    <PackageVersion Include="xunit.runner.visualstudio">
+      <Version>2.8.2</Version>
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Verify.Xunit">
+      <Version>26.1.5</Version>
+    </PackageVersion>
+    <PackageVersion Include="Verify.DiffPlex">
+      <Version>3.1.0</Version>
     </PackageVersion>
-      <PackageVersion Include="xunit">
-          <Version>2.7.0</Version>
-      </PackageVersion>
-      <PackageVersion Include="xunit.runner.visualstudio">
-          <Version>2.5.7</Version>
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageVersion>
-      <PackageVersion Include="Verify.Xunit">
-          <Version>23.6.0</Version>
-      </PackageVersion>
-      <PackageVersion Include="Verify.DiffPlex">
-          <Version>2.3.0</Version>
-      </PackageVersion>
   </ItemGroup>
 </Project>
diff --git a/Mutagen.Bethesda.Synthesis.WPF/Resources.xaml b/Mutagen.Bethesda.Synthesis.WPF/Resources.xaml
@@ -617,7 +617,7 @@
     <Style x:Key="NoggogNumericUpDown" TargetType="{x:Type xwpf:InputBase}">
         <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static xwpfThemes:ResourceKeys.ControlNormalBorderKey}}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="HorizontalContentAlignment" Value="Right" />
         <Setter Property="IsTabStop" Value="False" />
@@ -668,7 +668,7 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static xwpfThemes:ResourceKeys.ControlMouseOverBorderKey}}" />
                         </Trigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
@@ -681,7 +681,7 @@
                             <Setter TargetName="PART_TextBox" Property="IsReadOnly" Value="True" />
                         </DataTrigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static xwpfThemes:ResourceKeys.ControlSelectedBorderKey}}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />

diff --git a/Synthesis.Bethesda.GUI/Json/PipelineSettingsMigration.cs b/Synthesis.Bethesda.GUI/Json/PipelineSettingsMigration.cs
@@ -25,7 +25,7 @@ public void Upgrade(IPipelineSettings settings, FilePath guiPath)
     {
         var vers = _versionRetriever.GetVersion(guiPath);
         if (vers >= 2) return;
-        using var reader = new StreamReader(_fileSystem.FileStream.Create(guiPath, FileMode.Open, FileAccess.Read));
+        using var reader = new StreamReader(_fileSystem.FileStream.New(guiPath, FileMode.Open, FileAccess.Read));
         JObject o = (JObject)JToken.ReadFrom(new JsonTextReader(reader));
         var node = o["WorkingDirectory"];
         if (node != null)

diff --git a/Synthesis.Bethesda.GUI/Logging/ExtraAttributeFormatter.cs b/Synthesis.Bethesda.GUI/Logging/ExtraAttributeFormatter.cs
@@ -30,7 +30,7 @@ public void Format(LogEvent logEvent, TextWriter output)
             output.Write(" ");
             foreach (var token in logEvent.MessageTemplate.Tokens)
             {
-                var text = logEvent.MessageTemplate.Text.AsSpan().Slice(token.StartIndex, token.Length);
+                var text = token.ToString()!;
                 if (text.Length > 0
                     && text[0] == '{'
                     && text[^1] == '}'
@@ -74,7 +74,7 @@ private static bool EventUsingProperty(LogEvent logEvent, ReadOnlySpan<char> key
         if (key == "ThreadId") return true;
         foreach (var token in logEvent.MessageTemplate.Tokens)
         {
-            var text = logEvent.MessageTemplate.Text.AsSpan().Slice(token.StartIndex, token.Length);
+            var text = token.ToString()!.AsSpan();
             if (text.Length == 0) continue;
             if (text[0] != '{') continue;
             if (text[^1] != '}') continue;

diff --git a/Synthesis.Bethesda.GUI/Logging/Log.cs b/Synthesis.Bethesda.GUI/Logging/Log.cs
@@ -47,17 +47,17 @@ private static LoggerConfiguration WriteToFile(this LoggerConfiguration conf, pa
                 Path.Combine(prefix, $"Everything.txt"))
             .WriteTo.Map(
                 FunnelNames.Profile,
-                default(string?),
+                string.Empty,
                 (profileName, profileWrite) =>
                 {
                     profileWrite.Map(
                         FunnelNames.Patcher,
-                        default(string?),
+                        string.Empty,
                         (patcherName, patcherWrite) =>
                         {
                             patcherWrite.Map(
                                 FunnelNames.Run,
-                                default(string?),
+                                string.Empty,
                                 (run, finalWrite) =>
                                 {
                                     var prefixToUse = prefix;

diff --git a/Synthesis.Bethesda.GUI/Views/Common/BottomDecisionButtonsView.xaml b/Synthesis.Bethesda.GUI/Views/Common/BottomDecisionButtonsView.xaml
@@ -30,7 +30,7 @@
             <icon:PackIconFontAwesome
                 Width="22"
                 Height="22"
-                Kind="CheckCircleSolid">
+                Kind="CircleCheckSolid">
                 <icon:PackIconFontAwesome.Style>
                     <Style TargetType="icon:PackIconFontAwesome">
                         <Setter Property="Effect">

diff --git a/Synthesis.Bethesda.GUI/Views/Config/MainConfigView.xaml b/Synthesis.Bethesda.GUI/Views/Config/MainConfigView.xaml
@@ -271,7 +271,7 @@
                 Height="12"
                 VerticalAlignment="Center"
                 Foreground="{StaticResource PaleBlueBrush}"
-                Kind="ChevronCircleUpSolid" />
+                Kind="CircleChevronUpSolid" />
             <TextBlock
                 Margin="5,0,0,0"
                 VerticalAlignment="Center"

diff --git a/Synthesis.Bethesda.GUI/Views/Config/PatcherConfigListingView.xaml b/Synthesis.Bethesda.GUI/Views/Config/PatcherConfigListingView.xaml
@@ -94,7 +94,7 @@
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 Foreground="{StaticResource LightPurpleBrush}"
-                                Kind="DotCircleSolid"
+                                Kind="CircleDotSolid"
                                 Visibility="Collapsed" />
                         </Grid>
                     </Grid>

diff --git a/Synthesis.Bethesda.GUI/Views/Config/Solution/SolutionUserSettingsConfigView.xaml b/Synthesis.Bethesda.GUI/Views/Config/Solution/SolutionUserSettingsConfigView.xaml
@@ -24,7 +24,7 @@
                 <iconPacks:PackIconFontAwesome
                     Height="11"
                     VerticalAlignment="Center"
-                    Kind="RedoAltSolid" />
+                    Kind="RepeatSolid" />
                 <TextBlock
                     Margin="2,0,0,0"
                     VerticalAlignment="Center"

diff --git a/Synthesis.Bethesda.GUI/Views/Initialization/CliInitView.xaml b/Synthesis.Bethesda.GUI/Views/Initialization/CliInitView.xaml
@@ -34,7 +34,7 @@
                 <icon:PackIconFontAwesome
                     Width="25"
                     Height="25"
-                    Kind="BackspaceSolid">
+                    Kind="DeleteLeftSolid">
                     <icon:PackIconFontAwesome.Style>
                         <Style TargetType="icon:PackIconFontAwesome">
                             <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray5}" />

diff --git a/Synthesis.Bethesda.GUI/Views/Initialization/Git/GitInitView.xaml b/Synthesis.Bethesda.GUI/Views/Initialization/Git/GitInitView.xaml
@@ -29,7 +29,7 @@
             <icon:PackIconFontAwesome
                 Width="25"
                 Height="25"
-                Kind="BackspaceSolid">
+                Kind="DeleteLeftSolid">
                 <icon:PackIconFontAwesome.Style>
                     <Style TargetType="icon:PackIconFontAwesome">
                         <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray5}" />

diff --git a/Synthesis.Bethesda.GUI/Views/Initialization/Git/PatcherStoreListingView.xaml b/Synthesis.Bethesda.GUI/Views/Initialization/Git/PatcherStoreListingView.xaml
@@ -92,7 +92,7 @@
                 <icon:PackIconFontAwesome
                     Height="12"
                     VerticalAlignment="Center"
-                    Kind="PlusCircleSolid" />
+                    Kind="CirclePlusSolid" />
             </Button>
         </Grid>
     </Grid>

diff --git a/Synthesis.Bethesda.GUI/Views/Initialization/Git/StoreView.xaml b/Synthesis.Bethesda.GUI/Views/Initialization/Git/StoreView.xaml
@@ -48,7 +48,7 @@
                 <Button.Resources>
                     <SolidColorBrush x:Key="ButtonNakedIconForegroundBrush" Color="{StaticResource MahApps.Colors.Gray7}" />
                 </Button.Resources>
-                <icon:PackIconFontAwesome Kind="InfoCircleSolid" />
+                <icon:PackIconFontAwesome Kind="CircleInfoSolid" />
             </Button>
         </Grid>
         <ListBox Grid.Row="1" Grid.Column="0"

diff --git a/Synthesis.Bethesda.GUI/Views/Initialization/SolutionInitView.xaml b/Synthesis.Bethesda.GUI/Views/Initialization/SolutionInitView.xaml
@@ -36,7 +36,7 @@
                 <icon:PackIconFontAwesome
                     Width="25"
                     Height="25"
-                    Kind="BackspaceSolid">
+                    Kind="DeleteLeftSolid">
                     <icon:PackIconFontAwesome.Style>
                         <Style TargetType="icon:PackIconFontAwesome">
                             <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray5}" />

diff --git a/Synthesis.Bethesda.GUI/Views/Profiles/ProfileDetailView.xaml b/Synthesis.Bethesda.GUI/Views/Profiles/ProfileDetailView.xaml
@@ -159,7 +159,7 @@
                                     <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray4}"></Setter>
                                     <Setter Property="Content">
                                         <Setter.Value>
-                                            <icon:PackIconFontAwesome Kind="UnlockAltSolid"
+                                            <icon:PackIconFontAwesome Kind="UnlockKeyholeSolid"
                                                                       Width="20"
                                                                       Height="20"
                                                                       VerticalAlignment="Center" />

diff --git a/Synthesis.Bethesda.UnitTests/EnvironmentErrors/CorruptErrorTests.cs b/Synthesis.Bethesda.UnitTests/EnvironmentErrors/CorruptErrorTests.cs
@@ -19,7 +19,7 @@ public void CorruptFix(
     {
         fs.File.WriteAllText(path, "Whut");
         sut.RunFix(path);
-        var doc = XDocument.Load(fs.FileStream.Create(path, FileMode.Open, FileAccess.Read));
+        var doc = XDocument.Load(fs.FileStream.New(path, FileMode.Open, FileAccess.Read));
         doc.Should().BeEquivalentTo(NotExistsError.TypicalFile());
     }
 }