diff --git a/Nuclex.Windows.Forms.Ninject (net-4.6)(net-6.0).csproj b/Nuclex.Windows.Forms.Ninject (net-4.6)(net-8.0).csproj
similarity index 86%
rename from Nuclex.Windows.Forms.Ninject (net-4.6)(net-6.0).csproj
rename to Nuclex.Windows.Forms.Ninject (net-4.6)(net-8.0).csproj
index e0f3f6d..909751c 100644
--- a/Nuclex.Windows.Forms.Ninject (net-4.6)(net-6.0).csproj	
+++ b/Nuclex.Windows.Forms.Ninject (net-4.6)(net-8.0).csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0-windows</TargetFrameworks>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Nuclex.Windows.Forms\Nuclex.Windows.Forms (net-4.6)(net-6.0).csproj" />
+    <ProjectReference Include="..\Nuclex.Windows.Forms\Nuclex.Windows.Forms (net-4.6)(net-8.0).csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/MvvmModule.cs b/Source/MvvmModule.cs
index eb6df15..f176f74 100644
--- a/Source/MvvmModule.cs
+++ b/Source/MvvmModule.cs
@@ -19,6 +19,10 @@ limitations under the License.
 
 using System;
 
+#if NET6_0_OR_GREATER
+using System.Runtime.Versioning;
+#endif
+
 using Ninject;
 using Ninject.Activation;
 using Ninject.Modules;
@@ -29,7 +33,10 @@ using Nuclex.Windows.Forms.Messages;
 
 namespace Nuclex.Windows.Forms.Ninject {
 
-  /// <summary>Sets up the service bindings for an MVVM-based WPF application</summary>
+  /// <summary>Sets up the service bindings for an MVVM-based application</summary>
+#if NET6_0_OR_GREATER
+  [SupportedOSPlatform("windows")]
+#endif
   public class MvvmModule : NinjectModule {
 
     /// <summary>Called when the module is loaded into the kernel</summary>
diff --git a/Source/NinjectWindowManager.cs b/Source/NinjectWindowManager.cs
index 81143af..f1707aa 100644
--- a/Source/NinjectWindowManager.cs
+++ b/Source/NinjectWindowManager.cs
@@ -19,6 +19,10 @@ limitations under the License.
 
 using System;
 
+#if NET6_0_OR_GREATER
+using System.Runtime.Versioning;
+#endif
+
 using Ninject;
 
 using Nuclex.Windows.Forms.AutoBinding;
@@ -26,6 +30,9 @@ using Nuclex.Windows.Forms.AutoBinding;
 namespace Nuclex.Windows.Forms.Ninject {
 
 	/// <summary>Window manager that is using Ninject</summary>
+#if NET6_0_OR_GREATER
+  [SupportedOSPlatform("windows")]
+#endif
 	public class NinjectWindowManager : WindowManager {
 
 		/// <summary>Initializes a new window manager</summary>