Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #1181

Merged
merged 11 commits into from
Jan 16, 2025
+43 −6
Merged

Fix CI #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d5ae81
test
Shane32 Jan 16, 2025
047503a
update
Shane32 Jan 16, 2025
01b922a
update
Shane32 Jan 16, 2025
63f2493
update
Shane32 Jan 16, 2025
7d25d73
remove .net core 2.1 from testing
Shane32 Jan 16, 2025
06f88eb
update codeql
Shane32 Jan 16, 2025
31aff51
skip .net core 2.1 testing on linux
Shane32 Jan 16, 2025
eb3a492
try yet again
Shane32 Jan 16, 2025
bb8b238
update
Shane32 Jan 16, 2025
0c5826b
update
Shane32 Jan 16, 2025
fc0c65f
update
Shane32 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
15 changes: 15 additions & 0 deletions samples/Samples.AzureFunctions/Samples.AzureFunctions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions samples/Samples.Complex/Samples.Complex.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<AssemblyName>GraphQL.Samples.Server</AssemblyName>
<RootNamespace>GraphQL.Samples.Server</RootNamespace>
<IsPackable>false</IsPackable>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions tests/Samples.AzureFunctions.Tests/Samples.AzureFunctions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion tests/Samples.Complex.Tests/Samples.Complex.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 11 additions & 1 deletion tests/Samples.Net48.Tests/Samples.Net48.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand All @@ -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>
3 changes: 2 additions & 1 deletion tests/Samples.Tests/Samples.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand All @@ -11,6 +11,7 @@
</PropertyGroup>
<PropertyGroup>
<Description>End to end tests for sample projects</Description>
<IsTestProject>false</IsTestProject>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Transports.AspNetCore.Tests/Transports.AspNetCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down
Loading