diff --git a/ci/docker/lint/Dockerfile b/ci/docker/lint/Dockerfile
index c5f4047..2be0d65 100644
--- a/ci/docker/lint/Dockerfile
+++ b/ci/docker/lint/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-sdk
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1
 
 # Install the linting tool
 RUN dotnet tool install --global --version 3.3.111304 dotnet-format
diff --git a/ci/docker/premerge.Dockerfile b/ci/docker/premerge.Dockerfile
index b957d1c..4c1bbf8 100644
--- a/ci/docker/premerge.Dockerfile
+++ b/ci/docker/premerge.Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-sdk as build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build
 WORKDIR /app
 COPY ./tools ./tools/
 COPY ./ci/docker/entrypoint.sh ./entrypoint.sh
diff --git a/ci/docker/release-tool.Dockerfile b/ci/docker/release-tool.Dockerfile
index e6f176e..5cb968e 100644
--- a/ci/docker/release-tool.Dockerfile
+++ b/ci/docker/release-tool.Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-sdk as build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build
 
 # Copy everything and build
 WORKDIR /app
@@ -6,9 +6,10 @@ COPY ./tools ./
 RUN dotnet publish -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/core/runtime:2.2
+# Requires the bionic image due to runtime requirements of the libgit2sharp library
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1-bionic
 WORKDIR /app
-COPY --from=build /app/*/out ./
+COPY --from=build /app/out ./
 
 # Setup GIT
 RUN apt-get update && \
diff --git a/dependencies.pinned b/dependencies.pinned
index 69931dc..370bc44 100644
--- a/dependencies.pinned
+++ b/dependencies.pinned
@@ -1,3 +1,4 @@
-win/dotnet-sdk-3.1.101.exe https://download.visualstudio.microsoft.com/download/pr/854ca330-4414-4141-9be8-5da3c4be8d04/3792eafd60099b3050313f2edfd31805/dotnet-sdk-3.1.101-win-x64.exe
-macos/dotnet-sdk-3.1.101.pkg https://download.visualstudio.microsoft.com/download/pr/749db4bc-73c3-4ffb-a545-c315dc9a0ca8/5281258f5dcae636efe557b8b305e20b/dotnet-sdk-3.1.101-osx-x64.pkg
-linux/dotnet-sdk-3.101.tar.gz https://download.visualstudio.microsoft.com/download/pr/c4b503d6-2f41-4908-b634-270a0a1dcfca/c5a20e42868a48a2cd1ae27cf038044c/dotnet-sdk-3.1.101-linux-x64.tar.gz
+win/dotnet-sdk-3.1.302.exe https://download.visualstudio.microsoft.com/download/pr/56b00a71-686f-4f27-9ad1-9b30308688ed/1fa023326e475813783a240532c9f2c8/dotnet-sdk-3.1.302-win-x64.exe
+macos/dotnet-sdk-3.1.302.pkg https://download.visualstudio.microsoft.com/download/pr/fff497aa-e6f6-4556-b67b-d139e772156f/4efa99b6bf0cb59104920dfd5f65f8a8/dotnet-sdk-3.1.302-osx-x64.pkg
+linux/dotnet-sdk-3.1.302.tar.gz https://download.visualstudio.microsoft.com/download/pr/c1a30ceb-adc2-4244-b24a-06ca29bb1ee9/6df5d856ff1b3e910d283f89690b7cae/dotnet-sdk-3.1.302-linux-x64.tar.gz
+win/dotnet-sdk-2.2.402.exe https://download.visualstudio.microsoft.com/download/pr/40c1dd82-671c-4974-919d-ac8a61ef5a91/49ab67c335878f4a5bdd84e14c76708f/dotnet-sdk-2.2.402-win-x64.exe
diff --git a/tools/PackageSymLinker/PackageSymLinker.csproj b/tools/PackageSymLinker/PackageSymLinker.csproj
index 08e9448..09d382c 100644
--- a/tools/PackageSymLinker/PackageSymLinker.csproj
+++ b/tools/PackageSymLinker/PackageSymLinker.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/tools/ReleaseTool.Tests/ReleaseTool.Tests.csproj b/tools/ReleaseTool.Tests/ReleaseTool.Tests.csproj
index 022c4f4..154122a 100644
--- a/tools/ReleaseTool.Tests/ReleaseTool.Tests.csproj
+++ b/tools/ReleaseTool.Tests/ReleaseTool.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
-
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <LangVersion>8.0</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
diff --git a/tools/ReleaseTool/ReleaseTool.csproj b/tools/ReleaseTool/ReleaseTool.csproj
index 669677e..e81a0d0 100644
--- a/tools/ReleaseTool/ReleaseTool.csproj
+++ b/tools/ReleaseTool/ReleaseTool.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
     <ApplicationIcon />
     <StartupObject>ReleaseTool.EntryPoint</StartupObject>
   </PropertyGroup>
diff --git a/tools/RunUnity/RunUnity.csproj b/tools/RunUnity/RunUnity.csproj
index 4b9e899..1cf7e7f 100644
--- a/tools/RunUnity/RunUnity.csproj
+++ b/tools/RunUnity/RunUnity.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
     <StartupObject>RunUnity.Program</StartupObject>
   </PropertyGroup>
 
diff --git a/tools/UnityPaths/UnityPaths.csproj b/tools/UnityPaths/UnityPaths.csproj
index 86ea3bb..5debe8d 100644
--- a/tools/UnityPaths/UnityPaths.csproj
+++ b/tools/UnityPaths/UnityPaths.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
 </Project>