diff --git a/src/Orc.SystemInfo.Example/Orc.SystemInfo.Example.csproj b/src/Orc.SystemInfo.Example/Orc.SystemInfo.Example.csproj
index 3f25ed2f..b5941df9 100644
--- a/src/Orc.SystemInfo.Example/Orc.SystemInfo.Example.csproj
+++ b/src/Orc.SystemInfo.Example/Orc.SystemInfo.Example.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net9.0-windows</TargetFrameworks>
     <AssemblyName>Orc.SystemInfo.Example</AssemblyName>
     <RootNamespace>Orc.SystemInfo.Example</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
diff --git a/src/Orc.SystemInfo.Tests/Orc.SystemInfo.Tests.csproj b/src/Orc.SystemInfo.Tests/Orc.SystemInfo.Tests.csproj
index c2bb749e..4877b4cc 100644
--- a/src/Orc.SystemInfo.Tests/Orc.SystemInfo.Tests.csproj
+++ b/src/Orc.SystemInfo.Tests/Orc.SystemInfo.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+a<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <AssemblyName>Orc.SystemInfo.Tests</AssemblyName>
diff --git a/src/Orc.SystemInfo.Tests/Wmi/WindowsManagementObjectEnumeratorFacts.cs b/src/Orc.SystemInfo.Tests/Wmi/WindowsManagementObjectEnumeratorFacts.cs
index 2931cd06..2ffd3951 100644
--- a/src/Orc.SystemInfo.Tests/Wmi/WindowsManagementObjectEnumeratorFacts.cs
+++ b/src/Orc.SystemInfo.Tests/Wmi/WindowsManagementObjectEnumeratorFacts.cs
@@ -1,10 +1,5 @@
 namespace Orc.SystemInfo.Tests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading;
     using System.Threading.Tasks;
     using Moq;
     using NUnit.Framework;
diff --git a/src/Orc.SystemInfo/Orc.SystemInfo.csproj b/src/Orc.SystemInfo/Orc.SystemInfo.csproj
index 8799cec5..1c0c6a3c 100644
--- a/src/Orc.SystemInfo/Orc.SystemInfo.csproj
+++ b/src/Orc.SystemInfo/Orc.SystemInfo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyName>Orc.SystemInfo</AssemblyName>
     <RootNamespace>Orc.SystemInfo</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Catel.Core" Version="6.0.0" />
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
+    <PackageReference Include="Costura.Fody" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="Fody" Version="6.9.1" PrivateAssets="all" />
     <PackageReference Include="MethodTimer.Fody" Version="3.2.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
@@ -34,16 +34,20 @@
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0')) ">
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
-    <None Remove="costura32\WbemShim.dll" />
-    <None Remove="costura64\WbemShim.dll" />
+    <None Remove="costura-win-x86\WbemShim.dll" />
+    <None Remove="costura-win-x64\WbemShim.dll" />
     <None Remove="Resources\Dlls\x64\WbemShim.dll" />
     <None Remove="Resources\Dlls\x86\WbemShim.dll" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="costura32\WbemShim.dll" />
-    <EmbeddedResource Include="costura64\WbemShim.dll" />
+    <EmbeddedResource Include="costura-win-x86\WbemShim.dll" />
+    <EmbeddedResource Include="costura-win-x64\WbemShim.dll" />
     <EmbeddedResource Include="Resources\Dlls\x64\WbemShim.dll" />
     <EmbeddedResource Include="Resources\Dlls\x86\WbemShim.dll" />
   </ItemGroup>
diff --git a/src/Orc.SystemInfo/costura64/WbemShim.dll b/src/Orc.SystemInfo/costura-win-x64/WbemShim.dll
similarity index 100%
rename from src/Orc.SystemInfo/costura64/WbemShim.dll
rename to src/Orc.SystemInfo/costura-win-x64/WbemShim.dll
diff --git a/src/Orc.SystemInfo/costura32/WbemShim.dll b/src/Orc.SystemInfo/costura-win-x86/WbemShim.dll
similarity index 100%
rename from src/Orc.SystemInfo/costura32/WbemShim.dll
rename to src/Orc.SystemInfo/costura-win-x86/WbemShim.dll