diff --git a/build/dependencies.props b/build/dependencies.props
index 4535ed08a7ff..e663becf837f 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -101,7 +101,7 @@
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
     <CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
     <DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>2.1.0-prerelease-02430-04</DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
+    <DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
     <DevDependency_AzureStorageBlobsPackageVersion>12.10.0</DevDependency_AzureStorageBlobsPackageVersion>
     <FSharpCorePackageVersion>4.2.3</FSharpCorePackageVersion>
     <GoogleProtobufPackageVersion>3.15.0</GoogleProtobufPackageVersion>
@@ -128,7 +128,7 @@
     <MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
     <MicrosoftDotNetArchivePackageVersion>0.2.0-beta-63019-01</MicrosoftDotNetArchivePackageVersion>
     <MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-1-003177</MicrosoftDotNetProjectModelPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.7.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
diff --git a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index 2cbc6382f1a7..25ac693c81b1 100644
--- a/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <TestGroupName>RazorTests</TestGroupName>
diff --git a/src/Razor/Razor.Tasks/src/DotnetToolTask.cs b/src/Razor/Razor.Tasks/src/DotnetToolTask.cs
index d0ec48f2b274..9d53d53e1e12 100644
--- a/src/Razor/Razor.Tasks/src/DotnetToolTask.cs
+++ b/src/Razor/Razor.Tasks/src/DotnetToolTask.cs
@@ -124,7 +124,7 @@ protected virtual bool TryExecuteOnServer(
             string commandLineCommands,
             out int result)
         {
-#if !NET46
+#if !NET46 && !NET462
             if (!SuppressCurrentUserOnlyPipeOptions && !Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly))
             {
                 // For security reasons, we don't want to spin up a server that doesn't
diff --git a/src/Razor/Razor.Tools/src/Client.cs b/src/Razor/Razor.Tools/src/Client.cs
index 9378906d4538..5b70e33d438e 100644
--- a/src/Razor/Razor.Tools/src/Client.cs
+++ b/src/Razor/Razor.Tools/src/Client.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.IO.Pipes;
-#if NET46
+#if NET46 || NET462
 using System.Security.AccessControl;
 using System.Security.Principal;
 #endif
@@ -71,7 +71,7 @@ public static async Task<Client> ConnectAsync(string pipeName, TimeSpan? timeout
                 ServerLogger.Log("Named pipe '{0}' connected", pipeName);
                 cancellationToken.ThrowIfCancellationRequested();
 
-#if NET46
+#if NET46 || NET462
                 // Verify that we own the pipe.
                 if (!CheckPipeConnectionOwnership(stream))
                 {
@@ -89,7 +89,7 @@ public static async Task<Client> ConnectAsync(string pipeName, TimeSpan? timeout
             }
         }
 
-#if NET46
+#if NET46 || NET462
         /// <summary>
         /// Check to ensure that the named pipe server we connected to is owned by the same
         /// user.
diff --git a/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
index f4894d2d7d45..fbf48fa7bfe3 100644
--- a/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
+++ b/src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
index b07342e21ae2..2e65968b0c52 100644
--- a/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
+++ b/src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -8,7 +8,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-#if NET46
+#if NET46 || NET462
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #else
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
     [IntializeTestFile]
     public abstract class IntegrationTestBase
     {
-#if !NET46
+#if !NET46 && !NET462
         private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
 #endif
 
@@ -44,7 +44,7 @@ protected IntegrationTestBase()
         // Used by the test framework to set the 'base' name for test files.
         public static string FileName
         {
-#if NET46
+#if NET46 || NET462
             get
             {
                 var handle = (ObjectHandle)CallContext.LogicalGetData("IntegrationTestBase_FileName");
diff --git a/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index d03c8d0d4aeb..4baa5d8f62f9 100644
--- a/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -4,7 +4,7 @@
     <!-- To generate baselines, run tests with /p:GenerateBaselines=true -->
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <IsProjectReferenceProvider>true</IsProjectReferenceProvider>
   </PropertyGroup>