Migrate workflows (#59)

* Migrate workflows

* Bump version

* Migrate to .net6.0, bump hotchocolate

Author: sergeyshaykhullin

.github/workflows/analysis.yaml

@@ -5,9 +5,7 @@ on:
     types: [created]
 
 env:
-  DOTNET_VERSION: 5.0.x
-  NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
-  TAG_FORMAT: '*'
+  DOTNET_VERSION: 6.0.100-preview.2.21155.3
 
 jobs:
   package:
@@ -16,24 +14,23 @@ jobs:
     timeout-minutes: 5
 
     steps:
-    - name: Package | Checkout
-      uses: actions/checkout@v2.3.4
-
-    - name: Package | Release
-      id: release
-      uses: tenhaus/get-release-or-tag@v2
-
-    - name: Package | Setup
-      uses: actions/setup-dotnet@v1.7.2
-      with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
-
-    - name: Package | Publish
-      uses: brandedoutcast/publish-nuget@v2.5.5
-      with:
-        NUGET_KEY: ${{ env.NUGET_KEY }}
-        PROJECT_FILE_PATH: src/AppAny.HotChocolate.FluentValidation.csproj
-        VERSION_STATIC: ${{ steps.release.outputs.tag }}
-        TAG_FORMAT: ${{ env.TAG_FORMAT }}
-        INCLUDE_SYMBOLS: true
-
+      - name: Package | Checkout
+        uses: actions/checkout@v2
+
+      - name: Package | Release
+        id: release
+        uses: tenhaus/get-release-or-tag@v2
+
+      - name: Package | Setup
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+
+      - name: Package | Publish
+        uses: brandedoutcast/publish-nuget@v2
+        with:
+          NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
+          PROJECT_FILE_PATH: src/AppAny.HotChocolate.FluentValidation.csproj
+          VERSION_STATIC: ${{ steps.release.outputs.tag }}
+          TAG_FORMAT: '*'
+          INCLUDE_SYMBOLS: true

.github/workflows/package.yaml

@@ -8,10 +8,6 @@ on:
         required: true
         default: patch
 
-env:
-  RELEASE_TYPE: ${{ github.event.inputs.release }}
-  UPDATE_WORKFLOWS_TOKEN: ${{ secrets.UPDATE_WORKFLOWS_TOKEN }}
-
 jobs:
   release:
     name: Release
@@ -20,24 +16,19 @@ jobs:
 
     steps:
     - name: Release | Checkout
-      uses: actions/checkout@v2.3.4
-
-    - name: Release | Previous | Cancel
-      uses: styfle/cancel-workflow-action@0.8.0
-      with:
-        access_token: ${{ env.UPDATE_WORKFLOWS_TOKEN }}
+      uses: actions/checkout@v2
 
     - name: Release | Tag
       id: tag
       uses: zwaldowski/semver-release-action@v2
       with:
-        bump: ${{ env.RELEASE_TYPE }}
-        github_token: ${{ env.UPDATE_WORKFLOWS_TOKEN }}
+        bump: ${{ github.event.inputs.release }}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
     - name: Release
-      uses: ncipollo/release-action@v1.8.0
+      uses: ncipollo/release-action@v1
       with:
         tag: ${{ steps.tag.outputs.version }}
-        token: ${{ env.UPDATE_WORKFLOWS_TOKEN }}
+        token: ${{ secrets.CREATE_RELEASE_TOKEN }}

.github/workflows/release.yaml

@@ -5,9 +5,11 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+  workflow_dispatch:
 
 env:
-  DOTNET_VERSION: 5.0.x
+  DOTNET_VERSION: 6.0.100-preview.2.21155.3
+
   COVERAGE_REPORT: coverage.info
 
 jobs:
@@ -18,18 +20,20 @@ jobs:
 
     steps:
     - name: Tests | Checkout
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2
 
     - name: Tests | Setup
-      uses: actions/setup-dotnet@v1.7.2
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
+      env:
+        NUGET_AUTH_TOKEN: ${{ secrets.READ_REGISTRY_TOKEN }}
 
     - name: Tests
       run: dotnet test /p:CollectCoverage=true /p:CoverletOutput=../../ /p:CoverletOutputFormat=lcov
 
     - name: Tests | Coverage
-      uses: codecov/codecov-action@v1.2.1
+      uses: codecov/codecov-action@v1
       with:
-        flags: unittests
         files: ${{ env.COVERAGE_REPORT }}
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/tests.yaml

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <Version>0.2.2</Version>
+    <Version>0.2.3</Version>
     <LangVersion>9</LangVersion>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
@@ -25,7 +25,7 @@
 
   <ItemGroup Label="Packages">
     <PackageReference Include="FluentValidation" Version="10.0.0-preview4" />
-    <PackageReference Include="HotChocolate.Execution" Version="11.1.0-rc.4" />
+    <PackageReference Include="HotChocolate.Execution" Version="11.1.0-rc.6" />
   </ItemGroup>
 
   <ItemGroup Label="Assets">

src/AppAny.HotChocolate.FluentValidation.csproj

@@ -1,5 +1,4 @@
 using System;
-using HotChocolate.Configuration;
 using HotChocolate.Execution.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -22,9 +21,7 @@ public static IRequestExecutorBuilder AddFluentValidation(
 
       builder.OnBeforeCompleteType(ValidationDefaults.Interceptors.OnBeforeCompleteType);
 
-      builder.TryAddSchemaInterceptor(
-        new DelegateSchemaInterceptor(
-          onAfterCreate: ValidationDefaults.Interceptors.OnAfterCreate));
+      builder.OnAfterSchemaCreate(ValidationDefaults.Interceptors.OnAfterSchemaCreate);
 
       return builder;
     }

src/Extensions/RequestExecutorBuilderExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Threading.Tasks;
 using System.Runtime.CompilerServices;
 using HotChocolate;
@@ -7,7 +6,6 @@
 using FluentValidation.Internal;
 using HotChocolate.Configuration;
 using HotChocolate.Resolvers;
-using HotChocolate.Types.Descriptors;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AppAny.HotChocolate.FluentValidation
@@ -32,15 +30,15 @@ public static class ValidationDefaults
     /// <summary>
     /// Default validation field middleware
     /// </summary>
-    public static FieldMiddleware Middleware { get; } = ValidationFieldMiddleware.Use;
+    public static FieldMiddleware Middleware { get; } = ValidationMiddlewares.Field;
 
     /// <summary>
     /// Default HotChocolate interceptors
     /// </summary>
     public static class Interceptors
     {
       public static OnCompleteType OnBeforeCompleteType { get; } = ValidationInterceptors.OnBeforeCompleteType;
-      public static Action<IDescriptorContext, ISchema> OnAfterCreate { get; } = ValidationInterceptors.OnAfterCreate;
+      public static OnAfterSchemaCreate OnAfterSchemaCreate { get; } = ValidationInterceptors.OnAfterSchemaCreate;
     }
 
     /// <summary>

src/ValidationDefaults.cs

@@ -42,7 +42,7 @@ public static void OnBeforeCompleteType(
       }
     }
 
-    public static void OnAfterCreate(IDescriptorContext context, ISchema schema)
+    public static void OnAfterSchemaCreate(IDescriptorContext context, ISchema schema)
     {
       foreach (var objectField in schema.Types.OfType<IObjectType>().SelectMany(type => type.Fields))
       {

src/ValidationInterceptors.cs

@@ -3,9 +3,9 @@
 
 namespace AppAny.HotChocolate.FluentValidation
 {
-  internal static class ValidationFieldMiddleware
+  internal static class ValidationMiddlewares
   {
-    public static FieldDelegate Use(FieldDelegate next)
+    public static FieldDelegate Field(FieldDelegate next)
     {
       return async middlewareContext =>
       {

src/ValidationFieldMiddleware.cs src/ValidationMiddlewares.cssrc/ValidationFieldMiddleware.cs renamed to src/ValidationMiddlewares.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <OutputType>Exe</OutputType>