NET6

.github/dependabot.yml

@@ -1,8 +1,10 @@
 version: 2
 updates:
-- package-ecosystem: nuget
+- package-ecosystem: "nuget"
   directory: "/"
   schedule:
-    interval: daily
-    time: '02:00'
-  open-pull-requests-limit: 10
+    interval: "daily"
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily"

.github/workflows/build.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Setup .NET Core 5.0 SDK
+      - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "6.0.x"
           source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/codeql-analysis.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: "5.0.x"
+        dotnet-version: "6.0.x"
         source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
       env:
         NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/publish.yml

@@ -27,10 +27,10 @@ jobs:
           version="${github_ref:10}"
           echo version=$version
           echo "version=$version" >> $GITHUB_ENV
-      - name: Setup .NET Core 5.0 SDK
+      - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "6.0.x"
           source-url: https://api.nuget.org/v3/index.json
         env:
           NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}}
@@ -53,7 +53,7 @@ jobs:
         working-directory: src
         run: dotnet nuget push "out/*" -k ${{secrets.NUGET_AUTH_TOKEN}}
       - name: Upload Nuget packages as release artifacts
-        uses: actions/github-script@v2
+        uses: actions/github-script@v5
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -64,7 +64,7 @@ jobs:
             for (let file of await fs.readdir('src/out')) {
               console.log('uploading', file);
 
-              await github.repos.uploadReleaseAsset({
+              await github.rest.repos.uploadReleaseAsset({
                 owner,
                 repo,
                 release_id: ${{ github.event.release.id }},

.github/workflows/test.yml

@@ -34,17 +34,13 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
-      - name: Setup .NET Core 3.1 SDK
+      - name: Setup .NET Core SDKs
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "3.1.x"
-          source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
-        env:
-          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      - name: Setup .NET Core 5.0 SDK
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "5.0.x"
+          dotnet-version: |
+            3.1.x
+            5.0.x
+            6.0.x
           source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -59,8 +55,9 @@ jobs:
         working-directory: src
         run: |
           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
-          dotnet format --check --fix-whitespace || (echo "Run 'dotnet format' to fix formatting issues" && exit 1)
-          dotnet format --check -v diag --fix-style warn --fix-analyzers warn || (echo "Run 'dotnet format' to fix formatting issues" && exit 1)
+          dotnet format --no-restore --verify-no-changes -v diag --severity warn whitespace || (echo "Run 'dotnet format' to fix whitespace issues" && exit 1)
+          dotnet format --no-restore --verify-no-changes -v diag --severity warn analyzers || (echo "Run 'dotnet format' to fix analyzers issues" && exit 1)
+          dotnet format --no-restore --verify-no-changes -v diag --severity warn style || (echo "Run 'dotnet format' to fix style issues" && exit 1)
       - name: Build solution [Release]
         working-directory: src
         run: dotnet build --no-restore -c Release -p:GraphQLTestVersion=${{ matrix.graphqlversion }}

src/BasicSample/BasicSample.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

src/BasicSample/Program.cs

@@ -75,12 +75,12 @@ public class Query
         /// Resolver for 'Query.viewer' field.
         /// </summary>
         [GraphQLAuthorize("AdminPolicy")]
-        public User Viewer() => new User { Id = Guid.NewGuid().ToString(), Name = "Quinn" };
+        public User Viewer() => new() { Id = Guid.NewGuid().ToString(), Name = "Quinn" };
 
         /// <summary>
         /// Resolver for 'Query.users' field.
         /// </summary>
-        public List<User> Users() => new List<User> { new User { Id = Guid.NewGuid().ToString(), Name = "Quinn" } };
+        public List<User> Users() => new() { new User { Id = Guid.NewGuid().ToString(), Name = "Quinn" } };
     }
 
     /// <summary>

src/Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>5.0.0-preview</VersionPrefix>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Authors>Joe McBride</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>logo.64x64.png</PackageIcon>
@@ -17,14 +17,13 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <Nullable>enable</Nullable>
+    <PackageReadmeFile Condition="'$(IsPackable)' == 'true'">README.md</PackageReadmeFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="..\..\assets\logo.64x64.png" Pack="true" PackagePath="\" Condition="'$(IsPackable)' == 'true'" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="'$(IsPackable)' == 'true'"/>
+  <ItemGroup Condition="'$(IsPackable)' == 'true'">
+    <None Include="..\..\assets\logo.64x64.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/GraphQL.Authorization.ApiTests/GraphQL.Authorization.ApiTests.csproj

@@ -2,7 +2,7 @@
   <Import Project="../Tests.props" />
 
   <PropertyGroup>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/GraphQL.Authorization.Tests/AuthorizationValidationRuleTests.cs

@@ -148,7 +148,7 @@ public void issue5_with_fragment_should_fail()
             {
                 config.Query = "query a { article { ...frag } } query b { article { ...frag } } fragment frag on Article { content }";
                 config.Schema = TypedSchema();
-                config.ValidateResult = result => result.Errors.Single(x => x.Message == $"You are not authorized to run this query.\nRequired claim 'admin' is not present.");
+                config.ValidateResult = result => _ = result.Errors.Single(x => x.Message == $"You are not authorized to run this query.\nRequired claim 'admin' is not present.");
             });
         }
 

src/GraphQL.Authorization.Tests/GraphQL.Authorization.Tests.csproj

@@ -2,7 +2,7 @@
   <Import Project="../Tests.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6;net5;netcoreapp3.1</TargetFrameworks>
     <GraphQLTestVersion>5.0.0-preview-362</GraphQLTestVersion>
   </PropertyGroup>
 

src/GraphQL.Authorization/AuthorizationPolicy.cs

@@ -8,7 +8,7 @@ namespace GraphQL.Authorization
     /// </summary>
     public class AuthorizationPolicy : IAuthorizationPolicy
     {
-        private readonly List<IAuthorizationRequirement> _requirements = new List<IAuthorizationRequirement>();
+        private readonly List<IAuthorizationRequirement> _requirements = new();
 
         /// <summary>
         /// Creates a policy with a set of specified requirements.

src/GraphQL.Authorization/AuthorizationPolicyBuilder.cs

@@ -9,13 +9,13 @@ namespace GraphQL.Authorization
     /// </summary>
     public class AuthorizationPolicyBuilder
     {
-        private readonly List<IAuthorizationRequirement> _requirements = new List<IAuthorizationRequirement>();
+        private readonly List<IAuthorizationRequirement> _requirements = new();
 
         /// <summary>
         /// Build authorization policy.
         /// </summary>
         /// <returns>Created policy.</returns>
-        public AuthorizationPolicy Build() => new AuthorizationPolicy(_requirements);
+        public AuthorizationPolicy Build() => new(_requirements);
 
         /// <summary>
         /// Adds <see cref="ClaimAuthorizationRequirement"/> with the specified claim type.

src/GraphQL.Authorization/AuthorizationResult.cs

@@ -8,7 +8,7 @@ namespace GraphQL.Authorization
     public class AuthorizationResult
     {
         // allocation optimization for green path
-        private static readonly AuthorizationResult _success = new AuthorizationResult { Succeeded = true };
+        private static readonly AuthorizationResult _success = new() { Succeeded = true };
 
         /// <summary>
         /// Is the authorization result successful?
@@ -31,6 +31,6 @@ public class AuthorizationResult
         /// </summary>
         /// <param name="errors">A set of authorization errors.</param>
         /// <returns>Instance of <see cref="AuthorizationResult"/>.</returns>
-        public static AuthorizationResult Fail(IEnumerable<string> errors) => new AuthorizationResult { Errors = errors };
+        public static AuthorizationResult Fail(IEnumerable<string> errors) => new() { Errors = errors };
     }
 }

src/GraphQL.Authorization/AuthorizationValidationRule.cs

@@ -126,7 +126,7 @@ void Visit(INode node, int _)
 
                 new MatchingNodeVisitor<VariableReference>((variableRef, context) =>
                 {
-                    if (!(context.TypeInfo.GetArgument()?.ResolvedType?.GetNamedType() is IComplexGraphType variableType))
+                    if (context.TypeInfo.GetArgument()?.ResolvedType?.GetNamedType() is not IComplexGraphType variableType || ShouldBeSkipped(actualOperation, context))
                         return;
 
                     CheckAuth(variableRef, variableType, userContext, context, operationType);

src/GraphQL.Authorization/Requirements/AuthenticatedUserRequirement.cs

@@ -9,7 +9,7 @@ namespace GraphQL.Authorization
     /// </summary>
     public class AuthenticatedUserRequirement : IAuthorizationRequirement
     {
-        internal static readonly AuthenticatedUserRequirement Instance = new AuthenticatedUserRequirement();
+        internal static readonly AuthenticatedUserRequirement Instance = new();
 
         /// <inheritdoc />
         public Task Authorize(AuthorizationContext context)

src/Harness/GraphQL.cs

@@ -24,12 +24,12 @@ public class Query
         /// Resolver for 'Query.viewer' field.
         /// </summary>
         [GraphQLAuthorize("AdminPolicy")]
-        public User Viewer() => new User { Id = Guid.NewGuid().ToString(), Name = "Quinn" };
+        public User Viewer() => new() { Id = Guid.NewGuid().ToString(), Name = "Quinn" };
 
         /// <summary>
         /// Resolver for 'Query.users' field.
         /// </summary>
-        public List<User> Users() => new List<User> { new User { Id = Guid.NewGuid().ToString(), Name = "Quinn" } };
+        public List<User> Users() => new() { new User { Id = Guid.NewGuid().ToString(), Name = "Quinn" } };
     }
 
     /// <summary>

src/Harness/Harness.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net5;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6;net5;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>