diff --git a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
index 90a28bdfcf..5917399133 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
+++ b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
@@ -29,9 +29,10 @@
     
     <TaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' ">netstandard2.0</TaskFolder>
     <TaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net46</TaskFolder>
-    <TaskAssembly>$(_RazorMSBuildRoot)\tasks\$(TaskFolder)\Microsoft.AspNetCore.Razor.Tasks.dll</TaskAssembly>
+    
+    <_RazorTaskAssembly Condition="'$(_RazorTaskAssembly)'==''">$(_RazorMSBuildRoot)\tasks\$(TaskFolder)\Microsoft.AspNetCore.Razor.Tasks.dll</_RazorTaskAssembly>
   </PropertyGroup>
 
-  <UsingTask TaskName="Microsoft.AspNetCore.Razor.Tasks.RazorGenerate" AssemblyFile="$(TaskAssembly)" />
-  <UsingTask TaskName="Microsoft.AspNetCore.Razor.Tasks.RazorTagHelper" AssemblyFile="$(TaskAssembly)" />
+  <UsingTask TaskName="Microsoft.AspNetCore.Razor.Tasks.RazorGenerate" AssemblyFile="$(_RazorTaskAssembly)" />
+  <UsingTask TaskName="Microsoft.AspNetCore.Razor.Tasks.RazorTagHelper" AssemblyFile="$(_RazorTaskAssembly)" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets
index e646179b00..a0c47f9416 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets
+++ b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets
@@ -114,6 +114,7 @@
       Debug="$(_RazorDebugTagHelperTask)"
       DebugTool="$(_RazorDebugTagHelperTool)"
       ToolAssembly="$(_RazorTagHelperToolAssembly)"
+      ServerAssembly="$(_RazorBuildServerAssembly)"
       Assemblies="@(RazorReferencePath)"
       TagHelperManifest="$(_RazorTagHelperOutputCache)">
       <Output
diff --git a/src/Microsoft.AspNetCore.Razor.Tasks/DotnetToolTask.cs b/src/Microsoft.AspNetCore.Razor.Tasks/DotnetToolTask.cs
index e6cfc97462..5e13753101 100644
--- a/src/Microsoft.AspNetCore.Razor.Tasks/DotnetToolTask.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tasks/DotnetToolTask.cs
@@ -62,6 +62,11 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 }
             }
 
+            if (TryExecuteOnServer(out var result))
+            {
+                return result;
+            }
+
             return base.Execute();
         }
 
@@ -76,5 +81,11 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 base.LogToolCommand(message);
             }
         }
+
+        protected virtual bool TryExecuteOnServer(out bool result)
+        {
+            result = false;
+            return false;
+        }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Razor.Tasks/RazorTagHelper.cs b/src/Microsoft.AspNetCore.Razor.Tasks/RazorTagHelper.cs
index b8a49a0ca9..100741e574 100644
--- a/src/Microsoft.AspNetCore.Razor.Tasks/RazorTagHelper.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tasks/RazorTagHelper.cs
@@ -16,7 +16,9 @@ namespace Microsoft.AspNetCore.Razor.Tasks
         [Output]
         [Required]
         public string TagHelperManifest { get; set; }
