diff --git a/samples/ChatSample/ChatSample.csproj b/samples/ChatSample/ChatSample.csproj
index a2656660e3..182d852710 100644
--- a/samples/ChatSample/ChatSample.csproj
+++ b/samples/ChatSample/ChatSample.csproj
@@ -41,8 +41,14 @@
 
   <Target Name="BuildTSClient" BeforeTargets="BeforeBuild">
     <Exec Command="dotnet bundle" />
-    <Exec Command="npm install" />
-    <Exec Command="npm run gulp -- --gulpfile $(MSBuildProjectDirectory)/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir $(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/" />
+    <PropertyGroup>
+      <SignalRClientDistPath>..\..\dist\browser\signalr-client.js</SignalRClientDistPath>
+      <SignalRClientTargetFolder>$(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/</SignalRClientTargetFolder>
+      <SignalRClientTargetPath>$(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/signalr-client.js</SignalRClientTargetPath>
+    </PropertyGroup>
+    <Copy Condition="Exists('$(SignalRClientDistPath)')" SourceFiles="$(SignalRClientDistPath)" DestinationFolder="$(SignalRClientTargetFolder)"/>
+    <Exec Condition="!Exists('$(SignalRClientDistPath)')" Command="npm install" />
+    <Exec Condition="!Exists('$(SignalRClientDistPath)')" Command="npm run gulp -- --gulpfile $(MSBuildProjectDirectory)/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir $(SignalRClientTargetFolder)" />
   </Target>
 
   <Target Name="BowerInstall" BeforeTargets="PrepareForPublish">
diff --git a/samples/SocketsSample/SocketsSample.csproj b/samples/SocketsSample/SocketsSample.csproj
index a94772835a..db06efd299 100644
--- a/samples/SocketsSample/SocketsSample.csproj
+++ b/samples/SocketsSample/SocketsSample.csproj
@@ -25,9 +25,15 @@
     <PackageReference Include="Google.Protobuf" Version="3.1.0" />
   </ItemGroup>
 
-  <Target Name="BuildTSClient" BeforeTargets="BeforeBuild" Condition=" '$(TargetFramework)' == '' ">
-    <Exec Command="npm install" />
-    <Exec Command="npm run gulp -- --gulpfile $(MSBuildProjectDirectory)/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir $(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/" />
+  <Target Name="BuildTSClient" BeforeTargets="BeforeBuild">
+    <PropertyGroup>
+      <SignalRClientDistPath>..\..\dist\browser\signalr-client.js</SignalRClientDistPath>
+      <SignalRClientTargetFolder>$(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/</SignalRClientTargetFolder>
+      <SignalRClientTargetPath>$(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/signalr-client.js</SignalRClientTargetPath>
+    </PropertyGroup>
+    <Copy Condition="Exists('$(SignalRClientDistPath)')" SourceFiles="$(SignalRClientDistPath)" DestinationFolder="$(SignalRClientTargetFolder)"/>
+    <Exec Condition="!Exists('$(SignalRClientDistPath)')" Command="npm install" />
+    <Exec Condition="!Exists('$(SignalRClientDistPath)')" Command="npm run gulp -- --gulpfile $(MSBuildProjectDirectory)/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir $(SignalRClientTargetFolder)" />
   </Target>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj b/test/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
index 074d299b24..3d44472020 100644
--- a/test/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
+++ b/test/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
@@ -20,10 +20,26 @@
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.2.0-*" />
   </ItemGroup>
 
-  <Target Name="BuildTSClient" BeforeTargets="BeforeBuild">
+  <Target Name="NpmInstall">
     <Exec Command="npm install" />
-    <Exec Command="npm run gulp -- --gulpfile $(MSBuildProjectDirectory)/gulpfile.js copy-jasmine" />
-    <Exec Command="npm run gulp -- --gulpfile $(MSBuildProjectDirectory)/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir $(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/" />
+  </Target>
+
+  <Target Name="CopyJasmine" BeforeTargets="BeforeBuild" DependsOnTargets="NpmInstall">
+      <ItemGroup>
+        <JasmineFiles Include="../../node_modules/jasmine-core/lib/jasmine-core/*.js" />
+        <JasmineFiles Include="../../node_modules/jasmine-core/lib/jasmine-core/*.css" />
+      </ItemGroup>
+      <Copy SourceFiles="@(JasmineFiles)" DestinationFolder="$(MSBuildProjectDirectory)/wwwroot/lib/jasmine" />
+  </Target>
+
+  <Target Name="BuildTSClient" BeforeTargets="BeforeBuild" DependsOnTargets="NpmInstall">
+    <PropertyGroup>
+      <SignalRClientDistPath>..\..\dist\browser\signalr-client.js</SignalRClientDistPath>
+      <SignalRClientTargetFolder>$(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/</SignalRClientTargetFolder>
+      <SignalRClientTargetPath>$(MSBuildProjectDirectory)/wwwroot/lib/signalr-client/signalr-client.js</SignalRClientTargetPath>
+    </PropertyGroup>
+    <Copy Condition="Exists('$(SignalRClientDistPath)')" SourceFiles="$(SignalRClientDistPath)" DestinationFolder="$(SignalRClientTargetFolder)"/>
+    <Exec Condition="!Exists('$(SignalRClientDistPath)')" Command="npm run gulp -- --gulpfile $(MSBuildProjectDirectory)/../../src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js bundle-client --bundleOutDir $(SignalRClientTargetFolder)" />
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/gulpfile.js b/test/Microsoft.AspNetCore.SignalR.Test.Server/gulpfile.js
deleted file mode 100644
index 84cec70921..0000000000
--- a/test/Microsoft.AspNetCore.SignalR.Test.Server/gulpfile.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const gulp = require('gulp');
-
-gulp.task('copy-jasmine', () => {
-  gulp.src(['../../node_modules/jasmine-core/lib/jasmine-core/*.js', '../../node_modules/jasmine-core/lib/jasmine-core/*.css'])
-    .pipe(gulp.dest('./wwwroot/lib/jasmine/'));
-});
\ No newline at end of file