Update deps (#1101)

Something's up with dependabot, so manually doing it in the interim
dalyIsaac · Feb 9, 2025 · 7fde3da · 7fde3da
1 parent 8f9d407
commit 7fde3da
Show file tree

Hide file tree

Showing 42 changed files with 654 additions and 630 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,24 +3,19 @@
   "isRoot": true,
   "tools": {
     "xamlstyler.console": {
-      "version": "3.2404.2",
+      "version": "3.2501.8",
       "commands": ["xstyler"],
       "rollForward": false
     },
     "csharpier": {
-      "version": "0.29.2",
+      "version": "0.30.6",
       "commands": ["dotnet-csharpier"],
       "rollForward": false
     },
     "docfx": {
-      "version": "2.78.0",
+      "version": "2.78.2",
       "commands": ["docfx"],
       "rollForward": false
-    },
-    "corvus.json.jsonschema.typegeneratortool": {
-      "version": "4.0.9",
-      "commands": ["generatejsonschematypes"],
-      "rollForward": false
     }
   }
 }
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,35 +3,35 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Corvus.Json.ExtendedTypes" Version="4.0.9" />
-    <PackageVersion Include="Corvus.Json.SourceGenerator" Version="4.0.9" />
-    <PackageVersion Include="DotNext" Version="5.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Scripting" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
+    <PackageVersion Include="Corvus.Json.ExtendedTypes" Version="4.2.4" />
+    <PackageVersion Include="Corvus.Json.SourceGenerator" Version="4.2.4" />
+    <PackageVersion Include="DotNext" Version="5.18.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
-    <PackageVersion Include="Octokit" Version="13.0.1" />
-    <PackageVersion Include="Serilog" Version="4.1.0" />
+    <PackageVersion Include="Octokit" Version="14.0.0" />
+    <PackageVersion Include="Serilog" Version="4.2.0" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
-    <PackageVersion Include="Yaml2JsonNode" Version="2.1.1" />
-    <PackageVersion Include="YamlDotNet" Version="16.2.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
+    <PackageVersion Include="Yaml2JsonNode" Version="2.2.0" />
+    <PackageVersion Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
   <!-- Test dependencies -->
   <ItemGroup>
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
     <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
     <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="NSubstitute" Version="5.1.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="FluentAssertions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.analyzers" Version="1.16.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.analyzers" Version="1.20.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Whim.Bar.Tests/BarLayoutEngineTests.cs b/src/Whim.Bar.Tests/BarLayoutEngineTests.cs
@@ -298,13 +298,12 @@ public void DoLayout(ILayoutEngine innerLayoutEngine, IWindow window1, IWindow w
 			},
 		];
 
-		Rectangle<int> expectedGivenRect =
-			new()
-			{
-				Y = 30,
-				Width = 100,
-				Height = 70,
-			};
+		Rectangle<int> expectedGivenRect = new()
+		{
+			Y = 30,
+			Width = 100,
+			Height = 70,
+		};
 
 		innerLayoutEngine.DoLayout(expectedGivenRect, monitor).Returns(expectedWindowStates);
 
