From 9d5ae8196b7206bcf25bbfe494dff870b169dd61 Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 09:39:50 -0500
Subject: [PATCH 01/11] test

---
 .../Samples.AzureFunctions.Tests.csproj                | 10 ++++++++++
 .../Samples.Complex.Tests/Samples.Complex.Tests.csproj |  2 +-
 .../Transports.AspNetCore.Tests.csproj                 |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
index 995227d6..7694cf20 100644
--- a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
+++ b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
@@ -6,6 +6,16 @@
     <Description>End to end tests for the Samples.AzureFunctions project</Description>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(MSBuildRuntimeOS)'=='Linux'">
+    <SkipBuild>true</SkipBuild>
+  </PropertyGroup>
+
+  <!-- Override the CoreBuild target when building on Linux -->
+  <Target Name="CoreBuild" Condition="'$(SkipBuild)'=='true'">
+    <Message Text="Skipping test project build on Linux." Importance="high" />
+    <!-- No build actions are performed -->
+  </Target>
+
   <ItemGroup>
     <ProjectReference Include="..\..\samples\Samples.AzureFunctions\Samples.AzureFunctions.csproj" />
     <ProjectReference Include="..\Samples.Tests\Samples.Tests.csproj" />
diff --git a/tests/Samples.Complex.Tests/Samples.Complex.Tests.csproj b/tests/Samples.Complex.Tests/Samples.Complex.Tests.csproj
index 904fdfb2..1e8a4dd2 100644
--- a/tests/Samples.Complex.Tests/Samples.Complex.Tests.csproj
+++ b/tests/Samples.Complex.Tests/Samples.Complex.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <Description>End to end tests for Samples.Server project</Description>
   </PropertyGroup>
 
diff --git a/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj b/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
index 53f661bb..7efdaadd 100644
--- a/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
+++ b/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">

From 047503a9c87ec31ae48551aea700a7c328bc35ae Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 09:49:11 -0500
Subject: [PATCH 02/11] update

---
 .../Samples.AzureFunctions.Tests.csproj           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
index 7694cf20..656ed347 100644
--- a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
+++ b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
@@ -7,18 +7,19 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MSBuildRuntimeOS)'=='Linux'">
-    <SkipBuild>true</SkipBuild>
+    <SkipCompilation>true</SkipCompilation>
   </PropertyGroup>
 
-  <!-- Override the CoreBuild target when building on Linux -->
-  <Target Name="CoreBuild" Condition="'$(SkipBuild)'=='true'">
-    <Message Text="Skipping test project build on Linux." Importance="high" />
-    <!-- No build actions are performed -->
-  </Target>
-
   <ItemGroup>
     <ProjectReference Include="..\..\samples\Samples.AzureFunctions\Samples.AzureFunctions.csproj" />
     <ProjectReference Include="..\Samples.Tests\Samples.Tests.csproj" />
   </ItemGroup>
 
+  <!-- Skip this project on Linux -->
+  <ItemGroup Condition="'$(SkipCompilation)'=='true'">
+    <Compile Remove="**/*.cs" />
+    <ProjectReference Remove="..\..\samples\Samples.AzureFunctions\Samples.AzureFunctions.csproj" />
+    <ProjectReference Remove="..\Samples.Tests\Samples.Tests.csproj" />
+  </ItemGroup>
+
 </Project>

From 01b922a768b1c8d4beea382b9fa37c4f96c97118 Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 09:54:25 -0500
Subject: [PATCH 03/11] update

---
 .../Samples.AzureFunctions.csproj               | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj b/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
index 5b5ac1ba..ed3c8809 100644
--- a/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
+++ b/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
@@ -1,21 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <NoWarn>$(NoWarn);IDE0060</NoWarn>
   </PropertyGroup>
+
+  <!-- In-Process .NET 6 Azure Functions can't be built on Linux -->
+  <PropertyGroup Condition="'$(MSBuildRuntimeOS)'=='Linux'">
+    <SkipCompilation>true</SkipCompilation>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
   </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\..\src\Transports.AspNetCore\Transports.AspNetCore.csproj" />
     <ProjectReference Include="..\..\src\Ui.GraphiQL\Ui.GraphiQL.csproj" />
     <ProjectReference Include="..\Samples.Schemas.Chat\Samples.Schemas.Chat.csproj" />
   </ItemGroup>
