diff --git a/.appveyor.yml b/.appveyor.yml
index 7d2aff7..490dff8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,7 @@
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 #---------------------------------#
 #  Build Script                   #
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01c6341..694bec4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     strategy:
       matrix:
-        os: [ windows-2019, ubuntu-18.04, macos-10.15 ]
+        os: [ windows-2022, ubuntu-18.04, macos-10.15 ]
 
     env:
       AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -46,6 +46,14 @@ jobs:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
 
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v1.9.0
+        with:
+          dotnet-version: |
+            3.1.413
+            5.0.403
+            6.0.100
+
       - name: Build project
         uses: cake-build/cake-action@v1
         with:
diff --git a/Source/Cake.Twitter.Tests/Cake.Twitter.Tests.csproj b/Source/Cake.Twitter.Tests/Cake.Twitter.Tests.csproj
index d935b8d..47713f8 100644
--- a/Source/Cake.Twitter.Tests/Cake.Twitter.Tests.csproj
+++ b/Source/Cake.Twitter.Tests/Cake.Twitter.Tests.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <DebugType>full</DebugType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0">
+    <PackageReference Include="Cake.Core" Version="2.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Cake.Testing" Version="1.0.0">
+    <PackageReference Include="Cake.Testing" Version="2.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="coverlet.msbuild" Version="3.0.3">
diff --git a/Source/Cake.Twitter/Cake.Twitter.csproj b/Source/Cake.Twitter/Cake.Twitter.csproj
index f295a17..85a34f6 100644
--- a/Source/Cake.Twitter/Cake.Twitter.csproj
+++ b/Source/Cake.Twitter/Cake.Twitter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net50;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -33,12 +33,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
     <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CakeContrib.Guidelines" Version="1.1.1">
+    <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>