@@ -337,13 +336,12 @@ public void PerformCustomAction_NotSame(ILayoutEngine innerLayoutEngine, ILayout
 	{
 		// Given
 		BarLayoutEngine engine = CreateSut(innerLayoutEngine);
-		LayoutEngineCustomAction<string> action =
-			new()
-			{
-				Name = "Action",
-				Payload = "payload",
-				Window = null,
-			};
+		LayoutEngineCustomAction<string> action = new()
+		{
+			Name = "Action",
+			Payload = "payload",
+			Window = null,
+		};
 		innerLayoutEngine.PerformCustomAction(action).Returns(performCustomActionResult);
 
 		// When
@@ -359,13 +357,12 @@ public void PerformCustomAction_Same(ILayoutEngine innerLayoutEngine)
 	{
 		// Given
 		BarLayoutEngine engine = CreateSut(innerLayoutEngine);
-		LayoutEngineCustomAction<string> action =
-			new()
-			{
-				Name = "Action",
-				Payload = "payload",
-				Window = null,
-			};
+		LayoutEngineCustomAction<string> action = new()
+		{
+			Name = "Action",
+			Payload = "payload",
+			Window = null,
+		};
 		innerLayoutEngine.PerformCustomAction(action).Returns(innerLayoutEngine);
 
 		// When

diff --git a/src/Whim.Bar/BarLayoutEngine.cs b/src/Whim.Bar/BarLayoutEngine.cs
@@ -39,14 +39,13 @@ public override IEnumerable<IWindowState> DoLayout(IRectangle<int> rectangle, IM
 		double scale = monitor.ScaleFactor / 100.0;
 		int height = (int)(_barConfig.Height * scale);
 
-		Rectangle<int> proxiedRect =
-			new()
-			{
-				X = rectangle.X,
-				Y = rectangle.Y + height,
-				Width = rectangle.Width,
-				Height = Math.Max(0, rectangle.Height - height),
-			};
+		Rectangle<int> proxiedRect = new()
+		{
+			X = rectangle.X,
+			Y = rectangle.Y + height,
+			Width = rectangle.Width,
+			Height = Math.Max(0, rectangle.Height - height),
+		};
 		return InnerLayoutEngine.DoLayout(proxiedRect, monitor);
 	}
 

diff --git a/src/Whim.CommandPalette.Tests/CommandPaletteWindowViewModelTests.cs b/src/Whim.CommandPalette.Tests/CommandPaletteWindowViewModelTests.cs
@@ -48,8 +48,13 @@ public void RequestHide()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		// When
 		// Then
@@ -61,8 +66,13 @@ public void OnKeyDown_Escape()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		// When
 		// Then
@@ -78,8 +88,13 @@ public void OnKeyDown_OtherKeys()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		vm.Activate(new MenuVariantConfig() { Commands = [] }, null);
 
@@ -95,8 +110,13 @@ public void Activate_UseDefaults()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		// When
 		Assert.Raises<EventArgs>(
@@ -116,8 +136,13 @@ public void Activate_DefineItems()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		IMonitor monitor = Substitute.For<IMonitor>();
 		monitor.WorkingArea.Returns(
@@ -130,13 +155,12 @@ public void Activate_DefineItems()
 			}
 		);
 
-		MenuVariantConfig config =
-			new()
-			{
-				Commands = [],
-				InitialText = "Initial text",
-				Hint = "Hint",
-			};
+		MenuVariantConfig config = new()
+		{
+			Commands = [],
+			InitialText = "Initial text",
+			Hint = "Hint",
+		};
 
 		IEnumerable<ICommand> ICommands = [new Command("id", "title", () => { })];
 
@@ -185,8 +209,13 @@ public void Activate_Variant(BaseVariantConfig config, bool expected, string con
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		// When
 		vm.Activate(config, null);
@@ -201,8 +230,13 @@ public void Update()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		MenuVariantConfig config = new() { Commands = [] };
 
@@ -220,8 +254,13 @@ public void IsVisible_True()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		MenuVariantConfig config = new() { Commands = [] };
 
@@ -239,8 +278,13 @@ public void IsVisible_False()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		// When
 		bool result = vm.IsVisible;
@@ -254,8 +298,13 @@ public void RequestFocusTextBox()
 	{
 		// Given
 		Wrapper wrapper = new();
-		CommandPaletteWindowViewModel vm =
-			new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant);
+		CommandPaletteWindowViewModel vm = new(
+			wrapper.Context,
+			wrapper.Plugin,
+			wrapper.MenuVariant,
+			wrapper.FreeTextVariant,
+			wrapper.SelectVariant
+		);
 
 		// When
 		// Then

diff --git a/src/Whim.CommandPalette.Tests/Variants/FreeText/FreeTextVariantViewModelTests.cs b/src/Whim.CommandPalette.Tests/Variants/FreeText/FreeTextVariantViewModelTests.cs
@@ -16,13 +16,12 @@ public void Customize(IFixture fixture)
 		FreeTextVariantCallback callback = Substitute.For<FreeTextVariantCallback>();
 		fixture.Inject(callback);
 
-		FreeTextVariantConfig config =
-			new()
-			{
-				InitialText = "Hello, world!",
-				Callback = callback,
-				Prompt = "Hello, world!",
-			};
+		FreeTextVariantConfig config = new()
+		{
+			InitialText = "Hello, world!",
+			Callback = callback,
+			Prompt = "Hello, world!",
+		};
 		fixture.Inject(config);
 	}
 }