diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
new file mode 100644
index 0000000..8ae965a
--- /dev/null
+++ b/.github/workflows/dotnetcore.yml
@@ -0,0 +1,25 @@
+name: .NET Core CI
+
+on: [pull_request]
+
+jobs:
+  test:
+    name: Tests on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    timeout-minutes: 30
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Setup .NET Core 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.101
+
+    - name: Build
+      run: dotnet build -warnaserror
+    - name: Tests
+      run: dotnet test
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5ab01b9..67fd09d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/CoderPatros.AuthenticatedHttpClient.Basic.Tests/bin/Debug/netcoreapp2.1/CoderPatros.AuthenticatedHttpClient.Basic.Tests.dll",
+            "program": "${workspaceFolder}/CoderPatros.AuthenticatedHttpClient.Basic.Tests/bin/Debug/netcoreapp3.1/CoderPatros.AuthenticatedHttpClient.Basic.Tests.dll",
             "args": [],
             "cwd": "${workspaceFolder}/CoderPatros.AuthenticatedHttpClient.Basic.Tests",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
diff --git a/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests.csproj b/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests.csproj
index 8b88d05..fd425bd 100644
--- a/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests.csproj
+++ b/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests/CoderPatros.AuthenticatedHttpClient.AuthorizationHeader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests.csproj b/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests.csproj
index 1296e01..60c489d 100644
--- a/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests.csproj
+++ b/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests/CoderPatros.AuthenticatedHttpClient.AzureAd.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests.csproj b/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests.csproj
index 83e2803..4e2581b 100644
--- a/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests.csproj
+++ b/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests/CoderPatros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/CoderPatros.AuthenticatedHttpClient.Basic.Tests/CoderPatros.AuthenticatedHttpClient.Basic.Tests.csproj b/CoderPatros.AuthenticatedHttpClient.Basic.Tests/CoderPatros.AuthenticatedHttpClient.Basic.Tests.csproj
index 596623e..4c6c288 100644
--- a/CoderPatros.AuthenticatedHttpClient.Basic.Tests/CoderPatros.AuthenticatedHttpClient.Basic.Tests.csproj
+++ b/CoderPatros.AuthenticatedHttpClient.Basic.Tests/CoderPatros.AuthenticatedHttpClient.Basic.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests.csproj b/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests.csproj
index df941e7..8323245 100644
--- a/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests.csproj
+++ b/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests/CoderPatros.AuthenticatedHttpClient.CustomHeader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests.csproj b/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests.csproj
index d1caf46..44e96f0 100644
--- a/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests.csproj
+++ b/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests/CoderPatros.AuthenticatedHttpClient.QueryStringParameter.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>