-        
+
+        public string ServerAssembly { get; set; }
+
         protected override bool SkipTaskExecution()
         {
             if (Assemblies.Length == 0)
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/Application.cs b/src/Microsoft.AspNetCore.Razor.Tools/Application.cs
index cbf995a3f2..388ad0a81f 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/Application.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/Application.cs
@@ -8,7 +8,7 @@ using System.Reflection;
 using System.Threading;
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal class Application : CommandLineApplication
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/Client.cs b/src/Microsoft.AspNetCore.Razor.Tools/Client.cs
index 12dfcd6fd6..b542d653ca 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/Client.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/Client.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CommandLine;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal abstract class Client : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/CommandBase.cs b/src/Microsoft.AspNetCore.Razor.Tools/CommandBase.cs
index f1a0fef429..a25a382212 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/CommandBase.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/CommandBase.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal abstract class CommandBase : CommandLineApplication
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/CompilerHost.cs b/src/Microsoft.AspNetCore.Razor.Tools/CompilerHost.cs
index 3e6a7a5163..7fe17169cf 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/CompilerHost.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/CompilerHost.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CommandLine;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal abstract class CompilerHost
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/Connection.cs b/src/Microsoft.AspNetCore.Razor.Tools/Connection.cs
index a1641774ee..9acf1589c9 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/Connection.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/Connection.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal abstract class Connection : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/ConnectionHost.cs b/src/Microsoft.AspNetCore.Razor.Tools/ConnectionHost.cs
index 5bcc2e1c50..e08073f80d 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/ConnectionHost.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/ConnectionHost.cs
@@ -7,7 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CommandLine;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     // Heavily influenced by:
     // https://github.com/dotnet/roslyn/blob/14aed138a01c448143b9acf0fe77a662e3dfe2f4/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs#L17
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/ConnectionResult.cs b/src/Microsoft.AspNetCore.Razor.Tools/ConnectionResult.cs
index 1f187fba4e..6c20725617 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/ConnectionResult.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/ConnectionResult.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal struct ConnectionResult
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/DebugMode.cs b/src/Microsoft.AspNetCore.Razor.Tools/DebugMode.cs
index 38799a9791..7d9815cd5f 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/DebugMode.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/DebugMode.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal static class DebugMode
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs b/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs
index 319d06abfa..b0fc7297d5 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs
@@ -16,7 +16,7 @@ using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.VisualStudio.LanguageServices.Razor;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal class DiscoverCommand : CommandBase
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/EventBus.cs b/src/Microsoft.AspNetCore.Razor.Tools/EventBus.cs
index 964414be9b..958a637deb 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/EventBus.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/EventBus.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal abstract class EventBus
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/Memory.cs b/src/Microsoft.AspNetCore.Razor.Tools/Memory.cs
index aee865fa51..e0187ed633 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/Memory.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/Memory.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal static class Memory
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/MutexName.cs b/src/Microsoft.AspNetCore.Razor.Tools/MutexName.cs
index 174dfbf433..367cf3b081 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/MutexName.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/MutexName.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal static class MutexName
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/PipeName.cs b/src/Microsoft.AspNetCore.Razor.Tools/PipeName.cs
index 9007d89cd9..d66df5b7ed 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/PipeName.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/PipeName.cs
@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal static class PipeName
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/Program.cs b/src/Microsoft.AspNetCore.Razor.Tools/Program.cs
index 6dfb12d1ea..8a23dd91b9 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/Program.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/Program.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal static class Program
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/RequestDispatcher.cs b/src/Microsoft.AspNetCore.Razor.Tools/RequestDispatcher.cs
index 5b69d2caed..fb3d732be7 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/RequestDispatcher.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/RequestDispatcher.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CommandLine;
 using Microsoft.CodeAnalysis.CompilerServer;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     // Heavily influenced by:
     // https://github.com/dotnet/roslyn/blob/14aed138a01c448143b9acf0fe77a662e3dfe2f4/src/Compilers/Server/ServerShared/ServerDispatcher.cs#L15
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/ServerCommand.cs b/src/Microsoft.AspNetCore.Razor.Tools/ServerCommand.cs
index fb3cfb1fcc..3e8f6e3602 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/ServerCommand.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/ServerCommand.cs
@@ -5,7 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal class ServerCommand : CommandBase
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Tools/ShutdownCommand.cs b/src/Microsoft.AspNetCore.Razor.Tools/ShutdownCommand.cs
index 96313b7ed9..114795331e 100644
--- a/src/Microsoft.AspNetCore.Razor.Tools/ShutdownCommand.cs
+++ b/src/Microsoft.AspNetCore.Razor.Tools/ShutdownCommand.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CommandLine;
 using Microsoft.Extensions.CommandLineUtils;
 
-namespace Microsoft.AspNetCore.Razor.TagHelperTool
+namespace Microsoft.AspNetCore.Razor.Tools
 {
     internal class ShutdownCommand : CommandBase
     {