diff --git a/.editorconfig b/.editorconfig
index 35f0a07..193a1ca 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -151,9 +151,13 @@ csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
-csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_namespace_declarations = file_scoped:silent
 csharp_style_expression_bodied_lambdas = true:silent
 csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
 ###############################
 # VB Coding Conventions       #
 ###############################
diff --git a/Directory.Build.props b/Directory.Build.props
index ef8ca81..576ae15 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-only
   <PropertyGroup>
     <!-- Use the latest .NET SDK -->
     <!-- This product requires Windows 10 (Windows Server 2019) or higher -->
-    <MainTargetFramework>net8.0-windows10.0.17763</MainTargetFramework>
+    <MainTargetFramework>net9.0-windows10.0.17763</MainTargetFramework>
   </PropertyGroup>
 
   <!-- Sane defaults; override in project where needed -->
@@ -32,7 +32,7 @@ SPDX-License-Identifier: GPL-3.0-only
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
 
     <!-- Use the latest C# language standard -->
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>13.0</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
 
     <!-- Be very strict -->
@@ -50,6 +50,11 @@ SPDX-License-Identifier: GPL-3.0-only
     <IsPublishable>false</IsPublishable>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+    <!--
+    See https://github.com/dotnet/roslyn/issues/41640
+    -->
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>CS1591</NoWarn>
 
     <!-- Deterministic builds -->
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
@@ -67,4 +72,12 @@ SPDX-License-Identifier: GPL-3.0-only
     <Compile Include="$(MSBuildThisFileDirectory)Fake_GitVersionInformation.cs" Condition=" '$(MSBuildRuntimeType)' != 'Core' " />
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
+    <GitVersion_FullSemVer>0.9.99+999</GitVersion_FullSemVer>
+    <GitVersion_MajorMinorPatch>0.9.99</GitVersion_MajorMinorPatch>
+    <GitVersion_Major>0</GitVersion_Major>
+    <GitVersion_Minor>9</GitVersion_Minor>
+    <GitVersion_Patch>99</GitVersion_Patch>
+  </PropertyGroup>
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2f692d7..10a2a68 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-only
     <!-- all -->
     <PackageVersion Include="GitVersion.MsBuild" Version="6.0.5" />
     <!-- Usbipd -->
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <!-- UsbIds -->
@@ -25,7 +25,7 @@ SPDX-License-Identifier: GPL-3.0-only
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="MSTest.TestAdapter" Version="3.6.3" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />
-    <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
+    <PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
index dd5550b..1ac377b 100644
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -20,6 +20,9 @@ SPDX-License-Identifier: GPL-3.0-only
     <PackageReference Include="WixToolset.UI.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="..\Fake_GitVersionInformation.cs" Condition=" '$(MSBuildRuntimeType)' != 'Core' " />
+  </ItemGroup>
   <Target Name="SetTarget" AfterTargets="GetVersion">
     <!--
     Now that we have determined the version, augment the OutputName to include the version number.
@@ -48,6 +51,9 @@ SPDX-License-Identifier: GPL-3.0-only
     <CreateProperty Value="$(DefineConstants);ProductCode=EA1D5623-E6A7-4E4A-9259-E39722$([System.Byte]::Parse($(GitVersion_Major)).ToString(X2))$([System.Byte]::Parse($(GitVersion_Minor)).ToString(X2))$([System.Byte]::Parse($(GitVersion_Patch)).ToString(X2))">
       <Output TaskParameter="Value" PropertyName="DefineConstants" />
     </CreateProperty>
+    <CreateProperty Value="$(DefineConstants);GitVersion_MajorMinorPatch=$(GitVersion_MajorMinorPatch)" Condition=" '$(MSBuildRuntimeType)' != 'Core' " >
+      <Output TaskParameter="Value" PropertyName="DefineConstants" />
+    </CreateProperty>
   </Target>
   <Target Name="PublishUsbipd" BeforeTargets="BeforeBuild">
     <Message Importance="high" Text="Publishing pre-built usbipd-win" />
diff --git a/UnitTests/Automation_Tests.cs b/UnitTests/Automation_Tests.cs
index 87fafe0..c1a412b 100644
--- a/UnitTests/Automation_Tests.cs
+++ b/UnitTests/Automation_Tests.cs
@@ -220,7 +220,7 @@ public void Device_ClientIPAddress_Null()
     public void JsonConverterBusId_Read_Valid()
     {
         var reader = new Utf8JsonReader("\"1-42\""u8);
-        reader.Read();
+        _ = reader.Read();
 
         var converter = new JsonConverterBusId();
         var busId = converter.Read(ref reader, typeof(string), JsonSerializerOptions.Default);
@@ -231,10 +231,10 @@ public void JsonConverterBusId_Read_Valid()
     public void JsonConverterBusId_Read_Invalid()
     {
         var converter = new JsonConverterBusId();
-        Assert.ThrowsException<FormatException>(() =>
+        _ = Assert.ThrowsException<FormatException>(() =>
         {
             var reader = new Utf8JsonReader("\"xxx\""u8);
-            reader.Read();
+            _ = reader.Read();
 
             _ = converter.Read(ref reader, typeof(string), JsonSerializerOptions.Default);
         });
@@ -244,10 +244,10 @@ public void JsonConverterBusId_Read_Invalid()
     public void JsonConverterBusId_Read_Null()
     {
         var converter = new JsonConverterBusId();
-        Assert.ThrowsException<InvalidDataException>(() =>
+        _ = Assert.ThrowsException<InvalidDataException>(() =>
         {
             var reader = new Utf8JsonReader("null"u8);
-            reader.Read();
+            _ = reader.Read();
             var busId = converter.Read(ref reader, typeof(string), JsonSerializerOptions.Default);
         });
     }
@@ -269,7 +269,7 @@ public void JsonConverterBusId_Write_Valid()
     public void JsonConverterBusId_Write_NullWriter()
     {
         var converter = new JsonConverterBusId();
-        Assert.ThrowsException<ArgumentNullException>(() =>
+        _ = Assert.ThrowsException<ArgumentNullException>(() =>
         {
             converter.Write(null!, new(1, 42), JsonSerializerOptions.Default);
         });
@@ -279,7 +279,7 @@ public void JsonConverterBusId_Write_NullWriter()
     public void JsonConverterIPAddress_Read_Valid()
     {
         var reader = new Utf8JsonReader("\"1.2.3.4\""u8);
-        reader.Read();
+        _ = reader.Read();
 
         var converter = new JsonConverterIPAddress();
         var address = converter.Read(ref reader, typeof(string), JsonSerializerOptions.Default);
@@ -290,10 +290,10 @@ public void JsonConverterIPAddress_Read_Valid()
     public void JsonConverterIPAddress_Read_Invalid()
     {
         var converter = new JsonConverterIPAddress();
-        Assert.ThrowsException<FormatException>(() =>
+        _ = Assert.ThrowsException<FormatException>(() =>
         {
             var reader = new Utf8JsonReader("\"xxx\""u8);
-            reader.Read();
+            _ = reader.Read();
 
             _ = converter.Read(ref reader, typeof(string), JsonSerializerOptions.Default);
         });
@@ -303,10 +303,10 @@ public void JsonConverterIPAddress_Read_Invalid()
     public void JsonConverterIPAddress_Read_Null()
     {
         var converter = new JsonConverterIPAddress();
-        Assert.ThrowsException<InvalidDataException>(() =>
+        _ = Assert.ThrowsException<InvalidDataException>(() =>
         {
             var reader = new Utf8JsonReader("null"u8);
-            reader.Read();
+            _ = reader.Read();
             var address = converter.Read(ref reader, typeof(string), JsonSerializerOptions.Default);
         });
     }
@@ -328,7 +328,7 @@ public void JsonConverterIPAddress_Write_Valid()
     public void JsonConverterIPAddress_Write_NullWriter()
     {
         var converter = new JsonConverterIPAddress();
-        Assert.ThrowsException<ArgumentNullException>(() =>
+        _ = Assert.ThrowsException<ArgumentNullException>(() =>
         {
             converter.Write(null!, IPAddress.Parse("1.2.3.4"), JsonSerializerOptions.Default);
         });
@@ -340,7 +340,7 @@ public void JsonConverterIPAddress_Write_NullValue()
         using var memoryStream = new MemoryStream();
         using var writer = new Utf8JsonWriter(memoryStream, new() { SkipValidation = true });
         var converter = new JsonConverterIPAddress();
-        Assert.ThrowsException<ArgumentNullException>(() =>
+        _ = Assert.ThrowsException<ArgumentNullException>(() =>
         {
             converter.Write(writer, null!, JsonSerializerOptions.Default);
         });
diff --git a/UnitTests/BusId_Tests.cs b/UnitTests/BusId_Tests.cs
index 54cfd1e..12e6d59 100644
--- a/UnitTests/BusId_Tests.cs
+++ b/UnitTests/BusId_Tests.cs
@@ -22,7 +22,7 @@ public void DefaultConstructor()
     [TestMethod]
     public void ConstructorWithInvalidBusThrows()
     {
-        Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
+        _ = Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
         {
             var busId = new BusId(0, 1);
         });
@@ -31,7 +31,7 @@ public void ConstructorWithInvalidBusThrows()
     [TestMethod]
     public void ConstructorWithInvalidPortThrows()
     {
-        Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
+        _ = Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
         {
             var busId = new BusId(1, 0);
         });
@@ -51,7 +51,7 @@ public void JsonConstructor()
     }
 
     [TestMethod]
-    public void ÍncompatibleHub()
+    public void IncompatibleHub()
     {
         Assert.AreEqual(0, BusId.IncompatibleHub.Bus);
         Assert.AreEqual(0, BusId.IncompatibleHub.Port);
@@ -80,10 +80,7 @@ sealed class BusIdData
             "1-01",
         ];
 
-        public static IEnumerable<string[]> Invalid
-        {
-            get => from value in _Invalid select new string[] { value };
-        }
+        public static IEnumerable<string[]> Invalid => from value in _Invalid select new string[] { value };
 
         static readonly string[] _Valid = [
             "IncompatibleHub",
@@ -107,19 +104,27 @@ public static IEnumerable<string[]> Invalid
 
         public static IEnumerable<string[]> Valid => from value in _Valid select new string[] { value };
 
-        static int ExpectedCompare(string left, string right) =>
-            BusFromValidBusId(left) < BusFromValidBusId(right) ? -1 :
-            BusFromValidBusId(left) > BusFromValidBusId(right) ? 1 :
-            PortFromValidBusId(left) < PortFromValidBusId(right) ? -1 :
-            PortFromValidBusId(left) > PortFromValidBusId(right) ? 1 : 0;
+        static int ExpectedCompare(string left, string right)
+        {
+            return BusFromValidBusId(left) < BusFromValidBusId(right) ? -1
+                : BusFromValidBusId(left) > BusFromValidBusId(right) ? 1
+                : PortFromValidBusId(left) < PortFromValidBusId(right) ? -1
+                : PortFromValidBusId(left) > PortFromValidBusId(right) ? 1
+                : 0;
+        }
 
         public static IEnumerable<object[]> Compare => from left in _Valid from right in _Valid select new object[] { left, right, ExpectedCompare(left, right) };
     }
 
-    static ushort BusFromValidBusId(string text) => (text == "IncompatibleHub") ? (ushort)0 : ushort.Parse(text.Split('-')[0]);
-
-    static ushort PortFromValidBusId(string text) => (text == "IncompatibleHub") ? (ushort)0 : ushort.Parse(text.Split('-')[1]);
+    static ushort BusFromValidBusId(string text)
+    {
+        return (text == "IncompatibleHub") ? (ushort)0 : ushort.Parse(text.Split('-')[0]);
+    }
 
+    static ushort PortFromValidBusId(string text)
+    {
+        return (text == "IncompatibleHub") ? (ushort)0 : ushort.Parse(text.Split('-')[1]);
+    }
 
     [TestMethod]
     [DynamicData(nameof(BusIdData.Invalid), typeof(BusIdData))]
@@ -146,7 +151,7 @@ public void TryParseValid(string text)
     [DynamicData(nameof(BusIdData.Invalid), typeof(BusIdData))]
     public void ParseInvalid(string text)
     {
-        Assert.ThrowsException<FormatException>(() =>
+        _ = Assert.ThrowsException<FormatException>(() =>
         {
             var busId = BusId.Parse(text);
         });
diff --git a/UnitTests/ClientContext_Tests.cs b/UnitTests/ClientContext_Tests.cs
index 2c5f54f..8db3232 100644
--- a/UnitTests/ClientContext_Tests.cs
+++ b/UnitTests/ClientContext_Tests.cs
@@ -44,7 +44,7 @@ public void Dispose()
     {
         var clientContext = new ClientContext();
         ((IDisposable)clientContext).Dispose();
-        Assert.ThrowsException<ObjectDisposedException>(() =>
+        _ = Assert.ThrowsException<ObjectDisposedException>(() =>
         {
             clientContext.TcpClient.Connect(IPAddress.Loopback, 1234);
         });
diff --git a/UnitTests/ConfigurationManagerException_Tests.cs b/UnitTests/ConfigurationManagerException_Tests.cs
index 2f226a6..befb5f2 100644
--- a/UnitTests/ConfigurationManagerException_Tests.cs
+++ b/UnitTests/ConfigurationManagerException_Tests.cs
@@ -51,10 +51,7 @@ sealed class MappingData
             { (CONFIGRET)0xbaadf00d, WIN32_ERROR.ERROR_CAN_NOT_COMPLETE }, // unknown error
         };
 
-        public static IEnumerable<object[]> KnownGood
-        {
-            get => from value in _KnownGood select new object[] { value.Key, value.Value };
-        }
+        public static IEnumerable<object[]> KnownGood => from value in _KnownGood select new object[] { value.Key, value.Value };
     }
 
     [TestMethod]
diff --git a/UnitTests/DeviceFile_Tests.cs b/UnitTests/DeviceFile_Tests.cs
index 3c4e9fc..ff9ec73 100644
--- a/UnitTests/DeviceFile_Tests.cs
+++ b/UnitTests/DeviceFile_Tests.cs
@@ -23,7 +23,7 @@ public void Constructor_Success()
     public void Constructor_FileNotFound()
     {
         using var temporaryFile = new TemporaryFile();
-        Assert.ThrowsException<Win32Exception>(() =>
+        _ = Assert.ThrowsException<Win32Exception>(() =>
         {
             using var deviceFile = new DeviceFile(temporaryFile.AbsolutePath);
         });
@@ -35,7 +35,7 @@ public void Dispose()
         using var temporaryFile = new TemporaryFile(true);
         var deviceFile = new DeviceFile(temporaryFile.AbsolutePath);
         deviceFile.Dispose();
-        Assert.ThrowsException<ObjectDisposedException>(() =>
+        _ = Assert.ThrowsException<ObjectDisposedException>(() =>
         {
             _ = deviceFile.DangerousGetHandle();
         });
@@ -104,7 +104,7 @@ public void IoControlAsync_Win32Exception()
         {
             deviceFile.IoControlAsync(TEST_IOCTL.FSCTL_QUERY_ALLOCATED_RANGES, null, null).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(Win32Exception));
+        Assert.IsInstanceOfType<Win32Exception>(exception.InnerException);
     }
 
     [TestMethod]
@@ -118,6 +118,6 @@ public void IoControlAsync_ProtocolViolation()
         {
             deviceFile.IoControlAsync(TEST_IOCTL.FSCTL_QUERY_ALLOCATED_RANGES, Tools.StructToBytes(rangeBuffer), outputBuffer).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(ProtocolViolationException));
+        Assert.IsInstanceOfType<ProtocolViolationException>(exception.InnerException);
     }
 }
diff --git a/UnitTests/ExportedDevice_Tests.cs b/UnitTests/ExportedDevice_Tests.cs
index a802b2a..7e2cf37 100644
--- a/UnitTests/ExportedDevice_Tests.cs
+++ b/UnitTests/ExportedDevice_Tests.cs
@@ -22,7 +22,7 @@ sealed class ExportedDevice_Tests
         DeviceProtocol: 0x67,
         ConfigurationValue: 3,
         NumConfigurations: 4,
-        Interfaces: new() { (1, 2, 3), (4, 5, 6) }
+        Interfaces: [(1, 2, 3), (4, 5, 6)]
     );
 
     /// <summary>
diff --git a/UnitTests/GlobalFixture.cs b/UnitTests/GlobalFixture.cs
index 748eb1f..231f5d4 100644
--- a/UnitTests/GlobalFixture.cs
+++ b/UnitTests/GlobalFixture.cs
@@ -13,7 +13,7 @@ sealed class GlobalFixture
     public static void AssemblyInitialize(TestContext context)
     {
         _ = context;
-        Directory.CreateDirectory(TemporaryDirectory);
+        _ = Directory.CreateDirectory(TemporaryDirectory);
     }
 
     [AssemblyCleanup]
diff --git a/UnitTests/Interop_UsbIp_Tests.cs b/UnitTests/Interop_UsbIp_Tests.cs
index 55cb8eb..fb8ac89 100644
--- a/UnitTests/Interop_UsbIp_Tests.cs
+++ b/UnitTests/Interop_UsbIp_Tests.cs
@@ -92,7 +92,7 @@ public void ReadUsbIpHeaderAsync_Empty()
         {
             memoryStream.ReadUsbIpHeaderAsync(CancellationToken.None).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(EndOfStreamException));
+        Assert.IsInstanceOfType<EndOfStreamException>(exception.InnerException);
     }
 
     [TestMethod]
@@ -103,7 +103,7 @@ public void ReadUsbIpHeaderAsync_Short()
         {
             memoryStream.ReadUsbIpHeaderAsync(CancellationToken.None).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(ProtocolViolationException));
+        Assert.IsInstanceOfType<ProtocolViolationException>(exception.InnerException);
     }
 
     [TestMethod]
@@ -150,7 +150,7 @@ public void ReadUsbIpIsoPacketDescriptorsAsync_Empty()
         {
             memoryStream.ReadUsbIpIsoPacketDescriptorsAsync(1, CancellationToken.None).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(EndOfStreamException));
+        Assert.IsInstanceOfType<EndOfStreamException>(exception.InnerException);
     }
 
     [TestMethod]
@@ -161,7 +161,7 @@ public void ReadUsbIpIsoPacketDescriptorsAsync_Short()
         {
             memoryStream.ReadUsbIpIsoPacketDescriptorsAsync(1, CancellationToken.None).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(ProtocolViolationException));
+        Assert.IsInstanceOfType<ProtocolViolationException>(exception.InnerException);
     }
 
     [TestMethod]
@@ -190,7 +190,7 @@ public void ReadUsbIpIsoPacketDescriptorsAsync_Short_Multiple()
         {
             memoryStream.ReadUsbIpIsoPacketDescriptorsAsync(2, CancellationToken.None).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(ProtocolViolationException));
+        Assert.IsInstanceOfType<ProtocolViolationException>(exception.InnerException);
     }
 
     [TestMethod]
@@ -198,9 +198,9 @@ public void UsbIpIsoPacketDescriptors_ToBytes_Success()
     {
         var usbIpIsoPacketDescriptors = new UsbIpIsoPacketDescriptor[]
         {
-            new UsbIpIsoPacketDescriptor(),
+            new(),
             TestUsbIpIsoPacketDescriptor,
-            new UsbIpIsoPacketDescriptor(),
+            new(),
         };
         var bytes = usbIpIsoPacketDescriptors.ToBytes();
         Assert.IsTrue(bytes.SequenceEqual(new byte[TestUsbIpIsoPacketDescriptorBytes.Length]
diff --git a/UnitTests/JsonHelpers.cs b/UnitTests/JsonHelpers.cs
index b906f0c..8d6d3d7 100644
--- a/UnitTests/JsonHelpers.cs
+++ b/UnitTests/JsonHelpers.cs
@@ -54,12 +54,12 @@ public static string NormalizePretty(string json)
             }
             else
             {
-                builder.Append("\r\n");
+                _ = builder.Append("\r\n");
             }
             lineOut = lineOut.Replace("[ ]", "[]");
             var extraIndent = lineOut.TakeWhile(c => c == ' ').ToArray();
 
-            builder.Append(extraIndent).Append(lineOut);
+            _ = builder.Append(extraIndent).Append(lineOut);
         }
         return builder.ToString();
     }
diff --git a/UnitTests/ParseTestBase.cs b/UnitTests/ParseTestBase.cs
index 8b7ab98..9f66831 100644
--- a/UnitTests/ParseTestBase.cs
+++ b/UnitTests/ParseTestBase.cs
@@ -8,7 +8,10 @@ namespace UnitTests;
 
 abstract class ParseTestBase
 {
-    internal static Mock<ICommandHandlers> CreateMock() => new(MockBehavior.Strict);
+    internal static Mock<ICommandHandlers> CreateMock()
+    {
+        return new(MockBehavior.Strict);
+    }
 
     internal static void Test(ExitCode expect, params string[] args)
     {
diff --git a/UnitTests/Parse_attach_Tests.cs b/UnitTests/Parse_attach_Tests.cs
index 0f5df21..91f2afa 100644
--- a/UnitTests/Parse_attach_Tests.cs
+++ b/UnitTests/Parse_attach_Tests.cs
@@ -19,7 +19,7 @@ sealed class Parse_attach_Tests
     public void BusIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, null,
+        _ = mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, null,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "attach", "--wsl", "--busid", TestBusId.ToString());
@@ -29,7 +29,7 @@ public void BusIdSuccess()
     public void BusIdSuccessWithAutoAttach()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), true, null,
+        _ = mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), true, null,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "attach", "--wsl", "--busid", TestBusId.ToString(), "--auto-attach");
@@ -39,7 +39,7 @@ public void BusIdSuccessWithAutoAttach()
     public void BusIdSuccessWithDistribution()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, It.Is<string>(distribution => distribution == TestDistribution),
+        _ = mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, It.Is<string>(distribution => distribution == TestDistribution),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "attach", "--wsl", TestDistribution, "--busid", TestBusId.ToString());
@@ -49,7 +49,7 @@ public void BusIdSuccessWithDistribution()
     public void BusIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, null,
+        _ = mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, null,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "attach", "--wsl", "--busid", TestBusId.ToString());
@@ -59,7 +59,7 @@ public void BusIdFailure()
     public void BusIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, null,
+        _ = mock.Setup(m => m.AttachWsl(It.Is<BusId>(busId => busId == TestBusId), false, null,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "attach", "--wsl", "--busid", TestBusId.ToString());
@@ -69,7 +69,7 @@ public void BusIdCanceled()
     public void HardwareIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false, null,
+        _ = mock.Setup(m => m.AttachWsl(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false, null,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "attach", "--wsl", "--hardware-id", TestHardwareId.ToString());
@@ -79,7 +79,7 @@ public void HardwareIdSuccess()
     public void HardwareIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false, null,
+        _ = mock.Setup(m => m.AttachWsl(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false, null,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "attach", "--wsl", "--hardware-id", TestHardwareId.ToString());
@@ -89,7 +89,7 @@ public void HardwareIdFailure()
     public void HardwareIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.AttachWsl(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false, null,
+        _ = mock.Setup(m => m.AttachWsl(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false, null,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "attach", "--wsl", "--hardware-id", TestHardwareId.ToString());
diff --git a/UnitTests/Parse_bind_Tests.cs b/UnitTests/Parse_bind_Tests.cs
index f6ccd6a..da1b00d 100644
--- a/UnitTests/Parse_bind_Tests.cs
+++ b/UnitTests/Parse_bind_Tests.cs
@@ -18,7 +18,7 @@ sealed class Parse_bind_Tests
     public void BusIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), false,
+        _ = mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "bind", "--busid", TestBusId.ToString());
@@ -28,7 +28,7 @@ public void BusIdSuccess()
     public void BusIdForceSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), true,
+        _ = mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), true,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "bind", "--busid", TestBusId.ToString(), "--force");
@@ -38,7 +38,7 @@ public void BusIdForceSuccess()
     public void BusIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), false,
+        _ = mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "bind", "--busid", TestBusId.ToString());
@@ -48,7 +48,7 @@ public void BusIdFailure()
     public void BusIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), false,
+        _ = mock.Setup(m => m.Bind(It.Is<BusId>(busId => busId == TestBusId), false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "bind", "--busid", TestBusId.ToString());
@@ -58,7 +58,7 @@ public void BusIdCanceled()
     public void HardwareIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false,
+        _ = mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "bind", "--hardware-id", TestHardwareId.ToString());
@@ -68,7 +68,7 @@ public void HardwareIdSuccess()
     public void HardwareIdForceSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), true,
