Skip to content

Commit fe16988

Browse files
sungam3rsungam3r
authored
NET6 support, embedded readme (#665)
1 parent ecc92a3 commit fe16988

File tree

23 files changed

+36
-40
lines changed

23 files changed

+36
-40
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v2
20-
- name: Setup .NET Core 5.0 SDK
20+
- name: Setup .NET Core SDK
2121
uses: actions/setup-dotnet@v1
2222
with:
23-
dotnet-version: '5.0.x'
23+
dotnet-version: "6.0.x"
2424
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
2525
env:
2626
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup .NET Core SDK
2020
uses: actions/setup-dotnet@v1
2121
with:
22-
dotnet-version: '5.0.x'
22+
dotnet-version: "6.0.x"
2323

2424
- name: Initialize CodeQL
2525
uses: github/codeql-action/init@v1

‎.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
version="${github_ref:10}"
2828
echo version=$version
2929
echo "version=$version" >> $GITHUB_ENV
30-
- name: Setup .NET Core 5.0 SDK
30+
- name: Setup .NET Core SDK
3131
uses: actions/setup-dotnet@v1
3232
with:
33-
dotnet-version: '5.0.x'
33+
dotnet-version: "6.0.x"
3434
source-url: https://api.nuget.org/v3/index.json
3535
env:
3636
NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}}

‎.github/workflows/test.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,13 @@ jobs:
4040
steps:
4141
- name: Checkout source
4242
uses: actions/checkout@v2
43-
- name: Setup .NET Core 3.1 SDK
43+
- name: Setup .NET Core SDK
4444
uses: actions/setup-dotnet@v1
4545
with:
46-
dotnet-version: '3.1.x'
47-
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
48-
env:
49-
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
50-
- name: Setup .NET Core 5.0 SDK
51-
uses: actions/setup-dotnet@v1
52-
with:
53-
dotnet-version: '5.0.x'
46+
dotnet-version: |
47+
3.1.x
48+
5.0.x
49+
6.0.x
5450
source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
5551
env:
5652
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -60,8 +56,8 @@ jobs:
6056
if: ${{ startsWith(matrix.os, 'ubuntu') }}
6157
run: |
6258
dotnet tool install -g dotnet-format --version 6.0.243104 --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
63-
dotnet format --check --fix-whitespace || (echo "Run 'dotnet format' to fix formatting issues" && exit 1)
64-
dotnet format --check -v diag --fix-style warn --fix-analyzers warn || (echo "Run 'dotnet format' to fix formatting issues" && exit 1)
59+
dotnet format --no-restore --verify-no-changes -v diag --severity warn whitespace || (echo "Run 'dotnet format' to fix whitespace issues" && exit 1)
60+
dotnet format --no-restore --verify-no-changes -v diag --severity warn analyzers || (echo "Run 'dotnet format' to fix analyzers issues" && exit 1)
6561
- name: Build solution [Release]
6662
run: dotnet build --no-restore -c Release
6763
- name: Build solution [Debug]

‎Directory.Build.props

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<VersionPrefix>5.1.0-preview</VersionPrefix>
4+
<VersionPrefix>5.2.0-preview</VersionPrefix>
55
<LangVersion>latest</LangVersion>
66
<PackageLicenseExpression>MIT</PackageLicenseExpression>
77
<PackageIcon>logo.64x64.png</PackageIcon>
@@ -20,18 +20,17 @@
2020
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2121
<EnableNETAnalyzers>true</EnableNETAnalyzers>
2222
<NoWarn>$(NoWarn);1591</NoWarn> <!--TODO: temporary solution-->
23+
<PackageReadmeFile Condition="'$(IsPackable)' == 'true'">README.md</PackageReadmeFile>
2324

2425
<AssemblyName>GraphQL.Server.$(MSBuildProjectName)</AssemblyName>
2526
<RootNamespace>GraphQL.Server.$(MSBuildProjectName)</RootNamespace>
2627
<PackageId>GraphQL.Server.$(MSBuildProjectName)</PackageId>
2728
</PropertyGroup>
2829

29-
<ItemGroup>
30-
<None Include="..\..\assets\logo.64x64.png" Pack="true" PackagePath="\" Condition="'$(IsPackable)' == 'true'" />
31-
</ItemGroup>
32-
33-
<ItemGroup>
34-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="'$(IsPackable)' == 'true'"/>
30+
<ItemGroup Condition="'$(IsPackable)' == 'true'">
31+
<None Include="..\..\assets\logo.64x64.png" Pack="true" PackagePath="\" />
32+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
33+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
3534
</ItemGroup>
3635

3736
</Project>

‎Tests.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<PackageReference Include="NSubstitute" Version="4.2.2" />
2020
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.19" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
2121
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.10" Condition="'$(TargetFramework)' == 'net5'" />
22+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6'" />
2223
</ItemGroup>
2324

2425
</Project>

‎samples/Samples.Server/Samples.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6;net5;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>GraphQL.Samples.Server</AssemblyName>
66
<RootNamespace>GraphQL.Samples.Server</RootNamespace>
77
<IsPackable>false</IsPackable>

‎src/All/All.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6;net5;netcoreapp3.1</TargetFrameworks>
55
<Description>GraphQL Server meta package with all the packages you need to get started</Description>
66
<PackageTags>GraphQL;transport;server;WebSockets;subscriptions;middleware;authentication;authorization</PackageTags>
77
<IncludeBuildOutput>false</IncludeBuildOutput>

‎src/Authorization.AspNetCore/Authorization.AspNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6;net5;netcoreapp3.1</TargetFrameworks>
55
<Description>Integration of GraphQL.NET validation subsystem into ASP.NET Core</Description>
66
<PackageTags>GraphQL;authentication;authorization;validation</PackageTags>
77
</PropertyGroup>

‎src/Benchmarks/Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6;net5;netcoreapp3.1</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<IsPackable>false</IsPackable>
77
<NoWarn>$(NoWarn);1591</NoWarn>

0 commit comments

Comments
 (0)