Merge branch 'master' into nativeaot_sample

graphql-dotnet · Jan 16, 2025 · 5481452 · 5481452
2 parents 64d7980 + 5e869ad
commit 5481452
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 6 deletions.
diff --git 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}}

diff --git a/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj b/samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
@@ -1,21 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <NoWarn>$(NoWarn);IDE0060</NoWarn>
   </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>
+
+  <!-- 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/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
@@ -11,4 +11,14 @@
     <ProjectReference Include="..\Samples.Tests\Samples.Tests.csproj" />
   </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" />
+    <ProjectReference Remove="..\Samples.Tests\Samples.Tests.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git 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/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'">
@@ -22,4 +22,14 @@
     <ProjectReference Include="..\Samples.Tests\Samples.Tests.csproj" />
   </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" />
+    <ProjectReference Remove="..\Samples.Tests\Samples.Tests.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git 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'">
@@ -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
@@ -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>net6.0;net7.0;net8.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">