diff --git a/appveyor.yml b/appveyor.yml
index 1822c72..4b76b85 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ branches:
 skip_tags: true
 matrix:
   fast_finish: true 
-image: Visual Studio 2019
+image: Visual Studio 2022
 environment:
   azure-relay-dotnet/ClientSecret:
     secure: /8H7C81iNS+gVi7LhJCEOPUlNaa30y4KcY4nw/g2C4HGxOv6SrcroyDvMnqD+5GN
@@ -15,7 +15,7 @@ environment:
   azure-relay-dotnet/AppId:
     secure: c+H140oRJfHtmFHZxSRLWocv5AU0q33X7kgMcTcXxhJvtVhk2WAk1dRQkSN+SyoA
   matrix:
-    - DotNetRunTime: netcoreapp2.1
+    - DotNetRunTime: net8.0
       azure-relay-dotnet/CodeCovSecret:
         secure: NAlk4Em1NARlJqd8aan0jD8SW8iE86quYwiBi2ngs5Dfl0gYuwDuZaSkpoFFf2Cz
 skip_commits:
diff --git a/build/build.ps1 b/build/build.ps1
index 390e84d..58d50d5 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -5,7 +5,7 @@ $configuration = if ($CONFIGURATION -ne $null) { $CONFIGURATION  } else { 'Debug
 $platform = if ($PLATFORM -ne $null) { $PLATFORM } else { 'Any CPU' }
 $projectFolder = if ($ENV:APPVEYOR_BUILD_FOLDER -ne $null) { "$ENV:APPVEYOR_BUILD_FOLDER" } else { $(Get-Location).path }
 $buildFolder = $projectFolder + '\build\'
-$runtime = if ($ENV:DotNetRunTime -ne $null) { $ENV:DotNetRunTime } else { 'netcoreapp2.1' }
+$runtime = if ($ENV:DotNetRunTime -ne $null) { $ENV:DotNetRunTime } else { 'net8.0' }
 $artifactsFolder = $buildFolder + 'artifacts\'
 $appProject = $projectFolder + '\src\Microsoft.Azure.Relay\Microsoft.Azure.Relay.csproj'
 $testProject = $projectFolder + '\test\Microsoft.Azure.Relay.UnitTests\Microsoft.Azure.Relay.UnitTests.csproj'
diff --git a/global.json b/global.json
index 6f20a8e..7d3b56c 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,6 @@
 {
     "sdk": {
-        "version": "5.1"
+        "version": "8.0.100",
+        "rollForward": "latestFeature"
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.Azure.Relay/Microsoft.Azure.Relay.csproj b/src/Microsoft.Azure.Relay/Microsoft.Azure.Relay.csproj
index 564d638..7670a85 100644
--- a/src/Microsoft.Azure.Relay/Microsoft.Azure.Relay.csproj
+++ b/src/Microsoft.Azure.Relay/Microsoft.Azure.Relay.csproj
@@ -7,7 +7,7 @@
     <Authors>Microsoft</Authors>
     <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <!-- .NET Framework specific -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Compile Remove="WebSockets\**\*.cs" />
   </ItemGroup>
   
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index ef54338..b2894c7 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -2,10 +2,10 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
+    <DeveloperBuildTestTfms>net8.0</DeveloperBuildTestTfms>
     <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
     <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms)</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
+    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net462</StandardTestTfms>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.Azure.Relay.UnitTests/Microsoft.Azure.Relay.UnitTests.csproj b/test/Microsoft.Azure.Relay.UnitTests/Microsoft.Azure.Relay.UnitTests.csproj
index 7212434..be97e0d 100644
--- a/test/Microsoft.Azure.Relay.UnitTests/Microsoft.Azure.Relay.UnitTests.csproj
+++ b/test/Microsoft.Azure.Relay.UnitTests/Microsoft.Azure.Relay.UnitTests.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <TestTfmsInParallel>false</TestTfmsInParallel>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file