From d6fc10ed36ffd416a4c830e62606070cbc32f174 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 3 Apr 2019 15:24:05 +0200
Subject: [PATCH 1/3] Enable interactive optional tools authentication

---
 eng/Tools.props | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/eng/Tools.props b/eng/Tools.props
index 64b181efa5ea..9ba372ab7fe0 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -59,14 +59,23 @@
     <RepoTool Include="dotnet-reportgenerator-globaltool" Version="$(DotNetReportGeneratorGlobalToolPackageVersion)" />
   </ItemGroup>
 
-  <!--
-    Temporarily opt-in as dotnet restore interactive doesn't seem to work.
-    https://github.com/NuGet/Home/issues/7812. Use nuget restore meanwhile.
-  -->
+  <!-- Opt-in target to restore internal tools with interactive authentication. -->
   <Target Name="InitOptionalTools"
           Condition="'$(RestoreInternalTools)' == 'true'"
           AfterTargets="Restore">
 
+    <PropertyGroup>
+      <CredentialsProviderScriptUrl Condition="'$(OS)' == 'Windows_NT'">https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1</CredentialsProviderScriptUrl>
+      <CredentialsProviderScriptUrl Condition="'$(OS)' != 'Windows_NT'">https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh</CredentialsProviderScriptUrl>
+    </PropertyGroup>
+
+    <DownloadFile SourceUrl="$(CredentialsProviderScriptUrl)" DestinationFolder="$(ArtifactsDir)">
+      <Output TaskParameter="DownloadedFile" ItemName="CredentialsProviderScriptPath" />
+    </DownloadFile>
+
+    <Exec Condition="'$(OS)' == 'Windows_NT'" Command="powershell -ExecutionPolicy ByPass -NoProfile -File &quot;%(CredentialsProviderScriptPath.Identity)&quot;" />
+    <Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod +x &quot;%(CredentialsProviderScriptPath.Identity)&quot; %26%26 &quot;%(CredentialsProviderScriptPath.Identity)&quot;" />
+
     <PropertyGroup>
       <OptionalToolDir>$([MSBuild]::NormalizeDirectory('$(RepositoryEngineeringDir)', 'common', 'internal'))</OptionalToolDir>
       <OptionalToolProjectPath>$(OptionalToolDir)Tools.csproj</OptionalToolProjectPath>

From 6b3909dedaa60c59970004aca9322d95cc0b3948 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 4 Apr 2019 14:18:54 +0200
Subject: [PATCH 2/3] Use .tools dir for script

---
 eng/Tools.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/Tools.props b/eng/Tools.props
index 9ba372ab7fe0..e319a84c2c77 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -65,11 +65,12 @@
           AfterTargets="Restore">
 
     <PropertyGroup>
+      <ToolsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.tools'))</ToolsDir>
       <CredentialsProviderScriptUrl Condition="'$(OS)' == 'Windows_NT'">https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1</CredentialsProviderScriptUrl>
       <CredentialsProviderScriptUrl Condition="'$(OS)' != 'Windows_NT'">https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh</CredentialsProviderScriptUrl>
     </PropertyGroup>
 
-    <DownloadFile SourceUrl="$(CredentialsProviderScriptUrl)" DestinationFolder="$(ArtifactsDir)">
+    <DownloadFile SourceUrl="$(CredentialsProviderScriptUrl)" DestinationFolder="$(ToolsDir)">
       <Output TaskParameter="DownloadedFile" ItemName="CredentialsProviderScriptPath" />
     </DownloadFile>
 

From 458e5210ba268cde656dc41e02c38b464df430ce Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 4 Apr 2019 14:32:57 +0200
Subject: [PATCH 3/3] Add inner tools directory CredentialsProvider

---
 eng/Tools.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Tools.props b/eng/Tools.props
index e319a84c2c77..0285180199fa 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -65,7 +65,7 @@
           AfterTargets="Restore">
 
     <PropertyGroup>
-      <ToolsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.tools'))</ToolsDir>
+      <ToolsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.tools', 'CredentialsProvider'))</ToolsDir>
       <CredentialsProviderScriptUrl Condition="'$(OS)' == 'Windows_NT'">https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1</CredentialsProviderScriptUrl>
       <CredentialsProviderScriptUrl Condition="'$(OS)' != 'Windows_NT'">https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh</CredentialsProviderScriptUrl>
     </PropertyGroup>