From fe6d6fa95ef84411cbc245fa92e1e219a8565778 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 19 Mar 2018 12:31:16 -0700
Subject: [PATCH] Generate Microsoft.NETCoreSdk.BundledCliTools.props

---
 build/BundledDotnetTools.props  |  6 ++--
 build/MSBuildExtensions.targets | 50 ++++++++++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/build/BundledDotnetTools.props b/build/BundledDotnetTools.props
index e64552ab00..29c483c574 100644
--- a/build/BundledDotnetTools.props
+++ b/build/BundledDotnetTools.props
@@ -1,8 +1,8 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <BundledDotnetTools Include="dotnet-dev-certs" Version="$(AspNetCoreVersion)" />
-    <BundledDotnetTools Include="dotnet-sql-cache" Version="$(AspNetCoreVersion)" />
-    <BundledDotnetTools Include="dotnet-user-secrets" Version="$(AspNetCoreVersion)" />
-    <BundledDotnetTools Include="dotnet-watch" Version="$(AspNetCoreVersion)" />
+    <BundledDotnetTools Include="dotnet-sql-cache" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.Extensions.Caching.SqlConfig.Tools" />
+    <BundledDotnetTools Include="dotnet-user-secrets" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
+    <BundledDotnetTools Include="dotnet-watch" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.DotNet.Watcher.Tools" />
   </ItemGroup>
 </Project>
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index c6ce9ae6b5..09324294ed 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -1,9 +1,11 @@
 <Project>
+  <Import Project="BundledDotnetTools.props" />
+
   <Target Name="GenerateMSBuildExtensions"
-          DependsOnTargets="GenerateBundledVersionsProps;RestoreMSBuildExtensionsPackages">
+          DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps;RestoreMSBuildExtensionsPackages">
 
     <ItemGroup>
-      
+
       <!-- The MSBuildExtensionsContent item is for the files that will be laid out in the CLI install -->
       <MSBuildExtensionsContent Include="$(GeneratedMSBuildExtensionsDirectory)/**/*" />
 
@@ -11,19 +13,19 @@
            from that package under the net461, net462, etc folders.  That is because they come from the NETStandard.Library.NETFramework
            package, and we want to insert them directly into the CLI from CoreFx instead of having to do a two-hop insertion (CoreFX -> SDK -> CLI)
            if we need to update them.
-           
+
            https://github.com/dotnet/sdk/issues/1324 has been filed to exclude these from the Microsoft.NET.Build.Extensions package when
            we generate it.
            -->
       <MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\**\*.*"
                                 Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\net*\**" />
-      
+
       <!-- Don't include .NET Framework MS.NET.Build.Extensions tasks in CLI layout -->
       <MSBuildExtensionsContent Remove="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools\net46\**" />
 
       <MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*"
                                 DeploymentSubpath="$(MSBuildExtensionsVersionSubfolder)/" />
-      
+
       <MSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*"
                                 Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
                                 DeploymentSubpath="Microsoft/Microsoft.NET.Build.Extensions/" />
@@ -68,7 +70,7 @@
     <ItemGroup>
       <ExtensionPackageToRestore Include="$(MSBuildExtensionsPackageName)" Version="$(MicrosoftNETBuildExtensionsPackageVersion)"/>
       <ExtensionPackageToRestore Include="$(NETStandardLibraryNETFrameworkPackageName)" Version="$(CLI_NETStandardLibraryNETFrameworkVersion)"/>
-      
+
       <ExtensionRestore Include="$(RepoRoot)/build/RestoreDependency.proj">
         <Properties>
           CLIBuildDll=$(CLIBuildDll);
@@ -91,7 +93,7 @@
       <BundledVersionsPropsFileName>Microsoft.NETCoreSdk.BundledVersions.props</BundledVersionsPropsFileName>
     </PropertyGroup>
 
-    <!-- 
+    <!--
       The bundled version of Microsoft.NETCore.App is determined statically from DependencyVersions.props whereas the bundled version
       of NETStandard.Library is defined by what Microsoft.NETCore.App pulls in. This digs in to the package resolution items of
       of our build against Microsoft.NETCore.App to find the correct NETStandard.Library version
@@ -152,4 +154,38 @@ Copyright (c) .NET Foundation. All rights reserved.
                       Lines="$(BundledVersionsPropsContent)"
                       Overwrite="true" />
   </Target>
+
+  <Target Name="GenerateBundledCliToolsProps">
+    <PropertyGroup>
+      <BundledBundledCliToolsPropsFileName>Microsoft.NETCoreSdk.BundledCliTools.props</BundledBundledCliToolsPropsFileName>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <BundledBundledCliToolsPropsContent>
+<![CDATA[
+<!--
+***********************************************************************************************
+$(BundledBundledCliToolsPropsFileName)
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project>
+  <ItemGroup>
+@(BundledDotnetTools->HasMetadata('ObsoletesCliTool')->'    %3CBundledDotNetCliToolReference Include="%(ObsoletesCliTool)" /%3E','%0A')
+  </ItemGroup>
+</Project>
+]]>
+    </BundledBundledCliToolsPropsContent>
+  </PropertyGroup>
+
+    <MakeDir Directories="$(GeneratedMSBuildExtensionsDirectory)" />
+    <WriteLinesToFile File="$(GeneratedMSBuildExtensionsDirectory)/$(BundledBundledCliToolsPropsFileName)"
+                      Lines="$(BundledBundledCliToolsPropsContent)"
+                      Overwrite="true" />
+  </Target>
 </Project>