Merge branch 'develop'

Author: dustinmoris

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 6.0.100
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -40,7 +40,7 @@ jobs:
         run: dotnet test -c Release
       - name: Pack
         if: matrix.os == 'ubuntu-latest'
-        run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/$PROJECT_NAME/$PROJECT_NAME.*proj
+        run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID-ci src/$PROJECT_NAME/$PROJECT_NAME.*proj
       - name: Upload Artifact
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v2
@@ -71,7 +71,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 6.0.100
       - name: Create Release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })
@@ -87,4 +87,4 @@ jobs:
             curl -vX PUT -u "$GITHUB_USER:$GITHUB_TOKEN" -F package=@$f $GITHUB_FEED
           done
       - name: Push to NuGet Feed
-        run: dotnet nuget push ./nupkg/*.nupkg --source $NUGET_FEED --skip-duplicate --api-key $NUGET_KEY
+        run: dotnet nuget push ./nupkg/*.nupkg --source $NUGET_FEED --skip-duplicate --api-key $NUGET_KEY

RELEASE_NOTES.md

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+## 3.0.0-alpha-1
+
+- Updated to .NET 6 and Giraffe 6.0.0-alpha-*
+
 ## 2.0.0
 
 - Updated to `net5.0` and dropped support for `net461` and `netstandard2.0`

src/Giraffe.TokenRouter/Giraffe.TokenRouter.fsproj

@@ -8,7 +8,7 @@
     <NeutralLanguage>en-GB</NeutralLanguage>
 
     <!-- Build settings -->
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -44,7 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="5.0.*" />
+    <PackageReference Include="Giraffe" Version="6.0.0-alpha-*" />
   </ItemGroup>
 
   <ItemGroup>

src/Giraffe.TokenRouter/TokenRouter.fs

@@ -6,7 +6,6 @@ open Microsoft.FSharp.Reflection
 open Printf
 open Giraffe
 open Giraffe.TokenParsers
-open FSharp.Control.Tasks
 
 // Implemenation of (router) Trie Node
 // --------------------------------------

tests/Giraffe.TokenRouter.Tests/Giraffe.TokenRouter.Tests.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AssemblyName>Giraffe.TokenRouter.Tests</AssemblyName>
     <DebugType>portable</DebugType>
     <RollForward>Major</RollForward>
@@ -15,7 +15,6 @@
     <PackageReference Include="xunit" Version="2.4.*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.*" />
     <PackageReference Include="NSubstitute" Version="3.1.*" />
-    <PackageReference Include="Giraffe" Version="5.0.*" />
     <PackageReference Include="Giraffe.ViewEngine" Version="1.4.*" />
   </ItemGroup>
 

tests/Giraffe.TokenRouter.Tests/TokenRouterTests.fs

@@ -16,7 +16,6 @@ open Newtonsoft.Json
 open Giraffe
 open Giraffe.TokenRouter
 open Giraffe.ViewEngine
-open FSharp.Control.Tasks
 
 // ---------------------------------
 // XmlAssert