From ec1985f6fde09ccc0b3d6d16784fe3e415dcbf51 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Thu, 18 Mar 2021 17:02:26 +0000
Subject: [PATCH] [internal/release/5.0.2xx] Update dependencies from
 dnceng/internal/dotnet-sdk - Coherency Updates:   - NuGet.Build.Tasks: from
 5.9.0-rc.7122 to 5.9.1-rc.1 (parent: Microsoft.NET.Sdk)

 - Port dotnet-tools-internal
---
 NuGet.config                     |  1 -
 eng/Version.Details.xml          | 12 ++++++------
 eng/Versions.props               |  4 ++--
 eng/common/SetupNugetSources.ps1 |  5 +++++
 eng/common/SetupNugetSources.sh  | 14 ++++++++++++++
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9bf796464..0b235c25d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-msbuild -->
-    <add key="darc-pub-dotnet-msbuild-5e4b48a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-5e4b48a2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-msbuild -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-8470ff3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b81bdd659..1f000402d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -91,13 +91,13 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>8470ff317250d761c72f920b8ea1c0700b230eb3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21167.21">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21168.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>aff722214d21d01c1abce2d168bf9a8bb6473fe6</Sha>
+      <Sha>5742a78782052538603f91507bf5d276f51e7300</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.202-servicing.21167.21">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.202-servicing.21168.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>aff722214d21d01c1abce2d168bf9a8bb6473fe6</Sha>
+      <Sha>5742a78782052538603f91507bf5d276f51e7300</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.4-servicing.21117.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -129,9 +129,9 @@
       <Uri>https://github.com/dotnet/msbuild</Uri>
       <Sha>5e4b48a27efce55a613664b58d353ab4c8d1f6c1</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.9.0-rc.7122" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
-      <Sha>abf0ba0638070af16427cea69bd47a9945fd5d7a</Sha>
+      <Sha>fad4343fa8ba919bb8a1b86bb22310824bf14268</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index e11f48c08..9bc93242d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -55,8 +55,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.202-servicing.21167.21</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.202-servicing.21167.21</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.202-servicing.21168.6</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.202-servicing.21168.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index a0b5fc37f..a6d188f1f 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -158,4 +158,9 @@ if ($dotnet5Source -ne $null) {
     AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
 }
 
+$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
+if ($dotnetToolsSource -ne $null) {
+    AddPackageSource -Sources $sources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
+}
+
 $doc.Save($filename)
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index 2734601c1..81d7913e6 100644
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -129,6 +129,20 @@ if [ "$?" == "0" ]; then
     PackageSources+=('dotnet5-internal-transport')
 fi
 
+# Ensure dotnet-tools-internal is in the packageSources if the public dotnet-tools feed is present
+grep -i "<add key=\"dotnet-tools\"" $ConfigFile
+if [ "$?" == "0" ]; then
+    grep -i "<add key=\"dotnet-tools-internal\"" $ConfigFile
+    if [ "$?" != "0" ]; then
+        echo "Adding dotnet-tools-internal to the packageSources."
+        PackageSourcesNodeFooter="</packageSources>"
+        PackageSourceTemplate="${TB}<add key=\"dotnet-tools-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2\" />"
+
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+    fi
+    PackageSources+=('dotnet-tools-internal')
+fi
+
 # I want things split line by line
 PrevIFS=$IFS
 IFS=$'\n'