From 45226bece54d959d407963ee9035695f2ba02e32 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <nwe@sitecore.net>
Date: Tue, 4 Aug 2020 06:14:17 -0400
Subject: [PATCH] added better dotnet watch fix

---
 examples/helix-basic-aspnetcore/Directory.Build.targets | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples/helix-basic-aspnetcore/Directory.Build.targets b/examples/helix-basic-aspnetcore/Directory.Build.targets
index 2a8600cb..cb7262da 100644
--- a/examples/helix-basic-aspnetcore/Directory.Build.targets
+++ b/examples/helix-basic-aspnetcore/Directory.Build.targets
@@ -4,10 +4,11 @@
       Workaround for 'dotnet watch' issue with referenced MVC projects.
       https://github.com/dotnet/aspnetcore/issues/22219
   -->
-  <Target Name="RazorWatch" BeforeTargets="_CoreCollectWatchItems" Condition="'$(DotNetWatchBuild)' == 'true'">
+  <Target Name="FixDotnetWatch" AfterTargets="_CoreCollectWatchItems">
     <ItemGroup>
-      <RazorWatch Include="**\*.cshtml" />
-      <Watch Include="%(RazorWatch.FullPath)" />
+      <_WatchRelativePath Include="@(Watch)" Condition="'%(Identity)' != '%(Watch.FullPath)'" />
+      <Watch Remove="@(_WatchRelativePath)" />
+      <Watch Include="%(_WatchRelativePath.FullPath)" />
     </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file