From 6f7c188a76a81fee22f77823b71db970509994c4 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Wed, 4 Apr 2018 12:26:51 +0100
Subject: [PATCH] Revert the attempt to share signal file path between MSBuild
 and VS extension code, because it doesn't get populated at the right time

---
 .../targets/Blazor.MonoRuntime.targets             | 14 ++++----------
 .../LiveReloadBuildWatcher.cs                      | 14 +++++++++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
index 24112bb324..66003529d5 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
+++ b/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
@@ -59,16 +59,10 @@
   -->
   <Target Name="_BlazorIssueLiveReloadNotification"
           AfterTargets="Build"
-          Condition="'$(UseBlazorLiveReloading)'=='true' AND '$(_BlazorDidCopyFilesToOutputDirectory)'=='true'">
-    <PropertyGroup>
-      <_BlazorBuildCompletedSignalFullPath>$(ProjectDir)$(OutputPath)$(BlazorBuildCompletedSignalPath)</_BlazorBuildCompletedSignalFullPath>
-    </PropertyGroup>
-    <!--
-      If this is a command-line build, touch the signal file to trigger a reload.
-      If it's a VS build, then the VS extension will write the signal file instead.
-    -->
-    <WriteLinesToFile Condition="'$(BuildingInsideVisualStudio)'!='true'" File="$(_BlazorBuildCompletedSignalFullPath)" Lines="_" />
-    <Delete Condition="'$(BuildingInsideVisualStudio)'!='true'" Files="$(_BlazorBuildCompletedSignalFullPath)" />
+          Condition="'$(UseBlazorLiveReloading)'=='true' AND '$(_BlazorDidCopyFilesToOutputDirectory)'=='true' AND '$(BuildingInsideVisualStudio)'!='true'">
+    <!-- Touch the signal file to trigger a reload -->
+    <WriteLinesToFile File="$(ProjectDir)$(OutputPath)$(BlazorBuildCompletedSignalPath)" Lines="_" />
+    <Delete Files="$(ProjectDir)$(OutputPath)$(BlazorBuildCompletedSignalPath)" />
   </Target>
 
   <!-- Preparing blazor files for output:
diff --git a/tooling/Microsoft.VisualStudio.BlazorExtension/LiveReloadBuildWatcher.cs b/tooling/Microsoft.VisualStudio.BlazorExtension/LiveReloadBuildWatcher.cs
index 06ab0fa9f3..eff9168477 100644
--- a/tooling/Microsoft.VisualStudio.BlazorExtension/LiveReloadBuildWatcher.cs
+++ b/tooling/Microsoft.VisualStudio.BlazorExtension/LiveReloadBuildWatcher.cs
@@ -94,10 +94,18 @@ namespace Microsoft.VisualStudio.BlazorExtension
                         var project = await access.GetProjectAsync(configuredProject);
 
                         // Now we can evaluate MSBuild properties
-                        var signalFileFullPath = project.GetPropertyValue("_BlazorBuildCompletedSignalFullPath");
-                        if (!string.IsNullOrEmpty(signalFileFullPath))
+                        var projectDir = project.GetPropertyValue("ProjectDir");
+                        var outputPath = project.GetPropertyValue("OutputPath");
+                        var signalFilePath = project.GetPropertyValue("BlazorBuildCompletedSignalPath");
+                        if (!string.IsNullOrEmpty(projectDir)
+                            && !string.IsNullOrEmpty(outputPath)
+                            && !string.IsNullOrEmpty(signalFilePath))
                         {
-                            _signalFilePathsToNotify.Add(signalFileFullPath);
+                            var fullPath = Path.Combine(
+                                projectDir,
+                                outputPath,
+                                signalFilePath);
+                            _signalFilePathsToNotify.Add(fullPath);
                         }
                     }
                 });