diff --git a/tests/Shmuelie.WinRTServer.Sample.Package/Package.appxmanifest b/tests/Shmuelie.WinRTServer.Sample.Package/Package.appxmanifest
index 82e7b4b..971eca2 100644
--- a/tests/Shmuelie.WinRTServer.Sample.Package/Package.appxmanifest
+++ b/tests/Shmuelie.WinRTServer.Sample.Package/Package.appxmanifest
@@ -138,7 +138,7 @@
     <!-- Only needed for WinRT activation -->
     <Extension Category="windows.activatableClass.outOfProcessServer">
       <OutOfProcessServer ServerName="Shmuelie.WinRTServer.WinRtServer" uap5:IdentityType="activateAsPackage" uap5:RunFullTrust="true">
-        <Path>Shmuelie.WinRTServer.Sample.Server\Shmuelie.WinRTServer.Sample.Server.exe</Path>
+        <Path>Shmuelie.WinRTServer.Sample.ServerNet6\Shmuelie.WinRTServer.Sample.ServerNet6.exe</Path>
         <Arguments>-WINRT</Arguments>
         <Instancing>singleInstance</Instancing>
         <ActivatableClass ActivatableClassId="Shmuelie.WinRTServer.Sample.RemoteThing" />
diff --git a/tests/Shmuelie.WinRTServer.Sample.Package/Shmuelie.WinRTServer.Sample.Package.wapproj b/tests/Shmuelie.WinRTServer.Sample.Package/Shmuelie.WinRTServer.Sample.Package.wapproj
index 35e3632..f824601 100644
--- a/tests/Shmuelie.WinRTServer.Sample.Package/Shmuelie.WinRTServer.Sample.Package.wapproj
+++ b/tests/Shmuelie.WinRTServer.Sample.Package/Shmuelie.WinRTServer.Sample.Package.wapproj
@@ -74,7 +74,7 @@
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
   <PropertyGroup>
-    <AssetTargetFallback>native;net481;net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <AssetTargetFallback>native;net462;net481;net6.0-windows$(TargetPlatformVersion);net8.0-windows10.0.22000.0;$(AssetTargetFallback)</AssetTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" PrivateAssets="all" />
diff --git a/tests/Shmuelie.WinRTServer.Sample.Server/Shmuelie.WinRTServer.Sample.Server.csproj b/tests/Shmuelie.WinRTServer.Sample.Server/Shmuelie.WinRTServer.Sample.Server.csproj
index 431f12f..e657fdb 100644
--- a/tests/Shmuelie.WinRTServer.Sample.Server/Shmuelie.WinRTServer.Sample.Server.csproj
+++ b/tests/Shmuelie.WinRTServer.Sample.Server/Shmuelie.WinRTServer.Sample.Server.csproj
@@ -12,6 +12,7 @@
     <OutputType>winexe</OutputType>
     <DebugType>full</DebugType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RuntimeIdentifiers>win-x64;$(RuntimeIdentifiers)</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22000.197" />
diff --git a/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Program.cs b/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Program.cs
index 8a5b30e..ba9337b 100644
--- a/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Program.cs
+++ b/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Program.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Shmuelie.WinRTServer.Sample.Interfaces;
 
-[assembly: DisableRuntimeMarshalling]
-
 namespace Shmuelie.WinRTServer.Sample.Server;
 
 public static class Program
diff --git a/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Shmuelie.WinRTServer.Sample.ServerNet6.csproj b/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Shmuelie.WinRTServer.Sample.ServerNet6.csproj
index 21ebc09..80a323c 100644
--- a/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Shmuelie.WinRTServer.Sample.ServerNet6.csproj
+++ b/tests/Shmuelie.WinRTServer.Sample.ServerNet6/Shmuelie.WinRTServer.Sample.ServerNet6.csproj
@@ -3,14 +3,14 @@
     <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows$(TargetPlatformVersion)</TargetFramework>
     <Nullable>enable</Nullable>
     <Platforms>x64;x86</Platforms>
     <AssetTargetFallback>native;net481;$(AssetTargetFallback)</AssetTargetFallback>
     <RuntimeIdentifiers>win-x64;$(RuntimeIdentifiers)</RuntimeIdentifiers>
-    <IsAotCompatible>true</IsAotCompatible>
     <CsWinRTIncludes>Shmuelie.WinRTServer.Sample</CsWinRTIncludes>
     <CsWinRTIncludesPrivate>Shmuelie.WinRTServer.Sample</CsWinRTIncludesPrivate>
+    <DefineConstants>$(DefineConstants);NET</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1" />
diff --git a/tests/Shmuelie.WinRTServer.Sample.WpfNetFxClient/Shmuelie.WinRTServer.Sample.WpfNetFxClient.csproj b/tests/Shmuelie.WinRTServer.Sample.WpfNetFxClient/Shmuelie.WinRTServer.Sample.WpfNetFxClient.csproj
index 672f382..4da4600 100644
--- a/tests/Shmuelie.WinRTServer.Sample.WpfNetFxClient/Shmuelie.WinRTServer.Sample.WpfNetFxClient.csproj
+++ b/tests/Shmuelie.WinRTServer.Sample.WpfNetFxClient/Shmuelie.WinRTServer.Sample.WpfNetFxClient.csproj
@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <Platforms>x64;x86</Platforms>
+    <RuntimeIdentifiers>win-x64;$(RuntimeIdentifiers)</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22000.197" />