+        _ = mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), true,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "bind", "--hardware-id", TestHardwareId.ToString(), "--force");
@@ -78,7 +78,7 @@ public void HardwareIdForceSuccess()
     public void HardwareIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false,
+        _ = mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "bind", "--hardware-id", TestHardwareId.ToString());
@@ -88,7 +88,7 @@ public void HardwareIdFailure()
     public void HardwareIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false,
+        _ = mock.Setup(m => m.Bind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId), false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "bind", "--hardware-id", TestHardwareId.ToString());
diff --git a/UnitTests/Parse_detach_Tests.cs b/UnitTests/Parse_detach_Tests.cs
index af814f7..3e183cf 100644
--- a/UnitTests/Parse_detach_Tests.cs
+++ b/UnitTests/Parse_detach_Tests.cs
@@ -18,7 +18,7 @@ sealed class Parse_detach_Tests
     public void AllSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.DetachAll(
+        _ = mock.Setup(m => m.DetachAll(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "detach", "--all");
@@ -28,7 +28,7 @@ public void AllSuccess()
     public void AllFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.DetachAll(
+        _ = mock.Setup(m => m.DetachAll(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "detach", "--all");
@@ -38,7 +38,7 @@ public void AllFailure()
     public void AllCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.DetachAll(
+        _ = mock.Setup(m => m.DetachAll(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "detach", "--all");
@@ -48,7 +48,7 @@ public void AllCanceled()
     public void BusIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Detach(It.Is<BusId>(busId => busId == TestBusId),
+        _ = mock.Setup(m => m.Detach(It.Is<BusId>(busId => busId == TestBusId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "detach", "--busid", TestBusId.ToString());
@@ -58,7 +58,7 @@ public void BusIdSuccess()
     public void BusIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Detach(It.Is<BusId>(busId => busId == TestBusId),
+        _ = mock.Setup(m => m.Detach(It.Is<BusId>(busId => busId == TestBusId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "detach", "--busid", TestBusId.ToString());
@@ -68,7 +68,7 @@ public void BusIdFailure()
     public void BusIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Detach(It.Is<BusId>(busId => busId == TestBusId),
+        _ = mock.Setup(m => m.Detach(It.Is<BusId>(busId => busId == TestBusId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "detach", "--busid", TestBusId.ToString());
@@ -78,7 +78,7 @@ public void BusIdCanceled()
     public void HardwareIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Detach(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
+        _ = mock.Setup(m => m.Detach(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "detach", "--hardware-id", TestHardwareId.ToString());
@@ -88,7 +88,7 @@ public void HardwareIdSuccess()
     public void HardwareIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Detach(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
+        _ = mock.Setup(m => m.Detach(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "detach", "--hardware-id", TestHardwareId.ToString());
@@ -98,7 +98,7 @@ public void HardwareIdFailure()
     public void HardwareIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Detach(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
+        _ = mock.Setup(m => m.Detach(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "detach", "--hardware-id", TestHardwareId.ToString());
diff --git a/UnitTests/Parse_license_Tests.cs b/UnitTests/Parse_license_Tests.cs
index fb70c9f..046633d 100644
--- a/UnitTests/Parse_license_Tests.cs
+++ b/UnitTests/Parse_license_Tests.cs
@@ -14,7 +14,7 @@ sealed class Parse_license_Tests
     public void Success()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.License(
+        _ = mock.Setup(m => m.License(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "license");
@@ -24,7 +24,7 @@ public void Success()
     public void Failure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.License(
+        _ = mock.Setup(m => m.License(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "license");
@@ -34,7 +34,7 @@ public void Failure()
     public void Canceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.License(
+        _ = mock.Setup(m => m.License(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "license");
diff --git a/UnitTests/Parse_list_Tests.cs b/UnitTests/Parse_list_Tests.cs
index 4f1842a..5617711 100644
--- a/UnitTests/Parse_list_Tests.cs
+++ b/UnitTests/Parse_list_Tests.cs
@@ -14,7 +14,7 @@ sealed class Parse_list_Tests
     public void Success()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.List(false,
+        _ = mock.Setup(m => m.List(false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "list");
@@ -24,7 +24,7 @@ public void Success()
     public void SuccessWithUsbids()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.List(true,
+        _ = mock.Setup(m => m.List(true,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "list", "--usbids");
@@ -34,7 +34,7 @@ public void SuccessWithUsbids()
     public void Failure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.List(false,
+        _ = mock.Setup(m => m.List(false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "list");
@@ -44,7 +44,7 @@ public void Failure()
     public void Canceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.List(false,
+        _ = mock.Setup(m => m.List(false,
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "list");
diff --git a/UnitTests/Parse_policy_Tests.cs b/UnitTests/Parse_policy_Tests.cs
index ea295a8..7a3dda3 100644
--- a/UnitTests/Parse_policy_Tests.cs
+++ b/UnitTests/Parse_policy_Tests.cs
@@ -43,7 +43,7 @@ public void OptionInvalid()
     public void list_Success()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.PolicyList(It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
+        _ = mock.Setup(m => m.PolicyList(It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "policy", "list");
     }
@@ -70,7 +70,7 @@ public void list_StrayArgument()
     public void add_BusIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.PolicyAdd(It.IsAny<PolicyRule>(),
+        _ = mock.Setup(m => m.PolicyAdd(It.IsAny<PolicyRule>(),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "policy", "add", "--effect", "Allow", "--operation", "AutoBind", "--busid", TestBusId.ToString());
@@ -80,7 +80,7 @@ public void add_BusIdSuccess()
     public void add_HardwareIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.PolicyAdd(It.IsAny<PolicyRule>(),
+        _ = mock.Setup(m => m.PolicyAdd(It.IsAny<PolicyRule>(),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "policy", "add", "--effect", "Allow", "--operation", "AutoBind", "--hardware-id", TestHardwareId.ToString());
@@ -90,7 +90,7 @@ public void add_HardwareIdSuccess()
     public void add_BothSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.PolicyAdd(It.IsAny<PolicyRule>(),
+        _ = mock.Setup(m => m.PolicyAdd(It.IsAny<PolicyRule>(),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "policy", "add", "--effect", "Allow", "--operation", "AutoBind",
@@ -107,7 +107,7 @@ public void add_MissingCondition()
     public void remove_GuidSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.PolicyRemove(It.IsAny<Guid>(),
+        _ = mock.Setup(m => m.PolicyRemove(It.IsAny<Guid>(),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "policy", "remove", "--guid", TestGuid.ToString());
@@ -117,7 +117,7 @@ public void remove_GuidSuccess()
     public void remove_AllSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.PolicyRemoveAll(It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
+        _ = mock.Setup(m => m.PolicyRemoveAll(It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "policy", "remove", "--all");
     }
diff --git a/UnitTests/Parse_server_Tests.cs b/UnitTests/Parse_server_Tests.cs
index 496cb44..f6c8391 100644
--- a/UnitTests/Parse_server_Tests.cs
+++ b/UnitTests/Parse_server_Tests.cs
@@ -14,7 +14,7 @@ sealed class Parse_server_Tests
     public void Success()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(Array.Empty<string>())),
+        _ = mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(Array.Empty<string>())),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "server");
@@ -32,7 +32,7 @@ public void SuccessWithArguments()
         };
 
         var mock = CreateMock();
-        mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(testArgs)),
+        _ = mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(testArgs)),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, testArgs.Prepend("server").ToArray());
@@ -42,7 +42,7 @@ public void SuccessWithArguments()
     public void Failure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(Array.Empty<string>())),
+        _ = mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(Array.Empty<string>())),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "server");
@@ -52,7 +52,7 @@ public void Failure()
     public void Canceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(Array.Empty<string>())),
+        _ = mock.Setup(m => m.Server(It.Is<string[]>(array => array.SequenceEqual(Array.Empty<string>())),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "server");
diff --git a/UnitTests/Parse_state_Tests.cs b/UnitTests/Parse_state_Tests.cs
index d9ee217..5bd6649 100644
--- a/UnitTests/Parse_state_Tests.cs
+++ b/UnitTests/Parse_state_Tests.cs
@@ -14,7 +14,7 @@ sealed class Parse_state_Tests
     public void Success()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.State(
+        _ = mock.Setup(m => m.State(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "state");
@@ -24,7 +24,7 @@ public void Success()
     public void Failure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.State(
+        _ = mock.Setup(m => m.State(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "state");
@@ -34,7 +34,7 @@ public void Failure()
     public void Canceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.State(
+        _ = mock.Setup(m => m.State(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "state");
diff --git a/UnitTests/Parse_unbind_Tests.cs b/UnitTests/Parse_unbind_Tests.cs
index bdd3e30..aa1bcbf 100644
--- a/UnitTests/Parse_unbind_Tests.cs
+++ b/UnitTests/Parse_unbind_Tests.cs
@@ -19,7 +19,7 @@ sealed class Parse_unbind_Tests
     public void AllSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.UnbindAll(
+        _ = mock.Setup(m => m.UnbindAll(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "unbind", "--all");
@@ -29,7 +29,7 @@ public void AllSuccess()
     public void AllFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.UnbindAll(
+        _ = mock.Setup(m => m.UnbindAll(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "unbind", "--all");
@@ -39,7 +39,7 @@ public void AllFailure()
     public void AllCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.UnbindAll(
+        _ = mock.Setup(m => m.UnbindAll(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "unbind", "--all");
@@ -49,7 +49,7 @@ public void AllCanceled()
     public void BusIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<BusId>(busId => busId == TestBusId),
+        _ = mock.Setup(m => m.Unbind(It.Is<BusId>(busId => busId == TestBusId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "unbind", "--busid", TestBusId.ToString());
@@ -59,7 +59,7 @@ public void BusIdSuccess()
     public void BusIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<BusId>(busId => busId == TestBusId),
+        _ = mock.Setup(m => m.Unbind(It.Is<BusId>(busId => busId == TestBusId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "unbind", "--busid", TestBusId.ToString());
@@ -69,7 +69,7 @@ public void BusIdFailure()
     public void BusIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<BusId>(busId => busId == TestBusId),
+        _ = mock.Setup(m => m.Unbind(It.Is<BusId>(busId => busId == TestBusId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "unbind", "--busid", TestBusId.ToString());
@@ -79,7 +79,7 @@ public void BusIdCanceled()
     public void GuidSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<Guid>(guid => guid == Guid.Parse("{E863A2AF-AE47-440B-A32B-FAB1C03017AB}")),
+        _ = mock.Setup(m => m.Unbind(It.Is<Guid>(guid => guid == Guid.Parse("{E863A2AF-AE47-440B-A32B-FAB1C03017AB}")),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "unbind", "--guid", "{E863A2AF-AE47-440B-A32B-FAB1C03017AB}");
@@ -89,7 +89,7 @@ public void GuidSuccess()
     public void GuidFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<Guid>(guid => guid == Guid.Parse("{E863A2AF-AE47-440B-A32B-FAB1C03017AB}")),
+        _ = mock.Setup(m => m.Unbind(It.Is<Guid>(guid => guid == Guid.Parse("{E863A2AF-AE47-440B-A32B-FAB1C03017AB}")),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "unbind", "--guid", "{E863A2AF-AE47-440B-A32B-FAB1C03017AB}");
@@ -99,7 +99,7 @@ public void GuidFailure()
     public void GuidCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<Guid>(guid => guid == TestGuid),
+        _ = mock.Setup(m => m.Unbind(It.Is<Guid>(guid => guid == TestGuid),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "unbind", "--guid", TestGuid.ToString());
@@ -109,7 +109,7 @@ public void GuidCanceled()
     public void HardwareIdSuccess()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
+        _ = mock.Setup(m => m.Unbind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Success));
 
         Test(ExitCode.Success, mock, "unbind", "--hardware-id", TestHardwareId.ToString());
@@ -119,7 +119,7 @@ public void HardwareIdSuccess()
     public void HardwareIdFailure()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
+        _ = mock.Setup(m => m.Unbind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(ExitCode.Failure));
 
         Test(ExitCode.Failure, mock, "unbind", "--hardware-id", TestHardwareId.ToString());
@@ -129,7 +129,7 @@ public void HardwareIdFailure()
     public void HardwareIdCanceled()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.Unbind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
+        _ = mock.Setup(m => m.Unbind(It.Is<VidPid>(vidPid => vidPid == TestHardwareId),
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<OperationCanceledException>();
 
         Test(ExitCode.Canceled, mock, "unbind", "--hardware-id", TestHardwareId.ToString());
diff --git a/UnitTests/PcapNg_Tests.cs b/UnitTests/PcapNg_Tests.cs
index 56af899..97b6ac2 100644
--- a/UnitTests/PcapNg_Tests.cs
+++ b/UnitTests/PcapNg_Tests.cs
@@ -10,16 +10,16 @@
 namespace UnitTests;
 
 [TestClass]
-sealed class PcapNg_Tests
+sealed partial class PcapNg_Tests
 {
-    sealed class MockConfiguration : IDisposable
+    sealed partial class MockConfiguration : IDisposable
     {
         public MockConfiguration(string? path, uint? snapLength = null)
         {
-            Mock.Setup(m => m["usbipd:PcapNg:Path"]).Returns(path!);
+            _ = Mock.Setup(m => m["usbipd:PcapNg:Path"]).Returns(path!);
             if (path is not null)
             {
-                Mock.Setup(m => m["usbipd:PcapNg:SnapLength"]).Returns(snapLength?.ToString()!);
+                _ = Mock.Setup(m => m["usbipd:PcapNg:SnapLength"]).Returns(snapLength?.ToString()!);
             }
         }
 
@@ -114,21 +114,15 @@ sealed class TypeData
             { UsbSupTransferType.USBSUP_TRANSFER_TYPE_BULK, 3 },
         };
 
-        static readonly List<UsbSupTransferType> _Invalid = new()
-        {
+        static readonly List<UsbSupTransferType> _Invalid =
+        [
             UsbSupTransferType.USBSUP_TRANSFER_TYPE_CTRL,
             (UsbSupTransferType)0xbaadf00d,
-        };
+        ];
 
-        public static IEnumerable<object[]> KnownGood
-        {
-            get => from value in _KnownGood select new object[] { value.Key, value.Value };
-        }
+        public static IEnumerable<object[]> KnownGood => from value in _KnownGood select new object[] { value.Key, value.Value };
 
-        public static IEnumerable<object[]> Invalid
-        {
-            get => from value in _Invalid select new object[] { value };
-        }
+        public static IEnumerable<object[]> Invalid => from value in _Invalid select new object[] { value };
     }
 
 
@@ -143,7 +137,7 @@ public void ConvertType_Success(UsbSupTransferType from, byte to)
     [DynamicData(nameof(TypeData.Invalid), typeof(TypeData))]
     public void ConvertType_Invalid(UsbSupTransferType from)
     {
-        Assert.ThrowsException<ArgumentOutOfRangeException>(() => PcapNg.ConvertType(from));
+        _ = Assert.ThrowsException<ArgumentOutOfRangeException>(() => PcapNg.ConvertType(from));
     }
 
     [TestMethod]
diff --git a/UnitTests/Policy_Tests.cs b/UnitTests/Policy_Tests.cs
index 23e8e44..2a4c413 100644
--- a/UnitTests/Policy_Tests.cs
+++ b/UnitTests/Policy_Tests.cs
@@ -31,7 +31,10 @@ public static void ClassCleanup()
         BaseTempRegistryKey.Dispose();
     }
 
-    static TempRegistry CreateTempRegistry() => new(BaseTempRegistryKey.Key);
+    static TempRegistry CreateTempRegistry()
+    {
+        return new(BaseTempRegistryKey.Key);
+    }
 
     [TestMethod]
     public void Constructor_Success()
@@ -96,9 +99,9 @@ static UsbDevice CreateTestUsbDevice(BusId busId, VidPid hardwareId)
     [DynamicData(nameof(AutoBindData.Invalid), typeof(AutoBindData))]
     public void Match_Invalid_AutoBind(PolicyRuleAutoBind rule)
     {
-        Assert.ThrowsException<InvalidOperationException>(() =>
+        _ = Assert.ThrowsException<InvalidOperationException>(() =>
         {
-            rule.Matches(CreateTestUsbDevice(TestBusId, TestHardwareId));
+            _ = rule.Matches(CreateTestUsbDevice(TestBusId, TestHardwareId));
         });
     }
 
diff --git a/UnitTests/Program_Tests.cs b/UnitTests/Program_Tests.cs
index d21bcee..e11fcd1 100644
--- a/UnitTests/Program_Tests.cs
+++ b/UnitTests/Program_Tests.cs
@@ -28,10 +28,10 @@ public void MainParseError()
     public void RunInvalidExitCode()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.License(
+        _ = mock.Setup(m => m.License(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult((ExitCode)0x0badf00d));
 
-        Assert.ThrowsException<UnexpectedResultException>(() =>
+        _ = Assert.ThrowsException<UnexpectedResultException>(() =>
         {
             Test(ExitCode.Success, mock, "license");
         });
@@ -41,20 +41,20 @@ public void RunInvalidExitCode()
     public void RunException()
     {
         var mock = CreateMock();
-        mock.Setup(m => m.License(
+        _ = mock.Setup(m => m.License(
             It.IsNotNull<IConsole>(), It.IsAny<CancellationToken>())).Throws<NotImplementedException>();
 
         var exception = Assert.ThrowsException<AggregateException>(() =>
         {
             Test(ExitCode.Success, mock, "license");
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(NotImplementedException));
+        Assert.IsInstanceOfType<NotImplementedException>(exception.InnerException);
     }
 
     [TestMethod]
     public void CompletionGuard_DoesNotThrow()
     {
         var completions = Program.CompletionGuard(null!, null!);
-        Assert.IsTrue(completions.SequenceEqual(Array.Empty<string>()));
+        Assert.IsTrue(completions.SequenceEqual([]));
     }
 }
diff --git a/UnitTests/TempRegistry.cs b/UnitTests/TempRegistry.cs
index 776a3fe..f95123e 100644
--- a/UnitTests/TempRegistry.cs
+++ b/UnitTests/TempRegistry.cs
@@ -6,7 +6,7 @@
 
 namespace UnitTests;
 
-sealed class TempRegistry : IDisposable
+sealed partial class TempRegistry : IDisposable
 {
     public string Name { get; } = Guid.NewGuid().ToString("B");
     public RegistryKey Key { get; }
diff --git a/UnitTests/TemporaryFile.cs b/UnitTests/TemporaryFile.cs
index 62e5d01..495dd20 100644
--- a/UnitTests/TemporaryFile.cs
+++ b/UnitTests/TemporaryFile.cs
@@ -4,7 +4,7 @@
 
 namespace UnitTests;
 
-sealed class TemporaryFile : IDisposable
+sealed partial class TemporaryFile : IDisposable
 {
     static long Count;
 
diff --git a/UnitTests/Tools_Tests.cs b/UnitTests/Tools_Tests.cs
index 9b45b52..2008b66 100644
--- a/UnitTests/Tools_Tests.cs
+++ b/UnitTests/Tools_Tests.cs
@@ -49,7 +49,7 @@ public void ReadMessageAsync_EndOfStream()
         {
             memoryStream.ReadMessageAsync(buf, CancellationToken.None).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(EndOfStreamException));
+        Assert.IsInstanceOfType<EndOfStreamException>(exception.InnerException);
     }
 
     [TestMethod]
@@ -61,7 +61,7 @@ public void ReadMessageAsync_ProtocolViolation()
         {
             memoryStream.ReadMessageAsync(buf, CancellationToken.None).Wait();
         });
-        Assert.IsInstanceOfType(exception.InnerException, typeof(ProtocolViolationException));
+        Assert.IsInstanceOfType<ProtocolViolationException>(exception.InnerException);
     }
 
     [TestMethod]
@@ -74,7 +74,7 @@ public void ReadMessageAsync_Parts()
         var buf = new byte[TestStreamBytes.Length - 1];
         writeStream.Write(TestStreamBytes.AsSpan(0, 1));
         var task = readStream.ReadMessageAsync(buf, CancellationToken.None);
-        task.Wait(100);
+        _ = task.Wait(100);
         Assert.AreEqual(TaskStatus.WaitingForActivation, task.Status);
         writeStream.Write(TestStreamBytes.AsSpan(1));
         task.Wait();
@@ -115,7 +115,7 @@ public void StructToBytes_Span_Success()
     public void StructToBytes_Span_Short()
     {
         var buf = new byte[TestStructBytes.Length - 1];
-        Assert.ThrowsException<ArgumentException>(() =>
+        _ = Assert.ThrowsException<ArgumentException>(() =>
         {
             StructToBytes(TestStruct, buf);
         });
@@ -138,7 +138,7 @@ public void BytesToStruct_out_Success()
     [TestMethod]
     public void BytesToStruct_out_Short()
     {
-        Assert.ThrowsException<ArgumentException>(() =>
+        _ = Assert.ThrowsException<ArgumentException>(() =>
         {
             BytesToStruct(TestStructBytes.AsSpan()[0..^1], out TestStructType s);
         });
@@ -154,7 +154,7 @@ public void BytesToStruct_Success()
     [TestMethod]
     public void BytesToStruct_Short()
     {
-        Assert.ThrowsException<ArgumentException>(() =>
+        _ = Assert.ThrowsException<ArgumentException>(() =>
         {
             _ = BytesToStruct<TestStructType>(TestStructBytes.AsSpan()[0..^1]);
         });
@@ -171,10 +171,7 @@ sealed class SpeedData
             { (USB_DEVICE_SPEED)0x0badf00d, UsbDeviceSpeed.USB_SPEED_UNKNOWN },
         };
 
-        public static IEnumerable<object[]> KnownGood
-        {
-            get => from value in _KnownGood select new object[] { value.Key, value.Value };
-        }
+        public static IEnumerable<object[]> KnownGood => from value in _KnownGood select new object[] { value.Key, value.Value };
     }
 
     [TestMethod]
@@ -198,10 +195,7 @@ sealed class ErrorData
             { (UsbSupError)0xbaadf00d, Errno.EPROTO },
         };
 
-        public static IEnumerable<object[]> KnownGood
-        {
-            get => from value in _KnownGood select new object[] { value.Key, value.Value };
-        }
+        public static IEnumerable<object[]> KnownGood => from value in _KnownGood select new object[] { value.Key, value.Value };
     }
 
     [TestMethod]
diff --git a/UnitTests/VidPid_Tests.cs b/UnitTests/VidPid_Tests.cs
index 9e3bbdd..8e984b3 100644
--- a/UnitTests/VidPid_Tests.cs
+++ b/UnitTests/VidPid_Tests.cs
@@ -48,10 +48,7 @@ sealed class VidPidData
             "0000:000g",
         ];
 
-        public static IEnumerable<string[]> Invalid
-        {
-            get => from value in _Invalid select new string[] { value };
-        }
+        public static IEnumerable<string[]> Invalid => from value in _Invalid select new string[] { value };
 
         static readonly string[] _Valid = [
             "0000:0000",
@@ -70,10 +67,7 @@ public static IEnumerable<string[]> Invalid
             "fFfF:FfFf",
         ];
 
-        public static IEnumerable<string[]> Valid
-        {
-            get => from value in _Valid select new string[] { value };
-        }
+        public static IEnumerable<string[]> Valid => from value in _Valid select new string[] { value };
 
         static int ExpectedCompare(string left, string right)
         {
@@ -89,10 +83,7 @@ static int ExpectedCompare(string left, string right)
                 leftPid > rightPid ? 1 : 0;
         }
 
-        public static IEnumerable<object[]> Compare
-        {
-            get => from left in _Valid from right in _Valid select new object[] { left, right, ExpectedCompare(left, right) };
-        }
+        public static IEnumerable<object[]> Compare => from left in _Valid from right in _Valid select new object[] { left, right, ExpectedCompare(left, right) };
     }
 
     [TestMethod]
@@ -122,7 +113,7 @@ public void TryParseValid(string text)
     [DynamicData(nameof(VidPidData.Invalid), typeof(VidPidData))]
     public void ParseInvalid(string text)
     {
-        Assert.ThrowsException<FormatException>(() =>
+        _ = Assert.ThrowsException<FormatException>(() =>
         {
             var vidPid = VidPid.Parse(text);
         });
@@ -254,10 +245,7 @@ sealed class HardwareIdData
             "0000:0000",
         ];
 
-        public static IEnumerable<string[]> Invalid
-        {
-            get => from value in _Invalid select new string[] { value };
-        }
+        public static IEnumerable<string[]> Invalid => from value in _Invalid select new string[] { value };
 
         static readonly string[] _Valid = [
             "VID_0000&PID_0000",
@@ -277,17 +265,14 @@ public static IEnumerable<string[]> Invalid
             "xxxVID_0000&PID_0000xxx",
         ];
 
-        public static IEnumerable<string[]> Valid
-        {
-            get => from value in _Valid select new string[] { value };
-        }
+        public static IEnumerable<string[]> Valid => from value in _Valid select new string[] { value };
     }
 
     [TestMethod]
     [DynamicData(nameof(HardwareIdData.Invalid), typeof(HardwareIdData))]
     public void FromHardwareOrInstanceIdInvalid(string text)
     {
-        Assert.ThrowsException<FormatException>(() =>
+        _ = Assert.ThrowsException<FormatException>(() =>
         {
             var vidPid = VidPid.FromHardwareOrInstanceId(text);
         });
diff --git a/UnitTests/packages.lock.json b/UnitTests/packages.lock.json
index 2412fde..c860b20 100644
--- a/UnitTests/packages.lock.json
+++ b/UnitTests/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 2,
   "dependencies": {
-    "net8.0-windows10.0.17763": {
+    "net9.0-windows10.0.17763": {
       "coverlet.collector": {
         "type": "Direct",
         "requested": "[6.0.2, )",
@@ -62,9 +62,9 @@
       },
       "System.IO.Pipelines": {
         "type": "Direct",
-        "requested": "[8.0.0, )",
-        "resolved": "8.0.0",
-        "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA=="
+        "requested": "[9.0.0, )",
+        "resolved": "9.0.0",
+        "contentHash": "eA3cinogwaNB4jdjQHOP3Z3EuyiDII7MT35jgtnsA4vkn0LUrrSHsU0nzHTzFzmaFYeKV7MYyMxOocFzsBHpTw=="
       },
       "Castle.Core": {
         "type": "Transitive",
@@ -89,281 +89,281 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==",
+        "resolved": "9.0.0",
+        "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==",
+        "resolved": "9.0.0",
+        "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
+        "resolved": "9.0.0",
+        "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.CommandLine": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "NZuZMz3Q8Z780nKX3ifV1fE7lS+6pynDHK71OfU4OZ1ItgvDOhyOC7E6z+JMZrAj63zRpwbdldYFk499t3+1dQ==",
+        "resolved": "9.0.0",
+        "contentHash": "qD+hdkBtR9Ps7AxfhTJCnoVakkadHgHlD1WRN0QHGHod+SDuca1ao1kF4G2rmpAz2AEKrE2N2vE8CCCZ+ILnNw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.EnvironmentVariables": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "plvZ0ZIpq+97gdPNNvhwvrEZ92kNml9hd1pe3idMA7svR0PztdzVLkoWLcRFgySYXUJc3kSM3Xw3mNFMo/bxRA==",
+        "resolved": "9.0.0",
+        "contentHash": "v5R638eNMxksfXb7MFnkPwLPp+Ym4W/SIGNuoe8qFVVyvygQD5DdLusybmYSJEr9zc1UzWzim/ATKeIOVvOFDg==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.FileExtensions": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "EJzSNO9oaAXnTdtdNO6npPRsIIeZCBSNmdQ091VDO7fBiOtJAAeEq6dtrVXIi3ZyjC5XRSAtVvF8SzcneRHqKQ==",
+        "resolved": "9.0.0",
+        "contentHash": "4EK93Jcd2lQG4GY6PAw8jGss0ZzFP0vPc1J85mES5fKNuDTqgFXHba9onBw2s18fs3I4vdo2AWyfD1mPAxWSQQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Physical": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Physical": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Json": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "L89DLNuimOghjV3tLx0ArFDwVEJD6+uGB3BMCMX01kaLzXkaXHb2021xOMl2QOxUxbdePKUZsUY7n2UUkycjRg==",
+        "resolved": "9.0.0",
+        "contentHash": "WiTK0LrnsqmedrbzwL7f4ZUo+/wByqy2eKab39I380i2rd8ImfCRMrtkqJVGDmfqlkP/YzhckVOwPc5MPrSNpg==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.UserSecrets": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "7tYqdPPpAK+3jO9d5LTuCK2VxrEdf85Ol4trUr6ds4jclBecadWZ/RyPCbNjfbN5iGTfUnD/h65TOQuqQv2c+A==",
+        "resolved": "9.0.0",
+        "contentHash": "FShWw8OysquwV7wQHYkkz0VWsJSo6ETUu4h7tJRMtnG0uR+tzKOldhcO8xB1pGSOI3Ng6v3N1Q94YO8Rzq1P6A==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Json": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Physical": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Json": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Physical": "9.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==",
+        "resolved": "9.0.0",
+        "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg=="
+        "resolved": "9.0.0",
+        "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg=="
       },
       "Microsoft.Extensions.Diagnostics": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "doVPCUUCY7c6LhBsEfiy3W1bvS7Mi6LkfQMS8nlC22jZWNxBv8VO8bdfeyvpYFst6Kxqk7HBC6lytmEoBssvSQ==",
+        "resolved": "9.0.0",
+        "contentHash": "0CF9ZrNw5RAlRfbZuVIvzzhP8QeWqHiUmMBU/2H7Nmit8/vwP3/SbHeEctth7D4Gz2fBnEbokPc1NU8/j/1ZLw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1",
-          "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Diagnostics.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "elH2vmwNmsXuKmUeMQ4YW9ldXiF+gSGDgg1vORksob5POnpaI6caj1Hu8zaYbEuibhqCoWg0YRWDazBY3zjBfg==",
+        "resolved": "9.0.0",
+        "contentHash": "1K8P7XzuzX8W8pmXcZjcrqS6x5eSSdvhQohmcpgiQNY/HlDAlnrhR9dvlURfFz428A+RTCJpUyB+aKTA6AgVcQ==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.FileProviders.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==",
+        "resolved": "9.0.0",
+        "contentHash": "uK439QzYR0q2emLVtYzwyK3x+T5bTY4yWsd/k/ZUS9LR6Sflp8MIdhGXW8kQCd86dQD4tLqvcbLkku8qHY263Q==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.FileProviders.Physical": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==",
+        "resolved": "9.0.0",
+        "contentHash": "3+ZUSpOSmie+o8NnLIRqCxSh65XL/ExU7JYnFOg58awDRlY3lVpZ9A369jkoZL1rpsq7LDhEfkn2ghhGaY1y5Q==",
         "dependencies": {
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileSystemGlobbing": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileSystemGlobbing": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.FileSystemGlobbing": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ=="
+        "resolved": "9.0.0",
+        "contentHash": "jGFKZiXs2HNseK3NK/rfwHNNovER71jSj4BD1a/649ml9+h6oEtYd0GSALZDNW8jZ2Rh+oAeadOa6sagYW1F2A=="
       },
       "Microsoft.Extensions.Hosting": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "bP9EEkHBEfjgYiG8nUaXqMk/ujwJrffOkNPP7onpRMO8R+OUSESSP4xHkCAXgYZ1COP2Q9lXlU5gkMFh20gRuw==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Binder": "8.0.2",
-          "Microsoft.Extensions.Configuration.CommandLine": "8.0.0",
-          "Microsoft.Extensions.Configuration.EnvironmentVariables": "8.0.0",
-          "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1",
-          "Microsoft.Extensions.Configuration.Json": "8.0.1",
-          "Microsoft.Extensions.Configuration.UserSecrets": "8.0.1",
-          "Microsoft.Extensions.DependencyInjection": "8.0.1",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Diagnostics": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Physical": "8.0.0",
-          "Microsoft.Extensions.Hosting.Abstractions": "8.0.1",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging.Configuration": "8.0.1",
-          "Microsoft.Extensions.Logging.Console": "8.0.1",
-          "Microsoft.Extensions.Logging.Debug": "8.0.1",
-          "Microsoft.Extensions.Logging.EventLog": "8.0.1",
-          "Microsoft.Extensions.Logging.EventSource": "8.0.1",
-          "Microsoft.Extensions.Options": "8.0.2"
+        "resolved": "9.0.0",
+        "contentHash": "wNmQWRCa83HYbpxQ3wH7xBn8oyGjONSj1k8svzrFUFyJMfg/Ja/g0NfI0p85wxlUxBh97A6ypmL8X5vVUA5y2Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Binder": "9.0.0",
+          "Microsoft.Extensions.Configuration.CommandLine": "9.0.0",
+          "Microsoft.Extensions.Configuration.EnvironmentVariables": "9.0.0",
+          "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Json": "9.0.0",
+          "Microsoft.Extensions.Configuration.UserSecrets": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Diagnostics": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Physical": "9.0.0",
+          "Microsoft.Extensions.Hosting.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging.Configuration": "9.0.0",
+          "Microsoft.Extensions.Logging.Console": "9.0.0",
+          "Microsoft.Extensions.Logging.Debug": "9.0.0",
+          "Microsoft.Extensions.Logging.EventLog": "9.0.0",
+          "Microsoft.Extensions.Logging.EventSource": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.Hosting.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "nHwq9aPBdBPYXPti6wYEEfgXddfBrYC+CQLn+qISiwQq5tpfaqDZSKOJNxoe9rfQxGf1c+2wC/qWFe1QYJPYqw==",
+        "resolved": "9.0.0",
+        "contentHash": "yUKJgu81ExjvqbNWqZKshBbLntZMbMVz/P7Way2SBx7bMqA08Mfdc9O7hWDKAiSp+zPUGT6LKcSCQIPeDK+CCw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "4x+pzsQEbqxhNf1QYRr5TDkLP9UsLT3A6MdRKDDEgrW7h1ljiEPgTNhKYUhNCCAaVpQECVQ+onA91PTPnIp6Lw==",
+        "resolved": "9.0.0",
+        "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==",
+        "resolved": "9.0.0",
+        "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Configuration": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "QWwTrsgOnJMmn+XUslm8D2H1n3PkP/u/v52FODtyBc/k4W9r3i2vcXXeeX/upnzllJYRRbrzVzT0OclfNJtBJA==",
+        "resolved": "9.0.0",
+        "contentHash": "H05HiqaNmg6GjH34ocYE9Wm1twm3Oz2aXZko8GTwGBzM7op2brpAA8pJ5yyD1OpS1mXUtModBYOlcZ/wXeWsSg==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Binder": "8.0.2",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2",
-          "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Binder": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Console": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "uzcg/5U2eLyn5LIKlERkdSxw6VPC1yydnOSQiRRWGBGN3kphq3iL4emORzrojScDmxRhv49gp5BI8U3Dz7y4iA==",
+        "resolved": "9.0.0",
+        "contentHash": "yDZ4zsjl7N0K+R/1QTNpXBd79Kaf4qNLHtjk4NaG82UtNg2Z6etJywwv6OarOv3Rp7ocU7uIaRY4CrzHRO/d3w==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging.Configuration": "8.0.1",
-          "Microsoft.Extensions.Options": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging.Configuration": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Debug": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "B8hqNuYudC2RB+L/DI33uO4rf5by41fZVdcVL2oZj0UyoAZqnwTwYHp1KafoH4nkl1/23piNeybFFASaV2HkFg==",
+        "resolved": "9.0.0",
+        "contentHash": "4wGlHsrLhYjLw4sFkfRixu2w4DK7dv60OjbvgbLGhUJk0eUPxYHhnszZ/P18nnAkfrPryvtOJ3ZTVev0kpqM6A==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.EventLog": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "ZD1m4GXoxcZeDJIq8qePKj+QAWeQNO/OG8skvrOG8RQfxLp9MAKRoliTc27xanoNUzeqvX5HhS/I7c0BvwAYUg==",
+        "resolved": "9.0.0",
+        "contentHash": "/B8I5bScondnLMNULA3PBu/7Gvmv/P7L83j7gVrmLh6R+HCgHqUNIwVvzCok4ZjIXN2KxrsONHjFYwoBK5EJgQ==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2",
-          "System.Diagnostics.EventLog": "8.0.1"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "System.Diagnostics.EventLog": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.EventSource": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "YMXMAla6B6sEf/SnfZYTty633Ool3AH7KOw2LOaaEqwSo2piK4f7HMtzyc3CNiipDnq1fsUSuG5Oc7ZzpVy8WQ==",
+        "resolved": "9.0.0",
+        "contentHash": "zvSjdOAb3HW3aJPM5jf+PR9UoIkoci9id80RXmBgrDEozWI0GDw8tdmpyZgZSwFDvGCwHFodFLNQaeH8879rlA==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==",
+        "resolved": "9.0.0",
+        "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Options.ConfigurationExtensions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==",
+        "resolved": "9.0.0",
+        "contentHash": "Ob3FXsXkcSMQmGZi7qP07EQ39kZpSBlTcAZLbJLdI4FIf0Jug8biv2HTavWmnTirchctPlq9bl/26CXtQRguzA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Binder": "8.0.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Options": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Binder": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
+        "resolved": "9.0.0",
+        "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg=="
       },
       "Microsoft.Testing.Extensions.Telemetry": {
         "type": "Transitive",
@@ -454,8 +454,8 @@
       },
       "System.Diagnostics.EventLog": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg=="
+        "resolved": "9.0.0",
+        "contentHash": "qd01+AqPhbAG14KtdtIqFk+cxHQFZ/oqRSCoxU1F+Q6Kv0cl726sl7RzU9yLFGd4BUOKdN4XojXF0pQf/R6YeA=="
       },
       "System.Reflection.Metadata": {
         "type": "Transitive",
@@ -464,16 +464,16 @@
       },
       "System.ServiceProcess.ServiceController": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "02I0BXo1kmMBgw03E8Hu4K6nTqur4wpQdcDZrndczPzY2fEoGvlinE35AWbyzLZ2h2IksEZ6an4tVt3hi9j1oA==",
+        "resolved": "9.0.0",
+        "contentHash": "ciFstNZEWYf40HbwzdQLdgQpgpnjkleC1z0jMqBKRdkEQqQ6I/Aht0x9fTBODnaQTtcF+scvrdimoDbfNap/aQ==",
         "dependencies": {
-          "System.Diagnostics.EventLog": "8.0.1"
+          "System.Diagnostics.EventLog": "9.0.0"
         }
       },
       "usbipd": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Hosting.WindowsServices": "[8.0.1, )",
+          "Microsoft.Extensions.Hosting.WindowsServices": "[9.0.0, )",
           "System.CommandLine": "[2.0.0-beta4.22272.1, )",
           "Usbipd.Automation": "[1.0.0, )"
         }
@@ -483,13 +483,13 @@
       },
       "Microsoft.Extensions.Hosting.WindowsServices": {
         "type": "CentralTransitive",
-        "requested": "[8.0.1, )",
-        "resolved": "8.0.1",
-        "contentHash": "5p0tjMDpr8tgzjBdu9Rzk8lUU/PaR1D3Us52XZypl85QTxfAjthR1+YywB3GsGc+FOZWdpuEDsV8kZisEC2Hng==",
+        "requested": "[9.0.0, )",
+        "resolved": "9.0.0",
+        "contentHash": "OQ7aTejEpkj1OPibhvKYhygUSoKQ+O5YYuBmJxOCC3+F5v7d4szYfvOGd8aegK8/ARFTJqpeXZq1wyIwEza6lg==",
         "dependencies": {
-          "Microsoft.Extensions.Hosting": "8.0.1",
-          "Microsoft.Extensions.Logging.EventLog": "8.0.1",
-          "System.ServiceProcess.ServiceController": "8.0.1"
+          "Microsoft.Extensions.Hosting": "9.0.0",
+          "Microsoft.Extensions.Logging.EventLog": "9.0.0",
+          "System.ServiceProcess.ServiceController": "9.0.0"
         }
       },
       "System.CommandLine": {
diff --git a/UsbIds/UsbIdsSourceGenerator.cs b/UsbIds/UsbIdsSourceGenerator.cs
index aec18ee..5ef5c87 100644
--- a/UsbIds/UsbIdsSourceGenerator.cs
+++ b/UsbIds/UsbIdsSourceGenerator.cs
@@ -128,15 +128,14 @@ int GetOffset(string s)
             }
             offset = strings.Length;
             offsets.Add(s, offset);
-            strings.Append(s);
-            strings.Append('\0');
+            _ = strings.Append(s).Append('\0');
             return offset;
         }
 
         foreach (var v in vendors)
         {
             var offset = GetOffset(v.Value.Name);
-            vendorLookup.Append($$"""
+            _ = vendorLookup.Append($$"""
                         0x{{v.Key:x4}}0000{{offset:x8}},
 
                 """);
@@ -144,7 +143,7 @@ int GetOffset(string s)
             foreach (var p in v.Value.Products)
             {
                 offset = GetOffset(p.Value);
-                productLookup.Append($$"""
+                _ = productLookup.Append($$"""
                         0x{{v.Key:x4}}{{p.Key:x4}}{{offset:x8}},
 
                 """);
diff --git a/Usbipd.Automation/BusId.cs b/Usbipd.Automation/BusId.cs
index c413499..04ac39f 100644
--- a/Usbipd.Automation/BusId.cs
+++ b/Usbipd.Automation/BusId.cs
@@ -24,11 +24,11 @@ public BusId(ushort bus, ushort port)
         // Instead, use the static IncompatibleHub field (preferrable) or "default".
         // USB supports up to 127 devices, but that would require multiple hubs; the "per hub" port will never be >99.
         // And if you have more than 99 hubs on one system, then you win a prize! (but we're not going to support it...)
-        if (bus == 0 || bus > 99)
+        if (bus is 0 or > 99)
         {
             throw new ArgumentOutOfRangeException(nameof(bus));
         }
-        if (port == 0 || port > 99)
+        if (port is 0 or > 99)
         {
             throw new ArgumentOutOfRangeException(nameof(port));
         }
@@ -50,7 +50,10 @@ public BusId(ushort bus, ushort port)
 #endif
     public bool IsIncompatibleHub => (Bus == 0) || (Port == 0);
 
-    public override readonly string ToString() => IsIncompatibleHub ? nameof(IncompatibleHub) : $"{Bus}-{Port}";
+    public override readonly string ToString()
+    {
+        return IsIncompatibleHub ? nameof(IncompatibleHub) : $"{Bus}-{Port}";
+    }
 
     /// <summary>
     /// NOTE: Valid inputs are x-y, where either x and y are between 1 and 65535, or both are 0.
@@ -80,16 +83,15 @@ public static bool TryParse(string input, out BusId busId)
 
     public static BusId Parse(string input)
     {
-        if (!TryParse(input, out var busId))
-        {
-            throw new FormatException();
-        }
-        return busId;
+        return TryParse(input, out var busId) ? busId : throw new FormatException();
     }
 
     #region IComparable<BusId>
 
-    public readonly int CompareTo(BusId other) => ((uint)Bus << 16 | Port).CompareTo((uint)other.Bus << 16 | other.Port);
+    public readonly int CompareTo(BusId other)
+    {
+        return (((uint)Bus << 16) | Port).CompareTo(((uint)other.Bus << 16) | other.Port);
+    }
 
     public static bool operator <(BusId left, BusId right)
     {
diff --git a/Usbipd.Automation/Device.cs b/Usbipd.Automation/Device.cs
index 81c4c2c..a976b30 100644
--- a/Usbipd.Automation/Device.cs
+++ b/Usbipd.Automation/Device.cs
@@ -18,8 +18,10 @@ public Device() { }
 #if !NETSTANDARD
     [JsonConstructor]
     public Device(string instanceId, string description, bool isForced, BusId? busId, Guid? persistedGuid, string? stubInstanceId, IPAddress? clientIPAddress)
-        => (InstanceId, Description, IsForced, BusId, PersistedGuid, StubInstanceId, ClientIPAddress)
-        = (instanceId, description, isForced, busId, persistedGuid, stubInstanceId, clientIPAddress);
+    {
+        (InstanceId, Description, IsForced, BusId, PersistedGuid, StubInstanceId, ClientIPAddress)
+            = (instanceId, description, isForced, busId, persistedGuid, stubInstanceId, clientIPAddress);
+    }
 #endif
 
     [DataMember]
@@ -104,15 +106,15 @@ public IPAddress? ClientIPAddress
 #if !NETSTANDARD
     [JsonIgnore]
 #endif
-    public bool IsBound { get => PersistedGuid is not null; }
+    public bool IsBound => PersistedGuid is not null;
 
 #if !NETSTANDARD
     [JsonIgnore]
 #endif
-    public bool IsConnected { get => BusId is not null; }
+    public bool IsConnected => BusId is not null;
 
 #if !NETSTANDARD
     [JsonIgnore]
 #endif
-    public bool IsAttached { get => ClientIPAddress is not null; }
+    public bool IsAttached => ClientIPAddress is not null;
 }
diff --git a/Usbipd.Automation/IsExternalInit.cs b/Usbipd.Automation/IsExternalInit.cs
index b722d58..57b4d42 100644
--- a/Usbipd.Automation/IsExternalInit.cs
+++ b/Usbipd.Automation/IsExternalInit.cs
@@ -2,7 +2,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
+#pragma warning disable IDE0130 // Namespace does not match folder structure
 namespace System.Runtime.CompilerServices;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Fix for using C# 9 feature in netstandard2.0.
diff --git a/Usbipd.Automation/JsonConverterBusId.cs b/Usbipd.Automation/JsonConverterBusId.cs
index 9b37538..d9aa948 100644
--- a/Usbipd.Automation/JsonConverterBusId.cs
+++ b/Usbipd.Automation/JsonConverterBusId.cs
@@ -13,12 +13,7 @@ public class JsonConverterBusId : JsonConverter<BusId>
 {
     public override BusId Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        if (reader.GetString() is not string text)
-        {
-            throw new InvalidDataException();
-        }
-
-        return BusId.Parse(text);
+        return reader.GetString() is string text ? BusId.Parse(text) : throw new InvalidDataException();
     }
 
     public override void Write(Utf8JsonWriter writer, BusId value, JsonSerializerOptions options)
diff --git a/Usbipd.Automation/JsonConverterIPAddress.cs b/Usbipd.Automation/JsonConverterIPAddress.cs
index 0d3c1e0..23b8d29 100644
--- a/Usbipd.Automation/JsonConverterIPAddress.cs
+++ b/Usbipd.Automation/JsonConverterIPAddress.cs
@@ -14,12 +14,7 @@ public class JsonConverterIPAddress : JsonConverter<IPAddress>
 {
     public override IPAddress Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        if (reader.GetString() is not string text)
-        {
-            throw new InvalidDataException();
-        }
-
-        return IPAddress.Parse(text);
+        return reader.GetString() is string text ? IPAddress.Parse(text) : throw new InvalidDataException();
     }
 
     public override void Write(Utf8JsonWriter writer, IPAddress value, JsonSerializerOptions options)
diff --git a/Usbipd.Automation/State.cs b/Usbipd.Automation/State.cs
index 5138480..5edfe9e 100644
--- a/Usbipd.Automation/State.cs
+++ b/Usbipd.Automation/State.cs
@@ -16,7 +16,10 @@ public State() { }
 
 #if !NETSTANDARD
     [JsonConstructor]
-    public State(IReadOnlyCollection<Device> devices) => Devices = devices;
+    public State(IReadOnlyCollection<Device> devices)
+    {
+        Devices = devices;
+    }
 #endif
 
     /// <summary>
diff --git a/Usbipd.Automation/VidPid.cs b/Usbipd.Automation/VidPid.cs
index 900bd14..50d6c94 100644
--- a/Usbipd.Automation/VidPid.cs
+++ b/Usbipd.Automation/VidPid.cs
@@ -15,13 +15,19 @@ public readonly record struct VidPid
 {
 #if !NETSTANDARD
     [JsonConstructor]
-    public VidPid(ushort vid, ushort pid) => (Vid, Pid) = (vid, pid);
+    public VidPid(ushort vid, ushort pid)
+    {
+        (Vid, Pid) = (vid, pid);
+    }
 #endif
 
     public ushort Vid { get; init; }
     public ushort Pid { get; init; }
 
-    public override readonly string ToString() => $"{Vid:x4}:{Pid:x4}";
+    public override readonly string ToString()
+    {
+        return $"{Vid:x4}:{Pid:x4}";
+    }
 
     public static bool TryParse(string input, out VidPid vidPid)
     {
@@ -47,11 +53,7 @@ public static bool TryParse(string input, out VidPid vidPid)
 
     public static VidPid Parse(string input)
     {
-        if (!TryParse(input, out var pidVid))
-        {
-            throw new FormatException();
-        }
-        return pidVid;
+        return TryParse(input, out var pidVid) ? pidVid : throw new FormatException();
     }
 
     public static VidPid FromHardwareOrInstanceId(string input)
@@ -60,17 +62,15 @@ public static VidPid FromHardwareOrInstanceId(string input)
         //   VID_80EE&PID_CAFE
         //   USB\\VID_1BCF&PID_28A6\\6&17A81E1D&0&8
         var match = Regex.Match(input, "VID_([0-9a-fA-F]{4})&PID_([0-9a-fA-F]{4})([^0-9a-fA-F]|$)");
-        if (!match.Success
-            || !ushort.TryParse(match.Groups[1].Value, NumberStyles.AllowHexSpecifier, null, out var vid)
-            || !ushort.TryParse(match.Groups[2].Value, NumberStyles.AllowHexSpecifier, null, out var pid))
-        {
-            throw new FormatException();
-        }
-        return new()
-        {
-            Vid = vid,
-            Pid = pid,
-        };
+        return match.Success
+            && ushort.TryParse(match.Groups[1].Value, NumberStyles.AllowHexSpecifier, null, out var vid)
+            && ushort.TryParse(match.Groups[2].Value, NumberStyles.AllowHexSpecifier, null, out var pid)
+            ? new()
+            {
+                Vid = vid,
+                Pid = pid,
+            }
+            : throw new FormatException();
     }
 
     public string? Vendor => this.GetVendor();
@@ -79,7 +79,10 @@ public static VidPid FromHardwareOrInstanceId(string input)
 
     #region IComparable<VidPid>
 
-    public readonly int CompareTo(VidPid other) => ((uint)Vid << 16 | Pid).CompareTo((uint)other.Vid << 16 | other.Pid);
+    public readonly int CompareTo(VidPid other)
+    {
+        return (((uint)Vid << 16) | Pid).CompareTo(((uint)other.Vid << 16) | other.Pid);
+    }
 
     public static bool operator <(VidPid left, VidPid right)
     {
diff --git a/Usbipd.Automation/packages.lock.json b/Usbipd.Automation/packages.lock.json
index deebf19..cd0bc28 100644
--- a/Usbipd.Automation/packages.lock.json
+++ b/Usbipd.Automation/packages.lock.json
@@ -23,7 +23,7 @@
         "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
       }
     },
-    "net8.0-windows10.0.17763": {
+    "net9.0-windows10.0.17763": {
       "GitVersion.MsBuild": {
         "type": "Direct",
         "requested": "[6.0.5, )",
@@ -32,9 +32,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.11, )",
-        "resolved": "8.0.11",
-        "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ=="
+        "requested": "[9.0.0, )",
+        "resolved": "9.0.0",
+        "contentHash": "zAwp213evC3UkimtVXRb+Dlgc/40QG145nmZDtp2LO9zJJMfrp+i/87BnXN7tRXEA4liyzdFkjqG1HE8/RPb4A=="
       }
     }
   }
diff --git a/Usbipd.PowerShell/Installation.cs b/Usbipd.PowerShell/Installation.cs
index 7edfe94..bda3b2c 100644
--- a/Usbipd.PowerShell/Installation.cs
+++ b/Usbipd.PowerShell/Installation.cs
@@ -22,11 +22,7 @@ static string GetRegistryStringValue(string regOutput, string valueName)
         // HKEY_LOCAL_MACHINE\SOFTWARE\usbipd-win\Devices
 
         var match = Regex.Match(regOutput, @$"^\s*{valueName}\s+REG_SZ\s+(.*)$", RegexOptions.Multiline);
-        if (!match.Success)
-        {
-            throw new ApplicationFailedException("usbipd-win is not installed.");
-        }
-        return match.Groups[1].Value.TrimEnd();
+        return match.Success ? match.Groups[1].Value.TrimEnd() : throw new ApplicationFailedException("usbipd-win is not installed.");
     }
 
     public static string ExePath
@@ -81,7 +77,7 @@ public static string ExePath
                 throw new ApplicationFailedException($"PowerShell module version {GitVersionInformation.MajorMinorPatch} does not match installed usbipd-win version {version}.");
             }
 #if DEBUG
-            return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location), @"..\..\..\..\Usbipd\bin\x64\Debug\net8.0-windows10.0.17763\win-x64\usbipd.exe"));
+            return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location), @"..\..\..\..\Usbipd\bin\x64\Debug\net9.0-windows10.0.17763\win-x64\usbipd.exe"));
 #else
             return exeFile;
 #endif
diff --git a/Usbipd/AttachedClient.cs b/Usbipd/AttachedClient.cs
index b615a9f..b7d835c 100644
--- a/Usbipd/AttachedClient.cs
+++ b/Usbipd/AttachedClient.cs
@@ -147,6 +147,8 @@ public async Task RunAsync(CancellationToken cancellationToken)
                         await ReplyChannel.Writer.WriteAsync(new(header.basic.seqnum, []), cancellationToken);
                     }
                     break;
+                case UsbIpCmd.USBIP_RET_SUBMIT:
+                case UsbIpCmd.USBIP_RET_UNLINK:
                 default:
                     throw new ProtocolViolationException($"unknown UsbIpCmd {header.basic.command}");
             }
diff --git a/Usbipd/AttachedEndpoint.cs b/Usbipd/AttachedEndpoint.cs
index 8bd75bb..4432241 100644
--- a/Usbipd/AttachedEndpoint.cs
+++ b/Usbipd/AttachedEndpoint.cs
@@ -33,7 +33,7 @@ public AttachedEndpoint(ILogger logger, ClientContext clientContext, PcapNg pcap
 
         ReplyChannel = replyChannel;
 
-        Task.Run(async () =>
+        _ = Task.Run(async () =>
         {
             // This task ensures that all SUBMIT replies for this specific endpoint are
             // returned in the same order as the requests.
@@ -143,7 +143,7 @@ async Task HandleSubmitIsochronousAsync(UsbIpHeaderBasic basic, UsbIpHeaderCmdSu
             // Continue when all ioctls *and* their continuations have been completed.
             var replyTask = Task.WhenAll(ioctls).ContinueWith(RequestReply (task, _) =>
             {
-                Interlocked.Decrement(ref InterlockedSubmits);
+                _ = Interlocked.Decrement(ref InterlockedSubmits);
 
                 var header = new UsbIpHeader
                 {
@@ -208,7 +208,7 @@ async Task HandleSubmitIsochronousAsync(UsbIpHeaderBasic basic, UsbIpHeaderCmdSu
 
     public async Task HandleSubmitAsync(UsbIpHeaderBasic basic, UsbIpHeaderCmdSubmit submit, CancellationToken cancellationToken)
     {
-        Interlocked.Increment(ref InterlockedSubmits);
+        _ = Interlocked.Increment(ref InterlockedSubmits);
 
         if (basic.EndpointType(submit) == UsbSupTransferType.USBSUP_TRANSFER_TYPE_ISOC)
         {
@@ -345,7 +345,7 @@ public async Task HandleSubmitAsync(UsbIpHeaderBasic basic, UsbIpHeaderCmdSubmit
 
         var replyTask = ioctl.ContinueWith(RequestReply (task, _) =>
         {
-            Interlocked.Decrement(ref InterlockedSubmits);
+            _ = Interlocked.Decrement(ref InterlockedSubmits);
 
             BytesToStruct(bytes, out urb);
 
@@ -496,7 +496,7 @@ public async Task HandleUnlinkAsync()
             // Just like for CLEAR_FEATURE, we are going to wait until this finishes,
             // in order to avoid races with subsequent SUBMIT to the same endpoint.
             Logger.Trace($"Aborting endpoint");
-            await Device.IoControlAsync(SUPUSB_IOCTL.USB_ABORT_ENDPOINT, StructToBytes(clearEndpoint), null);
+            _ = await Device.IoControlAsync(SUPUSB_IOCTL.USB_ABORT_ENDPOINT, StructToBytes(clearEndpoint), null);
 
             UnlinkHoldoffCount = 0;
         }
diff --git a/Usbipd/ClientContext.cs b/Usbipd/ClientContext.cs
index 0348da0..68e29ed 100644
--- a/Usbipd/ClientContext.cs
+++ b/Usbipd/ClientContext.cs
@@ -8,7 +8,7 @@
 
 namespace Usbipd;
 
-sealed class ClientContext : IDisposable
+sealed partial class ClientContext : IDisposable
 {
     public TcpClient TcpClient { get; set; } = new();
     /// <summary>
diff --git a/Usbipd/CommandHandlersCli.cs b/Usbipd/CommandHandlersCli.cs
index cc86fb0..b95ec8c 100644
--- a/Usbipd/CommandHandlersCli.cs
+++ b/Usbipd/CommandHandlersCli.cs
@@ -102,14 +102,9 @@ static string GetDescription(UsbDevice device, bool usbids)
         if (usbids)
         {
             var vendor = device.HardwareId.Vendor;
-            if (vendor is not null)
-            {
-                return $"{vendor}, {device.HardwareId.Product ?? ConfigurationManager.UnknownDevice}";
-            }
-            else
-            {
-                return ConfigurationManager.UnknownDevice;
-            }
+            return vendor is not null
+                ? $"{vendor}, {device.HardwareId.Product ?? ConfigurationManager.UnknownDevice}"
+                : ConfigurationManager.UnknownDevice;
         }
         else
         {
@@ -125,27 +120,10 @@ Task<ExitCode> ICommandHandlers.List(bool usbids, IConsole console, Cancellation
         foreach (var device in allDevices.Where(d => d.BusId.HasValue).OrderBy(d => d.BusId.GetValueOrDefault()))
         {
             Debug.Assert(device.BusId.HasValue);
-            string state;
-            if (device.IPAddress is not null)
-            {
-                state = "Attached";
-            }
-            else if (device.Guid is not null)
-            {
-                state = device.IsForced ? "Shared (forced)" : "Shared";
-            }
-            else if (device.BusId.Value.IsIncompatibleHub)
-            {
-                state = "Incompatible hub";
-            }
-            else if (Policy.IsAutoBindAllowed(device))
-            {
-                state = "Allowed";
-            }
-            else
-            {
-                state = "Not shared";
-            }
+            var state = device.IPAddress is not null ? "Attached"
+                : device.Guid is not null ? device.IsForced ? "Shared (forced)" : "Shared"
+                : device.BusId.Value.IsIncompatibleHub ? "Incompatible hub"
+                : Policy.IsAutoBindAllowed(device) ? "Allowed" : "Not shared";
             console.Write($"{(device.BusId.Value.IsIncompatibleHub ? string.Empty : device.BusId.Value),-5}  ");
             console.Write($"{device.HardwareId,-9}  ");
             console.WriteTruncated(GetDescription(device, usbids), 60, true);
@@ -164,14 +142,14 @@ Task<ExitCode> ICommandHandlers.List(bool usbids, IConsole console, Cancellation
         }
         console.WriteLine(string.Empty);
 
-        console.CheckAndReportServerRunning(false);
+        _ = console.CheckAndReportServerRunning(false);
         console.ReportIfForceNeeded();
         return Task.FromResult(ExitCode.Success);
     }
 
     static ExitCode Bind(BusId busId, bool force, IConsole console)
     {
-        var device = UsbDevice.GetAll().Where(d => d.BusId.HasValue && d.BusId.Value == busId).SingleOrDefault();
+        var device = UsbDevice.GetAll().SingleOrDefault(d => d.BusId.HasValue && d.BusId.Value == busId);
         if (device is null)
         {
             console.ReportError($"There is no device with busid '{busId}'.");
@@ -209,7 +187,7 @@ static ExitCode Bind(BusId busId, bool force, IConsole console)
                 console.ReportRebootRequired();
             }
         }
-        console.CheckAndReportServerRunning(false);
+        _ = console.CheckAndReportServerRunning(false);
         return ExitCode.Success;
     }
 
@@ -220,16 +198,14 @@ Task<ExitCode> ICommandHandlers.Bind(BusId busId, bool force, IConsole console,
 
     Task<ExitCode> ICommandHandlers.Bind(VidPid vidPid, bool force, IConsole console, CancellationToken cancellationToken)
     {
-        if (GetBusIdByHardwareId(vidPid, console) is not BusId busId)
-        {
-            return Task.FromResult(ExitCode.Failure);
-        }
-        return Task.FromResult(Bind(busId, force, console));
+        return GetBusIdByHardwareId(vidPid, console) is BusId busId
+            ? Task.FromResult(Bind(busId, force, console))
+            : Task.FromResult(ExitCode.Failure);
     }
 
     Task<ExitCode> ICommandHandlers.Unbind(BusId busId, IConsole console, CancellationToken cancellationToken)
     {
-        var device = UsbDevice.GetAll().Where(d => d.BusId.HasValue && d.BusId.Value == busId).SingleOrDefault();
+        var device = UsbDevice.GetAll().SingleOrDefault(d => d.BusId.HasValue && d.BusId.Value == busId);
         if (device is null)
         {
             console.ReportError($"There is no device with busid '{busId}'.");
@@ -284,7 +260,7 @@ static ExitCode Unbind(IEnumerable<UsbDevice> devices, IConsole console)
                     reboot = true;
                 }
             }
-            catch (Exception ex) when (ex is Win32Exception || ex is ConfigurationManagerException)
+            catch (Exception ex) when (ex is Win32Exception or ConfigurationManagerException)
             {
                 driverError = true;
             }
@@ -302,7 +278,7 @@ static ExitCode Unbind(IEnumerable<UsbDevice> devices, IConsole console)
 
     Task<ExitCode> ICommandHandlers.Unbind(Guid guid, IConsole console, CancellationToken cancellationToken)
     {
-        var device = RegistryUtils.GetBoundDevices().Where(d => d.Guid.HasValue && d.Guid.Value == guid).SingleOrDefault();
+        var device = RegistryUtils.GetBoundDevices().SingleOrDefault(d => d.Guid.HasValue && d.Guid.Value == guid);
         if (device is null)
         {
             console.ReportError($"There is no device with guid '{guid:D}'.");
@@ -338,7 +314,7 @@ Task<ExitCode> ICommandHandlers.UnbindAll(IConsole console, CancellationToken ca
                     reboot = true;
                 }
             }
-            catch (Exception ex) when (ex is Win32Exception || ex is ConfigurationManagerException)
+            catch (Exception ex) when (ex is Win32Exception or ConfigurationManagerException)
             {
                 driverError = true;
             }
@@ -356,7 +332,7 @@ Task<ExitCode> ICommandHandlers.UnbindAll(IConsole console, CancellationToken ca
 
     async Task<ExitCode> ICommandHandlers.AttachWsl(BusId busId, bool autoAttach, string? distribution, IConsole console, CancellationToken cancellationToken)
     {
-        var device = UsbDevice.GetAll().Where(d => d.BusId.HasValue && d.BusId.Value == busId).SingleOrDefault();
+        var device = UsbDevice.GetAll().SingleOrDefault(d => d.BusId.HasValue && d.BusId.Value == busId);
         if (device is null)
         {
             console.ReportError($"There is no device with busid '{busId}'.");
@@ -374,21 +350,16 @@ async Task<ExitCode> ICommandHandlers.AttachWsl(BusId busId, bool autoAttach, st
             return ExitCode.Failure;
         }
 
-        if (!console.CheckAndReportServerRunning(true))
-        {
-            return ExitCode.Failure;
-        }
-
-        return await Wsl.Attach(busId, autoAttach, distribution, console, cancellationToken);
+        return console.CheckAndReportServerRunning(true)
+            ? await Wsl.Attach(busId, autoAttach, distribution, console, cancellationToken)
+            : ExitCode.Failure;
     }
 
     async Task<ExitCode> ICommandHandlers.AttachWsl(VidPid vidPid, bool autoAttach, string? distribution, IConsole console, CancellationToken cancellationToken)
     {
-        if (GetBusIdByHardwareId(vidPid, console) is not BusId busId)
-        {
-            return ExitCode.Failure;
-        }
-        return await ((ICommandHandlers)this).AttachWsl(busId, autoAttach, distribution, console, cancellationToken);
+        return GetBusIdByHardwareId(vidPid, console) is BusId busId
+            ? await ((ICommandHandlers)this).AttachWsl(busId, autoAttach, distribution, console, cancellationToken)
+            : ExitCode.Failure;
     }
 
     static ExitCode Detach(IEnumerable<UsbDevice> devices, IConsole console)
@@ -413,7 +384,7 @@ static ExitCode Detach(IEnumerable<UsbDevice> devices, IConsole console)
 
     Task<ExitCode> ICommandHandlers.Detach(BusId busId, IConsole console, CancellationToken cancellationToken)
     {
-        var device = UsbDevice.GetAll().Where(d => d.BusId.HasValue && d.BusId.Value == busId).SingleOrDefault();
+        var device = UsbDevice.GetAll().SingleOrDefault(d => d.BusId.HasValue && d.BusId.Value == busId);
         if (device is null)
         {
             console.ReportError($"There is no device with busid '{busId}'.");
@@ -513,6 +484,8 @@ Task<ExitCode> ICommandHandlers.PolicyList(IConsole console, CancellationToken c
                     console.Write($"{(autoBind.BusId.HasValue ? autoBind.BusId.Value : string.Empty),-5}  ");
                     console.Write($"{(autoBind.HardwareId.HasValue ? autoBind.HardwareId.Value : string.Empty),-9}");
                     break;
+                default:
+                    throw new UnexpectedResultException();
             }
             console.WriteLine(string.Empty);
         }
diff --git a/Usbipd/CommandHandlersServer.cs b/Usbipd/CommandHandlersServer.cs
index 10aa75d..fac7be4 100644
--- a/Usbipd/CommandHandlersServer.cs
+++ b/Usbipd/CommandHandlersServer.cs
@@ -46,11 +46,11 @@ async Task<ExitCode> ICommandHandlers.Server(string[] args, IConsole console, Ca
                     defaultConfig.Add("Logging:EventLog:LogLevel:Default", "None");
                 }
                 // set the above as defaults
-                builder.AddInMemoryCollection(defaultConfig);
+                _ = builder.AddInMemoryCollection(defaultConfig);
                 // allow overrides from the environment
-                builder.AddEnvironmentVariables();
+                _ = builder.AddEnvironmentVariables();
                 // allow overrides from the command line
-                builder.AddCommandLine(args);
+                _ = builder.AddCommandLine(args);
             })
             .ConfigureLogging((context, logging) =>
             {
@@ -58,18 +58,18 @@ async Task<ExitCode> ICommandHandlers.Server(string[] args, IConsole console, Ca
                 {
                     EventLog.CreateEventSource(Program.Product, "Application");
                 }
-                logging.AddEventLog(settings =>
+                _ = logging.AddEventLog(settings =>
                 {
                     settings.SourceName = Program.Product;
                 });
             })
             .ConfigureServices((hostContext, services) =>
             {
-                services.AddHostedService<Server>();
-                services.AddSingleton<PcapNg>();
-                services.AddScoped<ClientContext>();
-                services.AddScoped<ConnectedClient>();
-                services.AddScoped<AttachedClient>();
+                _ = services.AddHostedService<Server>();
+                _ = services.AddSingleton<PcapNg>();
+                _ = services.AddScoped<ClientContext>();
+                _ = services.AddScoped<ConnectedClient>();
+                _ = services.AddScoped<AttachedClient>();
             })
             .Build();
 
diff --git a/Usbipd/ConfigurationManager.cs b/Usbipd/ConfigurationManager.cs
index 91c8a4a..f681587 100644
--- a/Usbipd/ConfigurationManager.cs
+++ b/Usbipd/ConfigurationManager.cs
@@ -56,12 +56,11 @@ static string[] Get_Device_Interface_List(in Guid interfaceClassGuid, string? de
 
     static unsafe object ConvertProperty(DEVPROPTYPE propertyType, byte* pBuffer, int propertyBufferSize) // DevSkim: ignore DS172412
     {
-        return propertyType switch
-        {
-            DEVPROPTYPE.DEVPROP_TYPE_STRING => new string((char*)pBuffer, 0, propertyBufferSize / sizeof(char)).TrimEnd('\0'),
-            DEVPROPTYPE.DEVPROP_TYPE_STRING_LIST => new string((char*)pBuffer, 0, propertyBufferSize / sizeof(char)).Split('\0', StringSplitOptions.RemoveEmptyEntries),
-            _ => throw new NotImplementedException($"property type {propertyType}"),
-        };
+        return propertyType == DEVPROPTYPE.DEVPROP_TYPE_STRING
+            ? new string((char*)pBuffer, 0, propertyBufferSize / sizeof(char)).TrimEnd('\0')
+            : propertyType == DEVPROPTYPE.DEVPROP_TYPE_STRING_LIST
+                ? (object)new string((char*)pBuffer, 0, propertyBufferSize / sizeof(char)).Split('\0', StringSplitOptions.RemoveEmptyEntries)
+                : throw new NotImplementedException($"property type {propertyType}");
     }
 
     static object Get_Device_Interface_Property(string deviceInterface, in DEVPROPKEY devPropKey)
@@ -158,11 +157,7 @@ public static BusId GetBusId(uint deviceNode)
         }
         var bus = ushort.Parse(match.Groups[2].Value, CultureInfo.InvariantCulture);
         var port = ushort.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
-        if (bus == 0 || port == 0)
-        {
-            return BusId.IncompatibleHub;
-        }
-        return new(bus, port);
+        return bus == 0 || port == 0 ? BusId.IncompatibleHub : new(bus, port);
     }
 
     public static BusId? GetBusId(string instanceId)
@@ -214,7 +209,7 @@ public static string GetDescription(uint deviceNode)
             if (!string.IsNullOrEmpty(friendlyName))
             {
                 descriptionList.Add(friendlyName);
-                descriptionSet.Add(friendlyName);
+                _ = descriptionSet.Add(friendlyName);
             }
         }
         catch (ConfigurationManagerException) { }
@@ -239,7 +234,7 @@ public static string GetDescription(uint deviceNode)
         return string.Join(", ", descriptionList);
     }
 
-    public sealed record ConnectedUsbDevice(uint DeviceNode, string InstanceId);
+    internal sealed record ConnectedUsbDevice(uint DeviceNode, string InstanceId);
 
     public static IEnumerable<ConnectedUsbDevice> GetConnectedUsbDevices()
     {
@@ -285,7 +280,7 @@ static string GetHubInterfacePath(uint deviceNode)
         return Get_Device_Interface_List(PInvoke.GUID_DEVINTERFACE_USB_HUB, hubInstanceId, CM_GET_DEVICE_INTERFACE_LIST_FLAGS.CM_GET_DEVICE_INTERFACE_LIST_PRESENT).Single();
     }
 
-    public sealed record VBoxDevice(uint DeviceNode, string InstanceId, string InterfacePath);
+    internal sealed record VBoxDevice(uint DeviceNode, string InstanceId, string InterfacePath);
 
     public static VBoxDevice GetVBoxDevice(BusId busId)
     {
@@ -377,7 +372,7 @@ public static void SetDeviceFriendlyName(uint deviceNode)
     /// <summary>
     /// See https://docs.microsoft.com/en-us/windows-hardware/drivers/install/porting-from-setupapi-to-cfgmgr32#restart-device
     /// </summary>
-    public sealed class RestartingDevice
+    internal sealed partial class RestartingDevice
         : IDisposable
     {
         public RestartingDevice(string instanceId)
@@ -441,7 +436,7 @@ public void Dispose()
             catch (AggregateException ex) when (ex.InnerException is Win32Exception) { }
 
             // This is the reverse of what the constructor accomplished.
-            PInvoke.CM_Setup_DevNode(DeviceNode, PInvoke.CM_SETUP_DEVNODE_READY);
+            _ = PInvoke.CM_Setup_DevNode(DeviceNode, PInvoke.CM_SETUP_DEVNODE_READY);
         }
     }
 }
diff --git a/Usbipd/ConfigurationManagerException.cs b/Usbipd/ConfigurationManagerException.cs
index 402bd74..8fffb91 100644
--- a/Usbipd/ConfigurationManagerException.cs
+++ b/Usbipd/ConfigurationManagerException.cs
@@ -9,7 +9,7 @@
 
 namespace Usbipd;
 
-public sealed class ConfigurationManagerException : Win32Exception
+sealed class ConfigurationManagerException : Win32Exception
 {
     internal CONFIGRET ConfigRet { get; init; }
 
diff --git a/Usbipd/ConnectedClient.cs b/Usbipd/ConnectedClient.cs
index 9d05bc8..4f104e8 100644
--- a/Usbipd/ConnectedClient.cs
+++ b/Usbipd/ConnectedClient.cs
@@ -40,6 +40,8 @@ public async Task RunAsync(CancellationToken cancellationToken)
                 case OpCode.OP_REQ_IMPORT:
                     await HandleRequestImportAsync(cancellationToken);
                     break;
+                case OpCode.OP_REP_DEVLIST:
+                case OpCode.OP_REP_IMPORT:
                 default:
                     throw new ProtocolViolationException($"unexpected opcode {opCode}");
             }
@@ -48,7 +50,7 @@ public async Task RunAsync(CancellationToken cancellationToken)
         {
             // EndOfStream is client hang ups and OperationCanceled is detachments;
             // neither are an error but part of normal functionality.
-            if (!(ex is EndOfStreamException || ex is OperationCanceledException))
+            if (ex is not (EndOfStreamException or OperationCanceledException))
             {
                 Logger.ClientError(ex);
             }
@@ -201,7 +203,7 @@ async Task HandleRequestImportAsync(CancellationToken cancellationToken)
                 // setup token to free device
                 using var attachedClientTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
                 using var cancelEvent = new AutoResetEvent(false);
-                ThreadPool.RegisterWaitForSingleObject(cancelEvent, (state, timedOut) =>
+                _ = ThreadPool.RegisterWaitForSingleObject(cancelEvent, (state, timedOut) =>
                 {
                     Logger.Debug("Unbind or unplug while attached");
                     try
@@ -227,12 +229,9 @@ async Task HandleRequestImportAsync(CancellationToken cancellationToken)
                     };
                     PInvoke.CM_Register_Notification(filter, (void*)cancelEvent.SafeWaitHandle.DangerousGetHandle(), static (notify, context, action, eventData, eventDataSize) =>
                     {
-                        switch (action)
+                        if (action is CM_NOTIFY_ACTION.CM_NOTIFY_ACTION_DEVICEREMOVEPENDING or CM_NOTIFY_ACTION.CM_NOTIFY_ACTION_DEVICEREMOVECOMPLETE)
                         {
-                            case CM_NOTIFY_ACTION.CM_NOTIFY_ACTION_DEVICEREMOVEPENDING:
-                            case CM_NOTIFY_ACTION.CM_NOTIFY_ACTION_DEVICEREMOVECOMPLETE:
-                                PInvoke.SetEvent((HANDLE)(nint)context);
-                                break;
+                            _ = PInvoke.SetEvent((HANDLE)(nint)context);
                         }
                         return (uint)WIN32_ERROR.ERROR_SUCCESS;
                     }, out notification).ThrowOnError(nameof(PInvoke.CM_Register_Notification));
@@ -252,7 +251,7 @@ async Task HandleRequestImportAsync(CancellationToken cancellationToken)
             {
                 notification?.Dispose();
 
-                RegistryUtils.SetDeviceAsDetached(device.Guid.Value);
+                _ = RegistryUtils.SetDeviceAsDetached(device.Guid.Value);
 
                 ClientContext.AttachedDevice.Dispose();
 
@@ -305,22 +304,15 @@ async Task<OpCode> RecvOpCodeAsync(CancellationToken cancellationToken)
         }
 
         var opCode = (OpCode)BinaryPrimitives.ReadUInt16BigEndian(buf.AsSpan(2));
-        if (!Enum.IsDefined(typeof(OpCode), opCode))
+        if (!Enum.IsDefined(opCode))
         {
             throw new ProtocolViolationException($"illegal opcode: {(ushort)opCode}");
         }
 
         var status = (Status)BinaryPrimitives.ReadUInt32BigEndian(buf.AsSpan(4));
-        if (!Enum.IsDefined(typeof(Status), status))
-        {
-            throw new ProtocolViolationException($"illegal status: {status}");
-        }
-        if (status != Status.ST_OK)
-        {
-            throw new ProtocolViolationException($"error status at peer: {status}");
-        }
-
-        return opCode;
+        return Enum.IsDefined(status) ? status == Status.ST_OK ? opCode
+            : throw new ProtocolViolationException($"error status at peer: {status}")
+            : throw new ProtocolViolationException($"illegal status: {status}");
     }
 
     async Task SendOpCodeAsync(OpCode opCode, Status status)
diff --git a/Usbipd/ConsoleTools.cs b/Usbipd/ConsoleTools.cs
index 249f494..e450add 100644
--- a/Usbipd/ConsoleTools.cs
+++ b/Usbipd/ConsoleTools.cs
@@ -11,7 +11,7 @@
 
 namespace Usbipd;
 
-static class ConsoleTools
+static partial class ConsoleTools
 {
     public static IEnumerable<string> Wrap(string text, int width)
     {
@@ -19,19 +19,19 @@ public static IEnumerable<string> Wrap(string text, int width)
 
         void FirstWord(string word)
         {
-            lineBuilder.Append(word);
+            _ = lineBuilder.Append(word);
             if (word.Length == width)
             {
                 // If the first word on a line is exactly the original width, add an extra space
                 // so Windows Terminal does not glue the next word to it on resize.
-                lineBuilder.Append(' ');
+                _ = lineBuilder.Append(' ');
             }
         }
 
         string Flush()
         {
             var result = lineBuilder.ToString();
-            lineBuilder.Clear();
+            _ = lineBuilder.Clear();
             return result;
         }
 
@@ -52,7 +52,7 @@ string Flush()
                 }
                 else
                 {
-                    lineBuilder.Append(' ').Append(word);
+                    _ = lineBuilder.Append(' ').Append(word);
                 }
             }
             yield return Flush();
@@ -111,7 +111,7 @@ public static void WriteTruncated(this IConsole console, string text, int width,
     }
 
     /// <summary>
-    /// <para><see cref="CommandLineApplication"/> is rather old and uses the "old style" errors without a terminating period.</para>
+    /// <para>Some "old style" errors don't have a terminating period.</para>
     /// <para>Some WinAPI errors (originating from FormatMessage) have a terminating newline.</para>
     /// This function normalizes all errors to
     /// <list type="bullet">
@@ -134,7 +134,7 @@ static void ReportText(this IConsole console, string level, string text)
         console.Error.WriteLine($"{Program.ApplicationName}: {level}: {EnforceFinalPeriod(text)}");
     }
 
-    sealed class TemporaryColor
+    sealed partial class TemporaryColor
         : IDisposable
     {
         readonly bool NeedReset;
diff --git a/Usbipd/DeviceFile.cs b/Usbipd/DeviceFile.cs
index 72d05e8..20df9b1 100644
--- a/Usbipd/DeviceFile.cs
+++ b/Usbipd/DeviceFile.cs
@@ -12,7 +12,7 @@
 
 namespace Usbipd;
 
-sealed class DeviceFile : IDisposable
+sealed partial class DeviceFile : IDisposable
 {
     public DeviceFile(string fileName)
     {
diff --git a/Usbipd/ExitCode.cs b/Usbipd/ExitCode.cs
index 7cd581e..3fba900 100644
--- a/Usbipd/ExitCode.cs
+++ b/Usbipd/ExitCode.cs
@@ -4,7 +4,7 @@
 
 namespace Usbipd;
 
-public enum ExitCode
+enum ExitCode
 {
     Success = 0,
     Failure = 1,
diff --git a/Usbipd/ExportedDevice.cs b/Usbipd/ExportedDevice.cs
index 19621b2..55ae3b0 100644
--- a/Usbipd/ExportedDevice.cs
+++ b/Usbipd/ExportedDevice.cs
@@ -24,7 +24,7 @@ sealed record ExportedDevice(string InstanceId, BusId BusId, Linux.UsbDeviceSpee
     static void Serialize(Stream stream, string value, uint size)
     {
         var buf = new byte[size];
-        Encoding.UTF8.GetBytes(value, 0, value.Length, buf, 0);
+        _ = Encoding.UTF8.GetBytes(value, 0, value.Length, buf, 0);
         stream.Write(buf);
     }
 
@@ -92,12 +92,12 @@ public void Serialize(Stream stream, bool includeInterfaces)
             }
         };
         StructToBytes(request, buf);
-        await hub.IoControlAsync(PInvoke.IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, buf, buf);
+        _ = await hub.IoControlAsync(PInvoke.IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, buf, buf);
         BytesToStruct(buf.AsSpan(Marshal.SizeOf<USB_DESCRIPTOR_REQUEST>()), out USB_CONFIGURATION_DESCRIPTOR configuration);
         buf = new byte[Marshal.SizeOf<USB_DESCRIPTOR_REQUEST>() + configuration.wTotalLength];
         request.SetupPacket.wLength = configuration.wTotalLength;
         StructToBytes(request, buf);
-        await hub.IoControlAsync(PInvoke.IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, buf, buf);
+        _ = await hub.IoControlAsync(PInvoke.IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, buf, buf);
 
         var offset = Marshal.SizeOf<USB_DESCRIPTOR_REQUEST>();
         while (offset < buf.Length)
@@ -134,12 +134,12 @@ public static async Task<ExportedDevice> GetExportedDevice(UsbDevice device, Can
 
         var hubInterfacePath = ConfigurationManager.GetHubInterfacePath(device.StubInstanceId ?? device.InstanceId);
         using var hubFile = new DeviceFile(hubInterfacePath);
-        using var cancellationTokenRegistration = cancellationToken.Register(() => hubFile.Dispose());
+        using var cancellationTokenRegistration = cancellationToken.Register(hubFile.Dispose);
         try
         {
             var data = new USB_NODE_CONNECTION_INFORMATION_EX() { ConnectionIndex = device.BusId.Value.Port };
             var buf = StructToBytes(data);
-            await hubFile.IoControlAsync(PInvoke.IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, buf, buf);
+            _ = await hubFile.IoControlAsync(PInvoke.IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, buf, buf);
             BytesToStruct(buf, out data);
 
             var speed = MapWindowsSpeedToLinuxSpeed((USB_DEVICE_SPEED)data.Speed);
@@ -151,7 +151,7 @@ public static async Task<ExportedDevice> GetExportedDevice(UsbDevice device, Can
                 SupportedUsbProtocols = { ul = (uint)(UsbProtocols.Usb110 | UsbProtocols.Usb200 | UsbProtocols.Usb300) },
             };
             var buf2 = StructToBytes(data2);
-            await hubFile.IoControlAsync(PInvoke.IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX_V2, buf2, buf2);
+            _ = await hubFile.IoControlAsync(PInvoke.IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX_V2, buf2, buf2);
             BytesToStruct(buf2, out data2);
 
             if ((data2.SupportedUsbProtocols.ul & (uint)UsbProtocols.Usb300) != 0)
diff --git a/Usbipd/Interop/Linux.cs b/Usbipd/Interop/Linux.cs
index ff526f2..b59b187 100644
--- a/Usbipd/Interop/Linux.cs
+++ b/Usbipd/Interop/Linux.cs
@@ -8,7 +8,7 @@ static class Linux
 {
     /// <summary>linux: ch9.h: usb_device_speed
     /// <para><seealso cref="Windows.Win32.Devices.Usb.USB_DEVICE_SPEED"/></para></summary>
-    public enum UsbDeviceSpeed : uint
+    internal enum UsbDeviceSpeed : uint
     {
         USB_SPEED_UNKNOWN = 0,
         USB_SPEED_LOW, USB_SPEED_FULL, // usb 1.1
@@ -18,7 +18,7 @@ public enum UsbDeviceSpeed : uint
         USB_SPEED_SUPER_PLUS,          // usb 3.1
     }
 
-    public enum Errno : int
+    internal enum Errno : int
     {
         SUCCESS = 0,
         /// <summary>linux: errno-base.h</summary>
diff --git a/Usbipd/Interop/UsbIp.cs b/Usbipd/Interop/UsbIp.cs
index a5f8096..6b2631d 100644
--- a/Usbipd/Interop/UsbIp.cs
+++ b/Usbipd/Interop/UsbIp.cs
@@ -27,7 +27,7 @@ static class UsbIp
     /// <summary>UsbIp: tools/usbip_network.c: usbip_port</summary>
     public const ushort USBIP_PORT = 3240;
 
-    public enum OpCode : ushort
+    internal enum OpCode : ushort
     {
         /// <summary>UsbIp: tools/usbip_network.h</summary>
         OP_REQ_DEVLIST = 0x8005,
@@ -40,7 +40,7 @@ public enum OpCode : ushort
         OP_REP_IMPORT = 0x0003,
     }
 
-    public enum Status : uint
+    internal enum Status : uint
     {
         /// <summary>UsbIp: tools/usbip_common.h
         /// <para>Request Completed Successfully</para></summary>
@@ -62,7 +62,7 @@ public enum Status : uint
         ST_ERROR
     }
 
-    public enum UsbIpCmd : uint
+    internal enum UsbIpCmd : uint
     {
         /// <summary>UsbIp: drivers/usbip_common.h</summary>
         USBIP_CMD_SUBMIT = 1,
@@ -74,7 +74,7 @@ public enum UsbIpCmd : uint
         USBIP_RET_UNLINK,
     }
 
-    public enum UsbIpDir : uint
+    internal enum UsbIpDir : uint
     {
         /// <summary>UsbIp: drivers/usbip_common.h</summary>
         USBIP_DIR_OUT = 0,
@@ -84,7 +84,7 @@ public enum UsbIpDir : uint
 
     /// <summary>UsbIp: drivers/usbip_common.h: usbip_header_basic</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbIpHeaderBasic
+    internal struct UsbIpHeaderBasic
     {
         public UsbIpCmd command;
         public uint seqnum;
@@ -95,7 +95,7 @@ public struct UsbIpHeaderBasic
 
     /// <summary>UsbIp: drivers/usbip_common.h: usbip_header_cmd_submit</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbIpHeaderCmdSubmit
+    internal struct UsbIpHeaderCmdSubmit
     {
         public uint transfer_flags;
         public uint transfer_buffer_length;
@@ -108,7 +108,7 @@ public struct UsbIpHeaderCmdSubmit
 
     /// <summary>UsbIp: drivers/usbip_common.h: usbip_header_ret_submit</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbIpHeaderRetSubmit
+    internal struct UsbIpHeaderRetSubmit
     {
         public int status;
         public int actual_length;
@@ -119,21 +119,21 @@ public struct UsbIpHeaderRetSubmit
 
     /// <summary>UsbIp: drivers/usbip_common.h: usbip_header_cmd_unlink</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbIpHeaderCmdUnlink
+    internal struct UsbIpHeaderCmdUnlink
     {
         public uint seqnum;
     }
 
     /// <summary>UsbIp: drivers/usbip_common.h: usbip_header_ret_unlink</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbIpHeaderRetUnlink
+    internal struct UsbIpHeaderRetUnlink
     {
         public int status;
     }
 
     /// <summary>UsbIp: drivers/usbip_common.h: usbip_header</summary>
     [StructLayout(LayoutKind.Explicit, Pack = 1)]
-    public struct UsbIpHeader
+    internal struct UsbIpHeader
     {
         [FieldOffset(0)]
         public UsbIpHeaderBasic basic; // renamed, 'base' is a keyword in C#
@@ -150,7 +150,7 @@ public struct UsbIpHeader
 
     /// <summary>UsbIp: drivers/usbip_common.h: usbip_iso_packet_descriptor</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbIpIsoPacketDescriptor
+    internal struct UsbIpIsoPacketDescriptor
     {
         public uint offset;
         public uint length;
@@ -176,7 +176,7 @@ static void ReverseEndianness(this ref UsbIpHeader header)
     /// <summary>
     /// Read a native header from a big endian stream.
     /// </summary>
-    public static async Task<UsbIpHeader> ReadUsbIpHeaderAsync(this Stream stream, CancellationToken cancellationToken)
+    internal static async Task<UsbIpHeader> ReadUsbIpHeaderAsync(this Stream stream, CancellationToken cancellationToken)
     {
         var bytes = new byte[Unsafe.SizeOf<UsbIpHeader>()];
         await stream.ReadMessageAsync(bytes, cancellationToken);
@@ -187,7 +187,7 @@ public static async Task<UsbIpHeader> ReadUsbIpHeaderAsync(this Stream stream, C
     /// <summary>
     /// Read native descriptors from a big endian stream.
     /// </summary>
-    public static async Task<UsbIpIsoPacketDescriptor[]> ReadUsbIpIsoPacketDescriptorsAsync(this Stream stream, int count, CancellationToken cancellationToken)
+    internal static async Task<UsbIpIsoPacketDescriptor[]> ReadUsbIpIsoPacketDescriptorsAsync(this Stream stream, int count, CancellationToken cancellationToken)
     {
         var bytes = new byte[count * Unsafe.SizeOf<UsbIpIsoPacketDescriptor>()];
         await stream.ReadMessageAsync(bytes, cancellationToken);
@@ -198,7 +198,7 @@ public static async Task<UsbIpIsoPacketDescriptor[]> ReadUsbIpIsoPacketDescripto
     /// <summary>
     /// Marshal the native header to a big endian byte array.
     /// </summary>
-    public static byte[] ToBytes(this in UsbIpHeader header)
+    internal static byte[] ToBytes(this in UsbIpHeader header)
     {
         var bytes = new byte[Unsafe.SizeOf<UsbIpHeader>()];
         MemoryMarshal.Write(bytes, header);
@@ -209,7 +209,7 @@ public static byte[] ToBytes(this in UsbIpHeader header)
     /// <summary>
     /// Marshal the native descriptors to a big endian byte array.
     /// </summary>
-    public static byte[] ToBytes(this UsbIpIsoPacketDescriptor[] descriptors)
+    internal static byte[] ToBytes(this UsbIpIsoPacketDescriptor[] descriptors)
     {
         var bytes = MemoryMarshal.Cast<UsbIpIsoPacketDescriptor, byte>(descriptors).ToArray();
         MemoryMarshal.Cast<byte, int>(bytes).ReverseEndianness();
diff --git a/Usbipd/Interop/VBoxUsb.cs b/Usbipd/Interop/VBoxUsb.cs
index cf308a9..ab2df77 100644
--- a/Usbipd/Interop/VBoxUsb.cs
+++ b/Usbipd/Interop/VBoxUsb.cs
@@ -11,7 +11,7 @@ static class VBoxUsb
 {
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_CLAIMDEV</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbSupClaimDev
+    internal struct UsbSupClaimDev
     {
         readonly byte bInterfaceNumber;
         [MarshalAs(UnmanagedType.U1)]
@@ -24,7 +24,7 @@ public struct UsbSupClaimDev
     public static readonly Guid GUID_CLASS_VBOXUSB = new(0x873fdf, 0xCAFE, 0x80EE, 0xaa, 0x5e, 0x0, 0xc0, 0x4f, 0xb1, 0x72, 0xb);
 
     /// <summary>VBoxUsb: usblib-win.h</summary>
-    public enum SUPUSB_IOCTL : uint
+    internal enum SUPUSB_IOCTL : uint
     {
         GET_DEVICE = (PInvoke.FILE_DEVICE_UNKNOWN << 16) | (PInvoke.FILE_WRITE_ACCESS << 14) | (0x603 << 2) | (PInvoke.METHOD_BUFFERED),
         SEND_URB = (PInvoke.FILE_DEVICE_UNKNOWN << 16) | (PInvoke.FILE_WRITE_ACCESS << 14) | (0x607 << 2) | (PInvoke.METHOD_BUFFERED),
@@ -46,14 +46,14 @@ public enum SUPUSB_IOCTL : uint
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_VERSION</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    public struct UsbSupVersion
+    internal struct UsbSupVersion
     {
         public uint major;
         public uint minor;
     }
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_TRANSFER_TYPE</summary>
-    public enum UsbSupTransferType : uint
+    internal enum UsbSupTransferType : uint
     {
         USBSUP_TRANSFER_TYPE_CTRL = 0,
         USBSUP_TRANSFER_TYPE_ISOC,
@@ -63,7 +63,7 @@ public enum UsbSupTransferType : uint
     };
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_DIRECTION</summary>
-    public enum UsbSupDirection : uint
+    internal enum UsbSupDirection : uint
     {
         USBSUP_DIRECTION_SETUP = 0,
         USBSUP_DIRECTION_IN,
@@ -72,14 +72,14 @@ public enum UsbSupDirection : uint
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_XFER_FLAG</summary>
     [Flags]
-    public enum UsbSupXferFlags : uint
+    internal enum UsbSupXferFlags : uint
     {
         USBSUP_FLAG_NONE = 0,
         USBSUP_FLAG_SHORT_OK = 1 << 0,
     }
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_ERROR</summary>
-    public enum UsbSupError : uint
+    internal enum UsbSupError : uint
     {
         USBSUP_XFER_OK = 0,
         USBSUP_XFER_STALL,
@@ -92,7 +92,7 @@ public enum UsbSupError : uint
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_ISOCPKT</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    public struct UsbSupIsoPkt
+    internal struct UsbSupIsoPkt
     {
         public ushort cb;     /* [in/out] packet size/size transferred */
         public ushort off;    /* [in] offset of packet in buffer */
@@ -101,7 +101,7 @@ public struct UsbSupIsoPkt
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_URB</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    public struct UsbSupUrb
+    internal struct UsbSupUrb
     {
         public UsbSupTransferType type;           /* [in] USBSUP_TRANSFER_TYPE_XXX */
         public uint ep;             /* [in] index to dev->pipe */
@@ -117,14 +117,14 @@ public struct UsbSupUrb
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_SET_CONFIG</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbSupSetConfig
+    internal struct UsbSupSetConfig
     {
         public byte bConfigurationValue;
     }
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_SELECT_INTERFACE</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbSupSelectInterface
+    internal struct UsbSupSelectInterface
     {
         public byte bInterfaceNumber;
         public byte bAlternateSetting;
@@ -132,7 +132,7 @@ public struct UsbSupSelectInterface
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_CLEAR_ENDPOINT</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct UsbSupClearEndpoint
+    internal struct UsbSupClearEndpoint
     {
         public byte bEndpoint;
     }
diff --git a/Usbipd/Interop/VBoxUsbMon.cs b/Usbipd/Interop/VBoxUsbMon.cs
index bb01490..93fe545 100644
--- a/Usbipd/Interop/VBoxUsbMon.cs
+++ b/Usbipd/Interop/VBoxUsbMon.cs
@@ -14,7 +14,7 @@ static class VBoxUsbMon
     public const uint USBFILTER_MAGIC = 0x19670408;
 
     /// <summary>VBoxUsb: usbfilter.h: USBFILTERIDX</summary>
-    public enum UsbFilterType : uint
+    internal enum UsbFilterType : uint
     {
         INVALID = 0,
         FIRST,
@@ -26,7 +26,7 @@ public enum UsbFilterType : uint
     }
 
     /// <summary>VBoxUsb: usbfilter.h: USBFILTERMATCH</summary>
-    public enum UsbFilterMatch : ushort
+    internal enum UsbFilterMatch : ushort
     {
         INVALID = 0,
         IGNORE,
@@ -47,7 +47,7 @@ public enum UsbFilterMatch : ushort
     }
 
     /// <summary>VBoxUsb: usbfilter.h: USBFILTERIDX</summary>
-    public enum UsbFilterIdx : uint
+    internal enum UsbFilterIdx : uint
     {
         VENDOR_ID = 0,
         PRODUCT_ID,
@@ -66,7 +66,7 @@ public enum UsbFilterIdx : uint
 
     /// <summary>VBoxUsb: usbfilter.h: USBFILTERFIELD</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    public struct UsbFilterField
+    internal struct UsbFilterField
     {
         public UsbFilterMatch enmMatch;
         public ushort u16Value;
@@ -74,7 +74,7 @@ public struct UsbFilterField
 
     /// <summary>VBoxUsb: usbfilter.h: USBFILTER</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    public struct UsbFilter
+    internal struct UsbFilter
     {
         uint u32Magic;
         UsbFilterType enmType;
@@ -109,7 +109,7 @@ public readonly void SetMatch(UsbFilterIdx index, UsbFilterMatch match, ushort v
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_FLTADDOUT</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    public struct UsbSupFltAddOut
+    internal struct UsbSupFltAddOut
     {
         public ulong uId;
         public int rc;
@@ -121,7 +121,7 @@ public struct UsbSupFltAddOut
     public const string USBMON_DEVICE_NAME = @"\\.\VBoxUSBMon";
 
     /// <summary>VBoxUsb: usblib-win.h</summary>
-    public enum SUPUSBFLT_IOCTL : uint
+    internal enum SUPUSBFLT_IOCTL : uint
     {
         GET_VERSION = (PInvoke.FILE_DEVICE_UNKNOWN << 16) | (PInvoke.FILE_WRITE_ACCESS << 14) | (0x610 << 2) | (PInvoke.METHOD_BUFFERED),
         ADD_FILTER = (PInvoke.FILE_DEVICE_UNKNOWN << 16) | (PInvoke.FILE_WRITE_ACCESS << 14) | (0x611 << 2) | (PInvoke.METHOD_BUFFERED),
@@ -137,7 +137,7 @@ public enum SUPUSBFLT_IOCTL : uint
 
     /// <summary>VBoxUsb: usblib-win.h: USBSUP_VERSION</summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    public struct UsbSupVersion
+    internal struct UsbSupVersion
     {
         public uint major;
         public uint minor;
diff --git a/Usbipd/Interop/WinSDK.cs b/Usbipd/Interop/WinSDK.cs
index 9ca3911..39d4e47 100644
--- a/Usbipd/Interop/WinSDK.cs
+++ b/Usbipd/Interop/WinSDK.cs
@@ -16,11 +16,11 @@ static class WinSDK
     /// <summary>WinSDK: usbioctl.h: USB_DESCRIPTOR_REQUEST</summary>
     /// NOTE: CsWin32 gets this one wrong; its version is too long by one byte (probably due to Data[0]).
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct USB_DESCRIPTOR_REQUEST
+    internal struct USB_DESCRIPTOR_REQUEST
     {
         public uint ConnectionIndex;
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct AnonymousSetupPacket
+        internal struct AnonymousSetupPacket
         {
             public byte bmRequest;
             public byte bRequest;
@@ -35,7 +35,7 @@ public struct AnonymousSetupPacket
     /// <summary>WinSDK: usbioctl.h: USB_NODE_CONNECTION_INFORMATION_EX</summary>
     /// NOTE: CsWin32 gets this one wrong; its version is too long (probably due to PipeList[0]).
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct USB_NODE_CONNECTION_INFORMATION_EX
+    internal struct USB_NODE_CONNECTION_INFORMATION_EX
     {
         public uint ConnectionIndex;
         public USB_DEVICE_DESCRIPTOR DeviceDescriptor;
@@ -51,22 +51,22 @@ public struct USB_NODE_CONNECTION_INFORMATION_EX
 
     /// <summary>WinSDK: usbioctl.h: USB_PROTOCOLS</summary>
     [Flags]
-    public enum UsbProtocols : uint
+    internal enum UsbProtocols : uint
     {
         None = 0,
-        Usb110 = (1 << 0),
-        Usb200 = (1 << 1),
-        Usb300 = (1 << 2),
+        Usb110 = 1 << 0,
+        Usb200 = 1 << 1,
+        Usb300 = 1 << 2,
     }
 
     /// <summary>WinSDK: usbioctl.h: USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS</summary>
     [Flags]
-    public enum UsbNodeConnectionInformationExV2Flags : uint
+    internal enum UsbNodeConnectionInformationExV2Flags : uint
     {
-        DeviceIsOperatingAtSuperSpeedOrHigher = (1 << 0),
-        DeviceIsSuperSpeedCapableOrHigher = (1 << 1),
-        DeviceIsOperatingAtSuperSpeedPlusOrHigher = (1 << 2),
-        DeviceIsSuperSpeedPlusCapableOrHigher = (1 << 3),
+        DeviceIsOperatingAtSuperSpeedOrHigher = 1 << 0,
+        DeviceIsSuperSpeedCapableOrHigher = 1 << 1,
+        DeviceIsOperatingAtSuperSpeedPlusOrHigher = 1 << 2,
+        DeviceIsSuperSpeedPlusCapableOrHigher = 1 << 3,
     }
 
     /// <summary>WinSDK: setupapi.h: ERROR_NO_DRIVER_SELECTED</summary>
diff --git a/Usbipd/ParseResultExtensions.cs b/Usbipd/ParseResultExtensions.cs
index 9b15b06..27ab536 100644
--- a/Usbipd/ParseResultExtensions.cs
+++ b/Usbipd/ParseResultExtensions.cs
@@ -10,5 +10,7 @@ namespace Usbipd;
 static class ParseResultExtensions
 {
     public static T? GetValueForOptionOrNull<T>(this ParseResult parseResult, Option<T> option) where T : struct
-        => parseResult.HasOption(option) ? parseResult.GetValueForOption(option) : null;
+    {
+        return parseResult.HasOption(option) ? parseResult.GetValueForOption(option) : null;
+    }
 }
diff --git a/Usbipd/PcapNg.cs b/Usbipd/PcapNg.cs
index f09c990..538869b 100644
--- a/Usbipd/PcapNg.cs
+++ b/Usbipd/PcapNg.cs
@@ -14,7 +14,7 @@
 
 namespace Usbipd;
 
-sealed class PcapNg
+sealed partial class PcapNg
     : IDisposable
 {
     public PcapNg(IConfiguration config, ILogger<PcapNg> logger)
@@ -65,7 +65,7 @@ internal static byte ConvertType(UsbSupTransferType type)
             UsbSupTransferType.USBSUP_TRANSFER_TYPE_INTR => 1,
             UsbSupTransferType.USBSUP_TRANSFER_TYPE_MSG => 2,
             UsbSupTransferType.USBSUP_TRANSFER_TYPE_BULK => 3,
-            _ => throw new ArgumentOutOfRangeException(nameof(type)),
+            UsbSupTransferType.USBSUP_TRANSFER_TYPE_CTRL or _ => throw new ArgumentOutOfRangeException(nameof(type)),
         };
     }
 
@@ -168,7 +168,7 @@ public void DumpPacketIsoRequest(UsbIpHeaderBasic basic, UsbIpHeaderCmdSubmit cm
         usbmon.Write((uint)(timestamp % 1000000)); // micro seconds
         usbmon.Write(-115); // -EINPROGRESS
         usbmon.Write(cmdSubmit.transfer_buffer_length); // length
-        usbmon.Write(data.Length + packetDescriptors.Length * 16); // actual
+        usbmon.Write(data.Length + (packetDescriptors.Length * 16)); // actual
         usbmon.Write((uint)0); // ISO error count
         usbmon.Write((uint)packetDescriptors.Length);
         usbmon.Write(cmdSubmit.interval);
@@ -209,7 +209,7 @@ public void DumpPacketIsoReply(UsbIpHeaderBasic basic, UsbIpHeaderCmdSubmit cmdS
         usbmon.Write((uint)(timestamp % 1000000)); // micro seconds
         usbmon.Write(retSubmit.status);
         usbmon.Write(retSubmit.actual_length); // length
-        usbmon.Write(data.Length + packetDescriptors.Length * 16); // actual
+        usbmon.Write(data.Length + (packetDescriptors.Length * 16)); // actual
         usbmon.Write((uint)retSubmit.error_count); // ISO error count
         usbmon.Write((uint)packetDescriptors.Length);
         usbmon.Write(cmdSubmit.interval);
@@ -345,7 +345,7 @@ async Task PacketWriterAsync(CancellationToken cancellationToken)
                 }
                 try
                 {
-                    await BlockChannel.Reader.WaitToReadAsync(flushTimer.Token);
+                    _ = await BlockChannel.Reader.WaitToReadAsync(flushTimer.Token);
                     while (BlockChannel.Reader.TryRead(out var block))
                     {
                         await Stream.WriteAsync(block, CancellationToken.None);
@@ -405,7 +405,7 @@ static void AddOption(BinaryWriter block, ushort code, byte[] data)
 
     static void AddOption(BinaryWriter block, ushort code, byte value)
     {
-        AddOption(block, code, new byte[] { value });
+        AddOption(block, code, [value]);
     }
 
     static void AddOption(BinaryWriter block, ushort code, ulong value)
@@ -483,8 +483,8 @@ byte[] CreateInterfaceStatisticsBlock()
         block.Write(0); // interface ID
         block.Write((uint)(timestamp >> 32));
         block.Write((uint)timestamp);
-        AddOption(block, 2, BitConverter.GetBytes((uint)(TimestampBase >> 32)).Concat(BitConverter.GetBytes((uint)TimestampBase)).ToArray()); // isb_starttime
-        AddOption(block, 3, BitConverter.GetBytes((uint)(timestamp >> 32)).Concat(BitConverter.GetBytes((uint)timestamp)).ToArray()); // isb_endtime
+        AddOption(block, 2, [.. BitConverter.GetBytes((uint)(TimestampBase >> 32)), .. BitConverter.GetBytes((uint)TimestampBase)]); // isb_starttime
+        AddOption(block, 3, [.. BitConverter.GetBytes((uint)(timestamp >> 32)), .. BitConverter.GetBytes((uint)timestamp)]); // isb_endtime
         AddOption(block, 4, TotalPacketsWritten); // isb_ifrecv
         AddOption(block, 5, 0ul); // isb_ifdrop
         AddOption(block, 6, TotalPacketsWritten); // isb_filteraccept
@@ -516,7 +516,7 @@ static byte[] FinishBlock(BinaryWriter block)
         block.Write(0); // opt_endofopt
         var length = (uint)block.Seek(0, SeekOrigin.Current) + 4;
         block.Write(length); // block total length
-        block.Seek(4, SeekOrigin.Begin);
+        _ = block.Seek(4, SeekOrigin.Begin);
         block.Write(length); // block total length
         block.Flush();
         var memoryStream = (MemoryStream)block.BaseStream;
diff --git a/Usbipd/PolicyRuleAutoBind.cs b/Usbipd/PolicyRuleAutoBind.cs
index a7620e5..e5a3292 100644
--- a/Usbipd/PolicyRuleAutoBind.cs
+++ b/Usbipd/PolicyRuleAutoBind.cs
@@ -13,25 +13,16 @@ sealed record PolicyRuleAutoBind(PolicyRuleEffect effect, BusId? BusId, VidPid?
     const string BusIdName = "BusId";
     const string HardwareIdName = "HardwareId";
 
-    public override bool IsValid() => (BusId.HasValue || HardwareId.HasValue) && !(BusId.HasValue && BusId.Value.IsIncompatibleHub);
+    public override bool IsValid()
+    {
+        return (BusId.HasValue || HardwareId.HasValue) && !(BusId.HasValue && BusId.Value.IsIncompatibleHub);
+    }
 
     public override bool Matches(UsbDevice usbDevice)
     {
-        if (!IsValid())
-        {
-            throw new InvalidOperationException("Invalid policy rule");
-        }
-
-        if (BusId.HasValue && BusId.Value != usbDevice.BusId)
-        {
-            return false;
-        }
-        if (HardwareId.HasValue && HardwareId.Value != usbDevice.HardwareId)
-        {
-            return false;
-        }
-
-        return true;
+        return IsValid()
+            ? (!BusId.HasValue || BusId.Value == usbDevice.BusId) && (!HardwareId.HasValue || HardwareId.Value == usbDevice.HardwareId)
+            : throw new InvalidOperationException("Invalid policy rule");
     }
 
     public override void Save(RegistryKey registryKey)
diff --git a/Usbipd/PolicyRuleEffect.cs b/Usbipd/PolicyRuleEffect.cs
index 7c249d8..79bd0cd 100644
--- a/Usbipd/PolicyRuleEffect.cs
+++ b/Usbipd/PolicyRuleEffect.cs
@@ -4,7 +4,7 @@
 
 namespace Usbipd;
 
-public enum PolicyRuleEffect
+enum PolicyRuleEffect
 {
     Allow,
     Deny,
diff --git a/Usbipd/PolicyRuleOperation.cs b/Usbipd/PolicyRuleOperation.cs
index 28c191b..4119031 100644
--- a/Usbipd/PolicyRuleOperation.cs
+++ b/Usbipd/PolicyRuleOperation.cs
@@ -4,7 +4,7 @@
 
 namespace Usbipd;
 
-public enum PolicyRuleOperation
+enum PolicyRuleOperation
 {
     AutoBind,
 }
diff --git a/Usbipd/Program.cs b/Usbipd/Program.cs
index 2149c6c..10728d6 100644
--- a/Usbipd/Program.cs
+++ b/Usbipd/Program.cs
@@ -204,22 +204,15 @@ internal static ExitCode Run(IConsole? optionalTestConsole, ICommandHandlers com
             });
             attachCommand.SetHandler(async invocationContext =>
             {
-                if (invocationContext.ParseResult.HasOption(busIdOption))
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.AttachWsl(invocationContext.ParseResult.GetValueForOption(busIdOption),
+                invocationContext.ExitCode = invocationContext.ParseResult.HasOption(busIdOption)
+                    ? (int)await commandHandlers.AttachWsl(invocationContext.ParseResult.GetValueForOption(busIdOption),
                             invocationContext.ParseResult.HasOption(autoAttachOption),
                             invocationContext.ParseResult.GetValueForOption(wslOption),
-                            invocationContext.Console, invocationContext.GetCancellationToken());
-                }
-                else
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.AttachWsl(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
+                            invocationContext.Console, invocationContext.GetCancellationToken())
+                    : (int)await commandHandlers.AttachWsl(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
                             invocationContext.ParseResult.HasOption(autoAttachOption),
                             invocationContext.ParseResult.GetValueForOption(wslOption),
                             invocationContext.Console, invocationContext.GetCancellationToken());
-                }
             });
             rootCommand.AddCommand(attachCommand);
         }
@@ -279,20 +272,13 @@ await commandHandlers.AttachWsl(invocationContext.ParseResult.GetValueForOption(
             });
             bindCommand.SetHandler(async invocationContext =>
             {
-                if (invocationContext.ParseResult.HasOption(busIdOption))
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.Bind(invocationContext.ParseResult.GetValueForOption(busIdOption),
+                invocationContext.ExitCode = invocationContext.ParseResult.HasOption(busIdOption)
+                    ? (int)await commandHandlers.Bind(invocationContext.ParseResult.GetValueForOption(busIdOption),
                             invocationContext.ParseResult.HasOption(forceOption),
-                            invocationContext.Console, invocationContext.GetCancellationToken());
-                }
-                else
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.Bind(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
+                            invocationContext.Console, invocationContext.GetCancellationToken())
+                    : (int)await commandHandlers.Bind(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
                             invocationContext.ParseResult.HasOption(forceOption),
                             invocationContext.Console, invocationContext.GetCancellationToken());
-                }
             });
             rootCommand.AddCommand(bindCommand);
         }
@@ -351,23 +337,13 @@ await commandHandlers.Bind(invocationContext.ParseResult.GetValueForOption(hardw
             });
             detachCommand.SetHandler(async invocationContext =>
             {
-                if (invocationContext.ParseResult.HasOption(allOption))
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.DetachAll(invocationContext.Console, invocationContext.GetCancellationToken());
-                }
-                else if (invocationContext.ParseResult.HasOption(busIdOption))
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.Detach(invocationContext.ParseResult.GetValueForOption(busIdOption),
-                            invocationContext.Console, invocationContext.GetCancellationToken());
-                }
-                else
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.Detach(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
-                            invocationContext.Console, invocationContext.GetCancellationToken());
-                }
+                invocationContext.ExitCode = invocationContext.ParseResult.HasOption(allOption)
+                    ? (int)await commandHandlers.DetachAll(invocationContext.Console, invocationContext.GetCancellationToken())
+                    : invocationContext.ParseResult.HasOption(busIdOption)
+                        ? (int)await commandHandlers.Detach(invocationContext.ParseResult.GetValueForOption(busIdOption),
+                                invocationContext.Console, invocationContext.GetCancellationToken())
+                        : (int)await commandHandlers.Detach(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
+                                invocationContext.Console, invocationContext.GetCancellationToken());
             });
             rootCommand.AddCommand(detachCommand);
         }
@@ -549,17 +525,10 @@ await commandHandlers.List(invocationContext.ParseResult.HasOption(usbidsOption)
                 });
                 removeCommand.SetHandler(async invocationContext =>
                 {
-                    if (invocationContext.ParseResult.HasOption(allOption))
-                    {
-                        invocationContext.ExitCode = (int)
-                            await commandHandlers.PolicyRemoveAll(invocationContext.Console, invocationContext.GetCancellationToken());
-                    }
-                    else
-                    {
-                        invocationContext.ExitCode = (int)
-                            await commandHandlers.PolicyRemove(invocationContext.ParseResult.GetValueForOption(guidOption),
+                    invocationContext.ExitCode = invocationContext.ParseResult.HasOption(allOption)
+                        ? (int)await commandHandlers.PolicyRemoveAll(invocationContext.Console, invocationContext.GetCancellationToken())
+                        : (int)await commandHandlers.PolicyRemove(invocationContext.ParseResult.GetValueForOption(guidOption),
                                 invocationContext.Console, invocationContext.GetCancellationToken());
-                    }
                 });
                 policyCommand.AddCommand(removeCommand);
             }
@@ -676,29 +645,16 @@ await commandHandlers.Server(invocationContext.ParseResult.GetValueForArgument(k
             });
             unbindCommand.SetHandler(async invocationContext =>
             {
-                if (invocationContext.ParseResult.HasOption(allOption))
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.UnbindAll(invocationContext.Console, invocationContext.GetCancellationToken());
-                }
-                else if (invocationContext.ParseResult.HasOption(busIdOption))
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.Unbind(invocationContext.ParseResult.GetValueForOption(busIdOption),
-                            invocationContext.Console, invocationContext.GetCancellationToken());
-                }
-                else if (invocationContext.ParseResult.HasOption(guidOption))
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.Unbind(invocationContext.ParseResult.GetValueForOption(guidOption),
-                            invocationContext.Console, invocationContext.GetCancellationToken());
-                }
-                else
-                {
-                    invocationContext.ExitCode = (int)
-                        await commandHandlers.Unbind(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
-                            invocationContext.Console, invocationContext.GetCancellationToken());
-                }
+                invocationContext.ExitCode = invocationContext.ParseResult.HasOption(allOption)
+                    ? (int)await commandHandlers.UnbindAll(invocationContext.Console, invocationContext.GetCancellationToken())
+                    : invocationContext.ParseResult.HasOption(busIdOption)
+                        ? (int)await commandHandlers.Unbind(invocationContext.ParseResult.GetValueForOption(busIdOption),
+                                invocationContext.Console, invocationContext.GetCancellationToken())
+                        : invocationContext.ParseResult.HasOption(guidOption)
+                            ? (int)await commandHandlers.Unbind(invocationContext.ParseResult.GetValueForOption(guidOption),
+                                    invocationContext.Console, invocationContext.GetCancellationToken())
+                            : (int)await commandHandlers.Unbind(invocationContext.ParseResult.GetValueForOption(hardwareIdOption),
+                                    invocationContext.Console, invocationContext.GetCancellationToken());
             });
             rootCommand.AddCommand(unbindCommand);
         }
@@ -809,11 +765,7 @@ await commandHandlers.Unbind(invocationContext.ParseResult.GetValueForOption(har
         try
         {
             var exitCode = (ExitCode)commandLine.InvokeAsync(args, optionalTestConsole).Result;
-            if (!Enum.IsDefined(exitCode))
-            {
-                throw new UnexpectedResultException($"Unknown exit code {exitCode}");
-            }
-            return exitCode;
+            return Enum.IsDefined(exitCode) ? exitCode : throw new UnexpectedResultException($"Unknown exit code {exitCode}");
         }
         catch (AggregateException ex) when (ex.Flatten().InnerExceptions.Any(e => e is OperationCanceledException))
         {
diff --git a/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml b/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml
index f46c7f7..545dd2c 100644
--- a/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml
+++ b/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml
@@ -10,9 +10,9 @@ SPDX-License-Identifier: GPL-3.0-only
     <Platform>x64</Platform>
     <PublishDir>bin\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>$(MainTargetFramework)</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.17763</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
     <PublishReadyToRun>false</PublishReadyToRun>
   </PropertyGroup>
diff --git a/Usbipd/RegistryUtils.cs b/Usbipd/RegistryUtils.cs
index a416a36..1aafc44 100644
--- a/Usbipd/RegistryUtils.cs
+++ b/Usbipd/RegistryUtils.cs
@@ -25,7 +25,10 @@ static RegistryKey OpenBaseKey(bool writable)
     static readonly Lazy<RegistryKey> ReadOnlyBaseKey = new(() => OpenBaseKey(false));
     static readonly Lazy<RegistryKey> WritableBaseKey = new(() => OpenBaseKey(true));
 
-    static RegistryKey BaseKey(bool writable) => (writable ? WritableBaseKey : ReadOnlyBaseKey).Value;
+    static RegistryKey BaseKey(bool writable)
+    {
+        return (writable ? WritableBaseKey : ReadOnlyBaseKey).Value;
+    }
 
     const string ApplicationFolderName = "APPLICATIONFOLDER";
     const string DevicesName = "Devices";
@@ -120,7 +123,7 @@ static bool RemoveAttachedSubKey(RegistryKey deviceKey)
         // .NET does not have this functionality: delete a key to which you have rights while
         // you do not have rights to the containing key. So, we must use the API directly.
         // Instead of checking the return value we will check if the Attached key is actually gone.
-        PInvoke.RegDeleteKey(deviceKey.Handle, AttachedName);
+        _ = PInvoke.RegDeleteKey(deviceKey.Handle, AttachedName);
         using var attached = deviceKey.OpenSubKey(AttachedName, false);
         return attached is null;
     }
@@ -128,11 +131,7 @@ static bool RemoveAttachedSubKey(RegistryKey deviceKey)
     public static bool SetDeviceAsDetached(Guid guid)
     {
         using var deviceKey = GetDeviceKey(guid, false);
-        if (deviceKey is null)
-        {
-            return true;
-        }
-        return RemoveAttachedSubKey(deviceKey);
+        return deviceKey is null || RemoveAttachedSubKey(deviceKey);
     }
 
     public static bool SetAllDevicesAsDetached()
@@ -170,7 +169,7 @@ public static IEnumerable<UsbDevice> GetBoundDevices()
             if (Guid.TryParseExact(subKeyName, "B", out var guid))
             {
                 // Sanitize uniqueness.
-                guids.Add(guid);
+                _ = guids.Add(guid);
             }
         }
         var ignoreAttached = !Server.IsRunning();
@@ -288,7 +287,7 @@ public static SortedDictionary<Guid, PolicyRule> GetPolicyRules()
             if (Guid.TryParseExact(subKeyName, "B", out var guid))
             {
                 // Sanitize uniqueness.
-                guids.Add(guid);
+                _ = guids.Add(guid);
             }
         }
 
diff --git a/Usbipd/Server.cs b/Usbipd/Server.cs
index 5ca63f1..95abeef 100644
--- a/Usbipd/Server.cs
+++ b/Usbipd/Server.cs
@@ -11,7 +11,7 @@
 
 namespace Usbipd;
 
-sealed class Server : BackgroundService
+sealed partial class Server : BackgroundService
 {
     public const string SingletonMutexName = @"Global\usbipd-{A8256F62-728F-49B0-82BB-E5E48F83D28F}";
 
@@ -82,7 +82,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         Logger.Debug(GitVersionInformation.InformationalVersion);
 
         // Cleanup any left-overs in case the previous instance crashed.
-        RegistryUtils.SetAllDevicesAsDetached();
+        _ = RegistryUtils.SetAllDevicesAsDetached();
 
         // Non-interactive services have this disabled by default.
         // We require it so the ConfigurationManager can change the driver.
diff --git a/Usbipd/Tools.cs b/Usbipd/Tools.cs
index 37197e2..9050203 100644
--- a/Usbipd/Tools.cs
+++ b/Usbipd/Tools.cs
@@ -136,24 +136,12 @@ public static byte RawEndpoint(this UsbIpHeaderBasic basic)
 
     public static UsbSupTransferType EndpointType(this UsbIpHeaderBasic basic, UsbIpHeaderCmdSubmit submit)
     {
-        if (basic.ep == 0)
-        {
-            return UsbSupTransferType.USBSUP_TRANSFER_TYPE_MSG;
-        }
-        else if (submit.number_of_packets > 0)
-        {
-            // Specs at https://www.kernel.org/doc/html/latest/usb/usbip_protocol.html state that
-            // this shall be 0xffffffff for non-ISO, but Linux itself often sets it to 0.
-            return UsbSupTransferType.USBSUP_TRANSFER_TYPE_ISOC;
-        }
-        else if (submit.interval != 0)
-        {
-            return UsbSupTransferType.USBSUP_TRANSFER_TYPE_INTR;
-        }
-        else
-        {
-            return UsbSupTransferType.USBSUP_TRANSFER_TYPE_BULK;
-        }
+        // Specs at https://www.kernel.org/doc/html/latest/usb/usbip_protocol.html state that
+        // number_of_packets shall be 0xffffffff for non-ISO, but Linux itself often sets it to 0.
+        return basic.ep == 0 ? UsbSupTransferType.USBSUP_TRANSFER_TYPE_MSG
+            : submit.number_of_packets > 0 ? UsbSupTransferType.USBSUP_TRANSFER_TYPE_ISOC
+            : submit.interval == 0 ? UsbSupTransferType.USBSUP_TRANSFER_TYPE_BULK
+            : UsbSupTransferType.USBSUP_TRANSFER_TYPE_INTR;
     }
 
     public static Version UsbIpVersionToVersion(this ushort usbipVersion)
diff --git a/Usbipd/UnexpectedResultException.cs b/Usbipd/UnexpectedResultException.cs
index f9d4ec8..04f30d9 100644
--- a/Usbipd/UnexpectedResultException.cs
+++ b/Usbipd/UnexpectedResultException.cs
@@ -4,7 +4,7 @@
 
 namespace Usbipd;
 
-public sealed class UnexpectedResultException : Exception
+sealed class UnexpectedResultException : Exception
 {
     public UnexpectedResultException()
     {
diff --git a/Usbipd/Usbipd.csproj b/Usbipd/Usbipd.csproj
index 43929d0..3831de0 100644
--- a/Usbipd/Usbipd.csproj
+++ b/Usbipd/Usbipd.csproj
@@ -16,6 +16,7 @@ SPDX-License-Identifier: GPL-3.0-only
     <IsPublishable>true</IsPublishable>
     <PublishProfile>Properties\PublishProfiles\InputForInstaller.pubxml</PublishProfile>
     <PublishAot>true</PublishAot>
+    <OptimizationPreference>Speed</OptimizationPreference>
     <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
 
     <AssemblyName>usbipd</AssemblyName>
diff --git a/Usbipd/VBoxUsb.cs b/Usbipd/VBoxUsb.cs
index 6b3eab8..aab473a 100644
--- a/Usbipd/VBoxUsb.cs
+++ b/Usbipd/VBoxUsb.cs
@@ -22,7 +22,7 @@ static class VBoxUsb
         {
             {
                 var output = new byte[Marshal.SizeOf<UsbSupVersion>()];
-                await dev.IoControlAsync(SUPUSB_IOCTL.GET_VERSION, null, output);
+                _ = await dev.IoControlAsync(SUPUSB_IOCTL.GET_VERSION, null, output);
                 BytesToStruct(output, out UsbSupVersion version);
                 if ((version.major != USBDRV_MAJOR_VERSION) || (version.minor < USBDRV_MINOR_VERSION))
                 {
@@ -32,7 +32,7 @@ static class VBoxUsb
             {
                 var claimDev = new UsbSupClaimDev();
                 var output = new byte[Marshal.SizeOf<UsbSupClaimDev>()];
-                await dev.IoControlAsync(SUPUSB_IOCTL.USB_CLAIM_DEVICE, StructToBytes(claimDev), output);
+                _ = await dev.IoControlAsync(SUPUSB_IOCTL.USB_CLAIM_DEVICE, StructToBytes(claimDev), output);
                 BytesToStruct(output, out claimDev);
                 if (!claimDev.fClaimed)
                 {
diff --git a/Usbipd/VBoxUsbMon.cs b/Usbipd/VBoxUsbMon.cs
index 12a6d94..7001c1f 100644
--- a/Usbipd/VBoxUsbMon.cs
+++ b/Usbipd/VBoxUsbMon.cs
@@ -11,7 +11,7 @@
 
 namespace Usbipd;
 
-sealed class VBoxUsbMon : IDisposable
+sealed partial class VBoxUsbMon : IDisposable
 {
     readonly DeviceFile UsbMonitor = new(USBMON_DEVICE_NAME);
 
@@ -33,13 +33,15 @@ public static bool IsServiceInstalled()
         return ServiceController.GetDevices().Any(sc => sc.ServiceName.Equals(ServiceName, StringComparison.InvariantCultureIgnoreCase));
     }
 
-    public static bool IsVersionSupported(UsbSupVersion version) =>
-        (version.major == USBMON_MAJOR_VERSION) && (version.minor >= USBMON_MINOR_VERSION);
+    public static bool IsVersionSupported(UsbSupVersion version)
+    {
+        return (version.major == USBMON_MAJOR_VERSION) && (version.minor >= USBMON_MINOR_VERSION);
+    }
 
     public async Task<UsbSupVersion> GetVersion()
     {
         var output = new byte[Marshal.SizeOf<UsbSupVersion>()];
-        await UsbMonitor.IoControlAsync(SUPUSBFLT_IOCTL.GET_VERSION, null, output);
+        _ = await UsbMonitor.IoControlAsync(SUPUSBFLT_IOCTL.GET_VERSION, null, output);
         BytesToStruct(output, out UsbSupVersion version);
         return version;
     }
@@ -56,19 +58,16 @@ public async Task<ulong> AddFilter(ExportedDevice device)
         filter.SetMatch(UsbFilterIdx.PORT, UsbFilterMatch.NUM_EXACT, device.BusId.Port);
 
         var output = new byte[Marshal.SizeOf<UsbSupFltAddOut>()];
-        await UsbMonitor.IoControlAsync(SUPUSBFLT_IOCTL.ADD_FILTER, StructToBytes(filter), output);
+        _ = await UsbMonitor.IoControlAsync(SUPUSBFLT_IOCTL.ADD_FILTER, StructToBytes(filter), output);
         var fltAddOut = BytesToStruct<UsbSupFltAddOut>(output);
-        if (fltAddOut.rc != 0 /* VINF_SUCCESS */)
-        {
-            throw new UnexpectedResultException($"SUPUSBFLT_IOCTL_ADD_FILTER failed with returnCode {fltAddOut.rc}");
-        }
-        return fltAddOut.uId;
+        return fltAddOut.rc == 0 ? fltAddOut.uId
+            : throw new UnexpectedResultException($"SUPUSBFLT_IOCTL_ADD_FILTER failed with returnCode {fltAddOut.rc}");
     }
 
     public async Task RemoveFilter(ulong filterId)
     {
         var output = new byte[sizeof(int)];
-        await UsbMonitor.IoControlAsync(SUPUSBFLT_IOCTL.REMOVE_FILTER, BitConverter.GetBytes(filterId), output);
+        _ = await UsbMonitor.IoControlAsync(SUPUSBFLT_IOCTL.REMOVE_FILTER, BitConverter.GetBytes(filterId), output);
         var rc = BitConverter.ToInt32(output);
         if (rc != 0 /* VINF_SUCCESS */)
         {
diff --git a/Usbipd/Wsl.cs b/Usbipd/Wsl.cs
index 9729031..948f6a5 100644
--- a/Usbipd/Wsl.cs
+++ b/Usbipd/Wsl.cs
@@ -30,7 +30,7 @@ static partial class Wsl
 
     const string WslMountPoint = "/var/run/usbipd-win";
 
-    public sealed record Distribution(string Name, bool IsDefault, uint Version, bool IsRunning);
+    internal sealed record Distribution(string Name, bool IsDefault, uint Version, bool IsRunning);
 
     static readonly char[] CtrlC = ['\x03'];
 
diff --git a/Usbipd/packages.lock.json b/Usbipd/packages.lock.json
index 2548563..10050a3 100644
--- a/Usbipd/packages.lock.json
+++ b/Usbipd/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 2,
   "dependencies": {
-    "net8.0-windows10.0.17763": {
+    "net9.0-windows10.0.17763": {
       "GitVersion.MsBuild": {
         "type": "Direct",
         "requested": "[6.0.5, )",
@@ -10,26 +10,26 @@
       },
       "Microsoft.DotNet.ILCompiler": {
         "type": "Direct",
-        "requested": "[8.0.11, )",
-        "resolved": "8.0.11",
-        "contentHash": "9SWRKJzFrE07m77G/9jSR1lqdlPmKCsQX1UflZEFBGYzmOZ53sjLEEcAiWtnWY0QJ750h2ahciOPO8oVjztQ0g=="
+        "requested": "[9.0.0, )",
+        "resolved": "9.0.0",
+        "contentHash": "bbnlV2PbUmCQ8Ndpx0kJaicLyV28IU+4IzyctQLL57+DxrHurYr2qsJrC8+yD44Q0DyPfv2oM168c1Tk6Bxbmg=="
       },
       "Microsoft.Extensions.Hosting.WindowsServices": {
         "type": "Direct",
-        "requested": "[8.0.1, )",
-        "resolved": "8.0.1",
-        "contentHash": "5p0tjMDpr8tgzjBdu9Rzk8lUU/PaR1D3Us52XZypl85QTxfAjthR1+YywB3GsGc+FOZWdpuEDsV8kZisEC2Hng==",
+        "requested": "[9.0.0, )",
+        "resolved": "9.0.0",
+        "contentHash": "OQ7aTejEpkj1OPibhvKYhygUSoKQ+O5YYuBmJxOCC3+F5v7d4szYfvOGd8aegK8/ARFTJqpeXZq1wyIwEza6lg==",
         "dependencies": {
-          "Microsoft.Extensions.Hosting": "8.0.1",
-          "Microsoft.Extensions.Logging.EventLog": "8.0.1",
-          "System.ServiceProcess.ServiceController": "8.0.1"
+          "Microsoft.Extensions.Hosting": "9.0.0",
+          "Microsoft.Extensions.Logging.EventLog": "9.0.0",
+          "System.ServiceProcess.ServiceController": "9.0.0"
         }
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.11, )",
-        "resolved": "8.0.11",
-        "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ=="
+        "requested": "[9.0.0, )",
+        "resolved": "9.0.0",
+        "contentHash": "zAwp213evC3UkimtVXRb+Dlgc/40QG145nmZDtp2LO9zJJMfrp+i/87BnXN7tRXEA4liyzdFkjqG1HE8/RPb4A=="
       },
       "Microsoft.Windows.CsWin32": {
         "type": "Direct",
@@ -50,281 +50,281 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==",
+        "resolved": "9.0.0",
+        "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==",
+        "resolved": "9.0.0",
+        "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
+        "resolved": "9.0.0",
+        "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.CommandLine": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "NZuZMz3Q8Z780nKX3ifV1fE7lS+6pynDHK71OfU4OZ1ItgvDOhyOC7E6z+JMZrAj63zRpwbdldYFk499t3+1dQ==",
+        "resolved": "9.0.0",
+        "contentHash": "qD+hdkBtR9Ps7AxfhTJCnoVakkadHgHlD1WRN0QHGHod+SDuca1ao1kF4G2rmpAz2AEKrE2N2vE8CCCZ+ILnNw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.EnvironmentVariables": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "plvZ0ZIpq+97gdPNNvhwvrEZ92kNml9hd1pe3idMA7svR0PztdzVLkoWLcRFgySYXUJc3kSM3Xw3mNFMo/bxRA==",
+        "resolved": "9.0.0",
+        "contentHash": "v5R638eNMxksfXb7MFnkPwLPp+Ym4W/SIGNuoe8qFVVyvygQD5DdLusybmYSJEr9zc1UzWzim/ATKeIOVvOFDg==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.FileExtensions": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "EJzSNO9oaAXnTdtdNO6npPRsIIeZCBSNmdQ091VDO7fBiOtJAAeEq6dtrVXIi3ZyjC5XRSAtVvF8SzcneRHqKQ==",
+        "resolved": "9.0.0",
+        "contentHash": "4EK93Jcd2lQG4GY6PAw8jGss0ZzFP0vPc1J85mES5fKNuDTqgFXHba9onBw2s18fs3I4vdo2AWyfD1mPAxWSQQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Physical": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Physical": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.Json": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "L89DLNuimOghjV3tLx0ArFDwVEJD6+uGB3BMCMX01kaLzXkaXHb2021xOMl2QOxUxbdePKUZsUY7n2UUkycjRg==",
+        "resolved": "9.0.0",
+        "contentHash": "WiTK0LrnsqmedrbzwL7f4ZUo+/wByqy2eKab39I380i2rd8ImfCRMrtkqJVGDmfqlkP/YzhckVOwPc5MPrSNpg==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.UserSecrets": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "7tYqdPPpAK+3jO9d5LTuCK2VxrEdf85Ol4trUr6ds4jclBecadWZ/RyPCbNjfbN5iGTfUnD/h65TOQuqQv2c+A==",
+        "resolved": "9.0.0",
+        "contentHash": "FShWw8OysquwV7wQHYkkz0VWsJSo6ETUu4h7tJRMtnG0uR+tzKOldhcO8xB1pGSOI3Ng6v3N1Q94YO8Rzq1P6A==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Json": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Physical": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Json": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Physical": "9.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==",
+        "resolved": "9.0.0",
+        "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg=="
+        "resolved": "9.0.0",
+        "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg=="
       },
       "Microsoft.Extensions.Diagnostics": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "doVPCUUCY7c6LhBsEfiy3W1bvS7Mi6LkfQMS8nlC22jZWNxBv8VO8bdfeyvpYFst6Kxqk7HBC6lytmEoBssvSQ==",
+        "resolved": "9.0.0",
+        "contentHash": "0CF9ZrNw5RAlRfbZuVIvzzhP8QeWqHiUmMBU/2H7Nmit8/vwP3/SbHeEctth7D4Gz2fBnEbokPc1NU8/j/1ZLw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1",
-          "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Diagnostics.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "elH2vmwNmsXuKmUeMQ4YW9ldXiF+gSGDgg1vORksob5POnpaI6caj1Hu8zaYbEuibhqCoWg0YRWDazBY3zjBfg==",
+        "resolved": "9.0.0",
+        "contentHash": "1K8P7XzuzX8W8pmXcZjcrqS6x5eSSdvhQohmcpgiQNY/HlDAlnrhR9dvlURfFz428A+RTCJpUyB+aKTA6AgVcQ==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.FileProviders.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==",
+        "resolved": "9.0.0",
+        "contentHash": "uK439QzYR0q2emLVtYzwyK3x+T5bTY4yWsd/k/ZUS9LR6Sflp8MIdhGXW8kQCd86dQD4tLqvcbLkku8qHY263Q==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.FileProviders.Physical": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==",
+        "resolved": "9.0.0",
+        "contentHash": "3+ZUSpOSmie+o8NnLIRqCxSh65XL/ExU7JYnFOg58awDRlY3lVpZ9A369jkoZL1rpsq7LDhEfkn2ghhGaY1y5Q==",
         "dependencies": {
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileSystemGlobbing": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileSystemGlobbing": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.FileSystemGlobbing": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ=="
+        "resolved": "9.0.0",
+        "contentHash": "jGFKZiXs2HNseK3NK/rfwHNNovER71jSj4BD1a/649ml9+h6oEtYd0GSALZDNW8jZ2Rh+oAeadOa6sagYW1F2A=="
       },
       "Microsoft.Extensions.Hosting": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "bP9EEkHBEfjgYiG8nUaXqMk/ujwJrffOkNPP7onpRMO8R+OUSESSP4xHkCAXgYZ1COP2Q9lXlU5gkMFh20gRuw==",
+        "resolved": "9.0.0",
+        "contentHash": "wNmQWRCa83HYbpxQ3wH7xBn8oyGjONSj1k8svzrFUFyJMfg/Ja/g0NfI0p85wxlUxBh97A6ypmL8X5vVUA5y2Q==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Binder": "8.0.2",
-          "Microsoft.Extensions.Configuration.CommandLine": "8.0.0",
-          "Microsoft.Extensions.Configuration.EnvironmentVariables": "8.0.0",
-          "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1",
-          "Microsoft.Extensions.Configuration.Json": "8.0.1",
-          "Microsoft.Extensions.Configuration.UserSecrets": "8.0.1",
-          "Microsoft.Extensions.DependencyInjection": "8.0.1",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Diagnostics": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.FileProviders.Physical": "8.0.0",
-          "Microsoft.Extensions.Hosting.Abstractions": "8.0.1",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging.Configuration": "8.0.1",
-          "Microsoft.Extensions.Logging.Console": "8.0.1",
-          "Microsoft.Extensions.Logging.Debug": "8.0.1",
-          "Microsoft.Extensions.Logging.EventLog": "8.0.1",
-          "Microsoft.Extensions.Logging.EventSource": "8.0.1",
-          "Microsoft.Extensions.Options": "8.0.2"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Binder": "9.0.0",
+          "Microsoft.Extensions.Configuration.CommandLine": "9.0.0",
+          "Microsoft.Extensions.Configuration.EnvironmentVariables": "9.0.0",
+          "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Json": "9.0.0",
+          "Microsoft.Extensions.Configuration.UserSecrets": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Diagnostics": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Physical": "9.0.0",
+          "Microsoft.Extensions.Hosting.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging.Configuration": "9.0.0",
+          "Microsoft.Extensions.Logging.Console": "9.0.0",
+          "Microsoft.Extensions.Logging.Debug": "9.0.0",
+          "Microsoft.Extensions.Logging.EventLog": "9.0.0",
+          "Microsoft.Extensions.Logging.EventSource": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.Hosting.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "nHwq9aPBdBPYXPti6wYEEfgXddfBrYC+CQLn+qISiwQq5tpfaqDZSKOJNxoe9rfQxGf1c+2wC/qWFe1QYJPYqw==",
+        "resolved": "9.0.0",
+        "contentHash": "yUKJgu81ExjvqbNWqZKshBbLntZMbMVz/P7Way2SBx7bMqA08Mfdc9O7hWDKAiSp+zPUGT6LKcSCQIPeDK+CCw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.1",
-          "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "9.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "4x+pzsQEbqxhNf1QYRr5TDkLP9UsLT3A6MdRKDDEgrW7h1ljiEPgTNhKYUhNCCAaVpQECVQ+onA91PTPnIp6Lw==",
+        "resolved": "9.0.0",
+        "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==",
+        "resolved": "9.0.0",
+        "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Configuration": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "QWwTrsgOnJMmn+XUslm8D2H1n3PkP/u/v52FODtyBc/k4W9r3i2vcXXeeX/upnzllJYRRbrzVzT0OclfNJtBJA==",
+        "resolved": "9.0.0",
+        "contentHash": "H05HiqaNmg6GjH34ocYE9Wm1twm3Oz2aXZko8GTwGBzM7op2brpAA8pJ5yyD1OpS1mXUtModBYOlcZ/wXeWsSg==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "8.0.0",
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Binder": "8.0.2",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2",
-          "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
+          "Microsoft.Extensions.Configuration": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Binder": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Console": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "uzcg/5U2eLyn5LIKlERkdSxw6VPC1yydnOSQiRRWGBGN3kphq3iL4emORzrojScDmxRhv49gp5BI8U3Dz7y4iA==",
+        "resolved": "9.0.0",
+        "contentHash": "yDZ4zsjl7N0K+R/1QTNpXBd79Kaf4qNLHtjk4NaG82UtNg2Z6etJywwv6OarOv3Rp7ocU7uIaRY4CrzHRO/d3w==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging.Configuration": "8.0.1",
-          "Microsoft.Extensions.Options": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging.Configuration": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.Debug": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "B8hqNuYudC2RB+L/DI33uO4rf5by41fZVdcVL2oZj0UyoAZqnwTwYHp1KafoH4nkl1/23piNeybFFASaV2HkFg==",
+        "resolved": "9.0.0",
+        "contentHash": "4wGlHsrLhYjLw4sFkfRixu2w4DK7dv60OjbvgbLGhUJk0eUPxYHhnszZ/P18nnAkfrPryvtOJ3ZTVev0kpqM6A==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.EventLog": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "ZD1m4GXoxcZeDJIq8qePKj+QAWeQNO/OG8skvrOG8RQfxLp9MAKRoliTc27xanoNUzeqvX5HhS/I7c0BvwAYUg==",
+        "resolved": "9.0.0",
+        "contentHash": "/B8I5bScondnLMNULA3PBu/7Gvmv/P7L83j7gVrmLh6R+HCgHqUNIwVvzCok4ZjIXN2KxrsONHjFYwoBK5EJgQ==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2",
-          "System.Diagnostics.EventLog": "8.0.1"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "System.Diagnostics.EventLog": "9.0.0"
         }
       },
       "Microsoft.Extensions.Logging.EventSource": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "YMXMAla6B6sEf/SnfZYTty633Ool3AH7KOw2LOaaEqwSo2piK4f7HMtzyc3CNiipDnq1fsUSuG5Oc7ZzpVy8WQ==",
+        "resolved": "9.0.0",
+        "contentHash": "zvSjdOAb3HW3aJPM5jf+PR9UoIkoci9id80RXmBgrDEozWI0GDw8tdmpyZgZSwFDvGCwHFodFLNQaeH8879rlA==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Logging": "8.0.1",
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
-          "Microsoft.Extensions.Options": "8.0.2",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Logging": "9.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "8.0.2",
-        "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==",
+        "resolved": "9.0.0",
+        "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Options.ConfigurationExtensions": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==",
+        "resolved": "9.0.0",
+        "contentHash": "Ob3FXsXkcSMQmGZi7qP07EQ39kZpSBlTcAZLbJLdI4FIf0Jug8biv2HTavWmnTirchctPlq9bl/26CXtQRguzA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Configuration.Binder": "8.0.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
-          "Microsoft.Extensions.Options": "8.0.0",
-          "Microsoft.Extensions.Primitives": "8.0.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Configuration.Binder": "9.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
+          "Microsoft.Extensions.Options": "9.0.0",
+          "Microsoft.Extensions.Primitives": "9.0.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
+        "resolved": "9.0.0",
+        "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg=="
       },
       "Microsoft.Windows.SDK.Win32Docs": {
         "type": "Transitive",
@@ -346,47 +346,47 @@
       },
       "System.Diagnostics.EventLog": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg=="
+        "resolved": "9.0.0",
+        "contentHash": "qd01+AqPhbAG14KtdtIqFk+cxHQFZ/oqRSCoxU1F+Q6Kv0cl726sl7RzU9yLFGd4BUOKdN4XojXF0pQf/R6YeA=="
       },
       "System.ServiceProcess.ServiceController": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "02I0BXo1kmMBgw03E8Hu4K6nTqur4wpQdcDZrndczPzY2fEoGvlinE35AWbyzLZ2h2IksEZ6an4tVt3hi9j1oA==",
+        "resolved": "9.0.0",
+        "contentHash": "ciFstNZEWYf40HbwzdQLdgQpgpnjkleC1z0jMqBKRdkEQqQ6I/Aht0x9fTBODnaQTtcF+scvrdimoDbfNap/aQ==",
         "dependencies": {
-          "System.Diagnostics.EventLog": "8.0.1"
+          "System.Diagnostics.EventLog": "9.0.0"
         }
       },
       "usbipd.automation": {
         "type": "Project"
       }
     },
-    "net8.0-windows10.0.17763/win-x64": {
+    "net9.0-windows10.0.17763/win-x64": {
       "Microsoft.DotNet.ILCompiler": {
         "type": "Direct",
-        "requested": "[8.0.11, )",
-        "resolved": "8.0.11",
-        "contentHash": "9SWRKJzFrE07m77G/9jSR1lqdlPmKCsQX1UflZEFBGYzmOZ53sjLEEcAiWtnWY0QJ750h2ahciOPO8oVjztQ0g==",
+        "requested": "[9.0.0, )",
+        "resolved": "9.0.0",
+        "contentHash": "bbnlV2PbUmCQ8Ndpx0kJaicLyV28IU+4IzyctQLL57+DxrHurYr2qsJrC8+yD44Q0DyPfv2oM168c1Tk6Bxbmg==",
         "dependencies": {
-          "runtime.win-x64.Microsoft.DotNet.ILCompiler": "8.0.11"
+          "runtime.win-x64.Microsoft.DotNet.ILCompiler": "9.0.0"
         }
       },
       "runtime.win-x64.Microsoft.DotNet.ILCompiler": {
         "type": "Transitive",
-        "resolved": "8.0.11",
-        "contentHash": "rrxOObwOfOZ7IqKpd4rRZqjIWrgCrLv3XzkU5FusWtgwoaUu1/8QJGcbog/RJzgl40Yt6vZpFFbWtFazeseapg=="
+        "resolved": "9.0.0",
+        "contentHash": "oDIioFi3rPT79AS5TSEwU/nlqINeJwxG5yKG/BLY57an5PV+btlPBGJgOjI3d8/BdTpKmsd9pdavm/4ENq5M/A=="
       },
       "System.Diagnostics.EventLog": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg=="
+        "resolved": "9.0.0",
+        "contentHash": "qd01+AqPhbAG14KtdtIqFk+cxHQFZ/oqRSCoxU1F+Q6Kv0cl726sl7RzU9yLFGd4BUOKdN4XojXF0pQf/R6YeA=="
       },
       "System.ServiceProcess.ServiceController": {
         "type": "Transitive",
-        "resolved": "8.0.1",
-        "contentHash": "02I0BXo1kmMBgw03E8Hu4K6nTqur4wpQdcDZrndczPzY2fEoGvlinE35AWbyzLZ2h2IksEZ6an4tVt3hi9j1oA==",
+        "resolved": "9.0.0",
+        "contentHash": "ciFstNZEWYf40HbwzdQLdgQpgpnjkleC1z0jMqBKRdkEQqQ6I/Aht0x9fTBODnaQTtcF+scvrdimoDbfNap/aQ==",
         "dependencies": {
-          "System.Diagnostics.EventLog": "8.0.1"
+          "System.Diagnostics.EventLog": "9.0.0"
         }
       }
     }
diff --git a/global.json b/global.json
index 83b5e4e..f28314f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.404",
+    "version": "9.0.100",
     "allowPrerelease": false,
     "rollForward": "latestPatch"
   },