Update nupkgs to fix CVE-2023-4863 (#80)

FaithBeam · web-flow · commit 4ead9d6d5022 · 2023-10-18T08:13:51.000-04:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -2,7 +2,7 @@ name: .NET
 
 env:
   PACK_ID: Sims1WidescreenPatcher
-  PACK_VER: 3.7.0
+  PACK_VER: 3.7.1
 
 on: 
   push:
diff --git a/Sims1WidescreenPatcher.Core/Sims1WidescreenPatcher.Core.csproj b/Sims1WidescreenPatcher.Core/Sims1WidescreenPatcher.Core.csproj
@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="11.0.4" />
-      <PackageReference Include="DynamicData" Version="7.14.2" />
-      <PackageReference Include="ReactiveUI" Version="19.4.1" />
+      <PackageReference Include="Avalonia" Version="11.0.5" />
+      <PackageReference Include="DynamicData" Version="8.0.2" />
+      <PackageReference Include="ReactiveUI" Version="19.5.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Sims1WidescreenPatcher.Images/Sims1WidescreenPatcher.Images.csproj b/Sims1WidescreenPatcher.Images/Sims1WidescreenPatcher.Images.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.2.0" />
+      <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.3.0" />
       <PackageReference Include="Serilog" Version="3.0.1" />
       <PackageReference Include="Sims.Far" Version="3.0.0" />
     </ItemGroup>
diff --git a/Sims1WidescreenPatcher.UI/Sims1WidescreenPatcher.UI.csproj b/Sims1WidescreenPatcher.UI/Sims1WidescreenPatcher.UI.csproj
@@ -16,11 +16,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="11.0.4" />
-      <PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
-      <PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" />
-      <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.4" />
-      <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
+      <PackageReference Include="Avalonia" Version="11.0.5" />
+      <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+      <PackageReference Include="Avalonia.Diagnostics" Version="11.0.5" />
+      <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+      <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Sims1WidescreenPatcher.UI/Views/MainWindow.axaml.cs b/Sims1WidescreenPatcher.UI/Views/MainWindow.axaml.cs
@@ -30,8 +30,7 @@ public MainWindow(IMainWindowViewModel viewModel)
         });
     }
 
-    private async Task ShowCustomInformationDialogAsync(
-        InteractionContext<CustomInformationDialogViewModel, Unit> interaction)
+    private async Task ShowCustomInformationDialogAsync(IInteractionContext<CustomInformationDialogViewModel, Unit> interaction)
     {
         var dialog = new CustomInformationDialog
         {
@@ -42,8 +41,7 @@ private async Task ShowCustomInformationDialogAsync(
         interaction.SetOutput(result);
     }
 
-    private async Task ShowCustomYesNoDialogAsync(
-        InteractionContext<CustomYesNoDialogViewModel, YesNoDialogResponse?> interaction)
+    private async Task ShowCustomYesNoDialogAsync(IInteractionContext<CustomYesNoDialogViewModel, YesNoDialogResponse?> interaction)
     {
         var dialog = new CustomYesNoDialog
         {
@@ -54,7 +52,7 @@ private async Task ShowCustomYesNoDialogAsync(
         interaction.SetOutput(result);
     }
 
-    private async Task ShowCustomResolutionDialogAsync(InteractionContext<ICustomResolutionDialogViewModel, Resolution?> interaction)
+    private async Task ShowCustomResolutionDialogAsync(IInteractionContext<ICustomResolutionDialogViewModel, Resolution?> interaction)
     {
         var dialog = new CustomResolutionDialog
         {
@@ -65,7 +63,7 @@ private async Task ShowCustomResolutionDialogAsync(InteractionContext<ICustomRes
         interaction.SetOutput(result);
     }
 
-    private async Task ShowOpenFileDialogAsync(InteractionContext<Unit, IStorageFile?> interaction)
+    private async Task ShowOpenFileDialogAsync(IInteractionContext<Unit, IStorageFile?> interaction)
     {
         var fileNames = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
         {
diff --git a/Sims1WidescreenPatcher.Utilities/Sims1WidescreenPatcher.Utilities.csproj b/Sims1WidescreenPatcher.Utilities/Sims1WidescreenPatcher.Utilities.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
       <PackageReference Include="PatternFinder" Version="1.0.2" />
-      <PackageReference Include="ReactiveUI" Version="19.4.1" />
+      <PackageReference Include="ReactiveUI" Version="19.5.1" />
       <PackageReference Include="Serilog" Version="3.0.1" />
     </ItemGroup>
 
diff --git a/Sims1WidescreenPatcher.Windows/Sims1WidescreenPatcher.Windows.csproj b/Sims1WidescreenPatcher.Windows/Sims1WidescreenPatcher.Windows.csproj
@@ -26,7 +26,7 @@
 		<TrimmableAssembly Include="Avalonia.Themes.Default" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
 		<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
diff --git a/Sims1WidescreenPatcher/Sims1WidescreenPatcher.csproj b/Sims1WidescreenPatcher/Sims1WidescreenPatcher.csproj
@@ -14,9 +14,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
-		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.4" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.5" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
 		<PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
 		<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ public MainWindow(IMainWindowViewModel viewModel)`
`30`	`30`	`});`
`31`	`31`	`}`
`32`	`32`
`33`		`- private async Task ShowCustomInformationDialogAsync(`
`34`		`- InteractionContext<CustomInformationDialogViewModel, Unit> interaction)`
	`33`	`+ private async Task ShowCustomInformationDialogAsync(IInteractionContext<CustomInformationDialogViewModel, Unit> interaction)`
`35`	`34`	`{`
`36`	`35`	`var dialog = new CustomInformationDialog`
`37`	`36`	`{`
`@@ -42,8 +41,7 @@ private async Task ShowCustomInformationDialogAsync(`
`42`	`41`	`interaction.SetOutput(result);`
`43`	`42`	`}`
`44`	`43`
`45`		`- private async Task ShowCustomYesNoDialogAsync(`
`46`		`- InteractionContext<CustomYesNoDialogViewModel, YesNoDialogResponse?> interaction)`
	`44`	`+ private async Task ShowCustomYesNoDialogAsync(IInteractionContext<CustomYesNoDialogViewModel, YesNoDialogResponse?> interaction)`
`47`	`45`	`{`
`48`	`46`	`var dialog = new CustomYesNoDialog`
`49`	`47`	`{`
`@@ -54,7 +52,7 @@ private async Task ShowCustomYesNoDialogAsync(`
`54`	`52`	`interaction.SetOutput(result);`
`55`	`53`	`}`
`56`	`54`
`57`		`- private async Task ShowCustomResolutionDialogAsync(InteractionContext<ICustomResolutionDialogViewModel, Resolution?> interaction)`
	`55`	`+ private async Task ShowCustomResolutionDialogAsync(IInteractionContext<ICustomResolutionDialogViewModel, Resolution?> interaction)`
`58`	`56`	`{`
`59`	`57`	`var dialog = new CustomResolutionDialog`
`60`	`58`	`{`
`@@ -65,7 +63,7 @@ private async Task ShowCustomResolutionDialogAsync(InteractionContext<ICustomRes`
`65`	`63`	`interaction.SetOutput(result);`
`66`	`64`	`}`
`67`	`65`
`68`		`- private async Task ShowOpenFileDialogAsync(InteractionContext<Unit, IStorageFile?> interaction)`
	`66`	`+ private async Task ShowOpenFileDialogAsync(IInteractionContext<Unit, IStorageFile?> interaction)`
`69`	`67`	`{`
`70`	`68`	`var fileNames = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions`
`71`	`69`	`{`