+  
   <ItemGroup>
     <None Update="host.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <!-- Skip this project on Linux -->
+  <ItemGroup Condition="'$(SkipCompilation)'=='true'">
+    <Compile Remove="**/*.cs" />
+    <PackageReference Remove="Microsoft.Azure.Functions.Extensions" />
+    <PackageReference Remove="Microsoft.NET.Sdk.Functions" />
+  </ItemGroup>
+
 </Project>

From 63f2493e1acc8b22992cdc32a7f128ec5d5b62c7 Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:02:19 -0500
Subject: [PATCH 04/11] update

---
 .../Samples.AzureFunctions.csproj                    | 12 +++++-------
 .../Samples.AzureFunctions.Tests.csproj              |  6 +-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj b/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
index ed3c8809..08004cd7 100644
--- a/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
+++ b/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
@@ -6,11 +6,6 @@
     <NoWarn>$(NoWarn);IDE0060</NoWarn>
   </PropertyGroup>
 
-  <!-- In-Process .NET 6 Azure Functions can't be built on Linux -->
-  <PropertyGroup Condition="'$(MSBuildRuntimeOS)'=='Linux'">
-    <SkipCompilation>true</SkipCompilation>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
@@ -28,11 +23,14 @@
     </None>
   </ItemGroup>
 
-  <!-- Skip this project on Linux -->
-  <ItemGroup Condition="'$(SkipCompilation)'=='true'">
+  <!-- In-Process .NET 6 Azure Functions can't be built on Linux -->
+  <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
     <Compile Remove="**/*.cs" />
     <PackageReference Remove="Microsoft.Azure.Functions.Extensions" />
     <PackageReference Remove="Microsoft.NET.Sdk.Functions" />
+    <ProjectReference Remove="..\..\src\Transports.AspNetCore\Transports.AspNetCore.csproj" />
+    <ProjectReference Remove="..\..\src\Ui.GraphiQL\Ui.GraphiQL.csproj" />
+    <ProjectReference Remove="..\Samples.Schemas.Chat\Samples.Schemas.Chat.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
index 656ed347..9aa73237 100644
--- a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
+++ b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
@@ -6,17 +6,13 @@
     <Description>End to end tests for the Samples.AzureFunctions project</Description>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(MSBuildRuntimeOS)'=='Linux'">
-    <SkipCompilation>true</SkipCompilation>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\samples\Samples.AzureFunctions\Samples.AzureFunctions.csproj" />
     <ProjectReference Include="..\Samples.Tests\Samples.Tests.csproj" />
   </ItemGroup>
 
   <!-- Skip this project on Linux -->
-  <ItemGroup Condition="'$(SkipCompilation)'=='true'">
+  <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
     <Compile Remove="**/*.cs" />
     <ProjectReference Remove="..\..\samples\Samples.AzureFunctions\Samples.AzureFunctions.csproj" />
     <ProjectReference Remove="..\Samples.Tests\Samples.Tests.csproj" />

From 7d25d7324fb9b1be165d2fc7fdf8bff5fa1811a0 Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:05:45 -0500
Subject: [PATCH 05/11] remove .net core 2.1 from testing

---
 .../Transports.AspNetCore.Tests.csproj                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj b/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
index 7efdaadd..fd243e17 100644
--- a/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
+++ b/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFrameworks>netcoreapp2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">

From 06f88eb228db1c274c0c5f07e10d99b72414dacc Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:07:58 -0500
Subject: [PATCH 06/11] update codeql

---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 27bebdf8..09c3a92b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -17,9 +17,9 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-         dotnet-version: 7.0.x
+         dotnet-version: 8.0.x
          source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
       env:
          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

From 31aff51175a7a2a1d2cd76aa9e1cd29b65e3d7cd Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:10:42 -0500
Subject: [PATCH 07/11] skip .net core 2.1 testing on linux

---
 tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj b/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
index 4f26a83f..e5933ff0 100644
--- a/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
+++ b/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
@@ -22,4 +22,11 @@
     <ProjectReference Include="..\Samples.Tests\Samples.Tests.csproj" />
   </ItemGroup>
 
