From 1cc289cf1dbdc67d1bff112f8c349c5dfba8d9d9 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 13 Nov 2017 08:49:25 -0800
Subject: [PATCH] Update the dotnet-watch samples to 2.0.0

[ci skip]
---
 samples/dotnet-watch/Directory.Build.props                  | 2 ++
 samples/dotnet-watch/Directory.Build.targets                | 2 ++
 .../dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj   | 2 +-
 .../WatchJavascriptFiles/WatchJavascriptFiles.csproj        | 4 ++--
 .../WatchMultipleProjects/{watch.proj => watch.csproj}      | 6 +++---
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 samples/dotnet-watch/Directory.Build.props
 create mode 100644 samples/dotnet-watch/Directory.Build.targets
 rename samples/dotnet-watch/WatchMultipleProjects/{watch.proj => watch.csproj} (80%)

diff --git a/samples/dotnet-watch/Directory.Build.props b/samples/dotnet-watch/Directory.Build.props
new file mode 100644
index 0000000000..76c9003a6b
--- /dev/null
+++ b/samples/dotnet-watch/Directory.Build.props
@@ -0,0 +1,2 @@
+<!-- Intentionally empty to isolate the samples. -->
+<Project />
diff --git a/samples/dotnet-watch/Directory.Build.targets b/samples/dotnet-watch/Directory.Build.targets
new file mode 100644
index 0000000000..76c9003a6b
--- /dev/null
+++ b/samples/dotnet-watch/Directory.Build.targets
@@ -0,0 +1,2 @@
+<!-- Intentionally empty to isolate the samples. -->
+<Project />
diff --git a/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj b/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
index 1a5ab09de4..39dea69c5f 100644
--- a/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
+++ b/samples/dotnet-watch/LaunchAnyCommand/LaunchAnyCommand.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
 
     <Watch Include="say-hello.js" />
   </ItemGroup>
diff --git a/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj b/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
index 3b2818d532..f45eb26ccf 100755
--- a/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
+++ b/samples/dotnet-watch/WatchJavascriptFiles/WatchJavascriptFiles.csproj
@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/dotnet-watch/WatchMultipleProjects/watch.proj b/samples/dotnet-watch/WatchMultipleProjects/watch.csproj
similarity index 80%
rename from samples/dotnet-watch/WatchMultipleProjects/watch.proj
rename to samples/dotnet-watch/WatchMultipleProjects/watch.csproj
index c66bcda4c7..d34686cbbc 100644
--- a/samples/dotnet-watch/WatchMultipleProjects/watch.proj
+++ b/samples/dotnet-watch/WatchMultipleProjects/watch.csproj
@@ -1,10 +1,11 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
 
     <ProjectReference Include="Web\Web.csproj" />
     <ProjectReference Include="Test\Test.csproj" />
@@ -15,5 +16,4 @@
     <Exec Command="dotnet run" WorkingDirectory="Web/" />
   </Target>
 
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets"/>
 </Project>