+  <!-- Skip this project on Linux -->
+  <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
+    <Compile Remove="**/*.cs" />
+    <ProjectReference Remove="..\..\samples\Samples.Net48\Samples.Net48.csproj" />
+    <ProjectReference Remove="..\Samples.Tests\Samples.Tests.csproj" />
+  </ItemGroup>
+
 </Project>

From eb3a4921e9bf568d039b93fd7a8c73cb421baa92 Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:17:31 -0500
Subject: [PATCH 08/11] try yet again

---
 tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj b/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
index e5933ff0..88f56dce 100644
--- a/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
+++ b/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework><!-- netcoreapp2.1 not testable on Linux anymore -->
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">

From bb8b2380c5d5664596cdb579a42a8e80719bddc3 Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:22:04 -0500
Subject: [PATCH 09/11] update

---
 tests/Samples.Tests/Samples.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Samples.Tests/Samples.Tests.csproj b/tests/Samples.Tests/Samples.Tests.csproj
index 0917021e..fdc4e5ad 100644
--- a/tests/Samples.Tests/Samples.Tests.csproj
+++ b/tests/Samples.Tests/Samples.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFrameworks>net8.0;net6.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">

From 0c5826b9da3f2ec0b5e0a169094b18463fe627f6 Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:35:04 -0500
Subject: [PATCH 10/11] update

---
 tests/Samples.Tests/Samples.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Samples.Tests/Samples.Tests.csproj b/tests/Samples.Tests/Samples.Tests.csproj
index fdc4e5ad..36394042 100644
--- a/tests/Samples.Tests/Samples.Tests.csproj
+++ b/tests/Samples.Tests/Samples.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">

From fc0c65f57cdc36603909a4259e062c6b43995f2a Mon Sep 17 00:00:00 2001
From: Shane32 <shane@acdmail.com>
Date: Thu, 16 Jan 2025 10:49:26 -0500
Subject: [PATCH 11/11] update

---
 samples/Samples.Complex/Samples.Complex.csproj                 | 1 +
 .../Samples.AzureFunctions.Tests.csproj                        | 3 +++
 tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj           | 3 +++
 tests/Samples.Tests/Samples.Tests.csproj                       | 3 ++-
 .../Transports.AspNetCore.Tests.csproj                         | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/samples/Samples.Complex/Samples.Complex.csproj b/samples/Samples.Complex/Samples.Complex.csproj
index b19f5c8c..123d4451 100644
--- a/samples/Samples.Complex/Samples.Complex.csproj
+++ b/samples/Samples.Complex/Samples.Complex.csproj
@@ -5,6 +5,7 @@
     <AssemblyName>GraphQL.Samples.Server</AssemblyName>
     <RootNamespace>GraphQL.Samples.Server</RootNamespace>
     <IsPackable>false</IsPackable>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
index 9aa73237..aa06fa95 100644
--- a/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
+++ b/tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
@@ -12,6 +12,9 @@
   </ItemGroup>
 
   <!-- Skip this project on Linux -->
+  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
+    <IsTestProject>false</IsTestProject>
+  </PropertyGroup>
   <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
     <Compile Remove="**/*.cs" />
     <ProjectReference Remove="..\..\samples\Samples.AzureFunctions\Samples.AzureFunctions.csproj" />
diff --git a/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj b/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
index 88f56dce..79a29256 100644
--- a/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
+++ b/tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
@@ -23,6 +23,9 @@
   </ItemGroup>
 
   <!-- Skip this project on Linux -->
+  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
+    <IsTestProject>false</IsTestProject>
+  </PropertyGroup>
   <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
     <Compile Remove="**/*.cs" />
     <ProjectReference Remove="..\..\samples\Samples.Net48\Samples.Net48.csproj" />
diff --git a/tests/Samples.Tests/Samples.Tests.csproj b/tests/Samples.Tests/Samples.Tests.csproj
index 36394042..655a6bcd 100644
--- a/tests/Samples.Tests/Samples.Tests.csproj
+++ b/tests/Samples.Tests/Samples.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
@@ -11,6 +11,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <Description>End to end tests for sample projects</Description>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj b/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
index fd243e17..c4d36b47 100644
--- a/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
+++ b/tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Tests.props" />
 
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' != 'true'">
-    <TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">