From 4d9f769e554b52f651a8822f1696d7a8803f79d1 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Fri, 7 Apr 2023 10:54:09 -0500
Subject: [PATCH 1/2] Add NuGet to dependency flow

---
 eng/Package.props             | 6 +++---
 eng/Version.Details.xml       | 5 +++++
 eng/Versions.props            | 2 ++
 eng/dependabot/Packages.props | 3 ---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/eng/Package.props b/eng/Package.props
index 85f63c6f07b..ea99f5dfdc5 100644
--- a/eng/Package.props
+++ b/eng/Package.props
@@ -14,9 +14,6 @@
     <PackageReference Update="Microsoft.Extensions.Logging" Condition="'$(MicrosoftExtensionsLoggingVersion)' != ''" Version="$(MicrosoftExtensionsLoggingVersion)" />
     <PackageReference Update="Microsoft.Extensions.Logging.Console" Condition="'$(MicrosoftExtensionsLoggingConsoleVersion)' != ''" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Condition="'$(MicrosoftExtensionsLoggingAbstractionsVersion)' != ''" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
-    <PackageReference Update="NuGet.Configuration" Condition="'$(NuGetConfigurationVersion)' != ''" Version="$(NuGetConfigurationVersion)" />
-    <PackageReference Update="NuGet.Credentials" Condition="'$(NuGetCredentialsVersion)' != ''" Version="$(NuGetCredentialsVersion)" />
-    <PackageReference Update="NuGet.Protocol" Condition="'$(NuGetProtocolVersion)' != ''" Version="$(NuGetProtocolVersion)" />
 
     <PackageReference Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Condition="'$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)' != ''" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" />
     <PackageReference Update="StyleCop.Analyzers" Condition="'$(StyleCopAnalyzersVersion)' != ''" Version="$(StyleCopAnalyzersVersion)" />
@@ -31,6 +28,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Update="NuGet.Configuration" Version="$(NuGetCredentialsPackageVersion)" />
+    <PackageReference Update="NuGet.Credentials" Version="$(NuGetCredentialsPackageVersion)" />
+    <PackageReference Update="NuGet.Protocol" Version="$(NuGetCredentialsPackageVersion)" />
     <PackageReference Update="System.CommandLine" Version="$(SystemCommandLinePackageVersion)" />
     <!--Analyzer dependencies-->
     <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c7c93cfef99..2fc0754d5c6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -23,6 +23,11 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>42c58533cdf478b15120542be76f7cbaacaab024</Sha>
     </Dependency>
+    <Dependency Name="NuGet.Credentials" Version="6.6.0-preview.3.61">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>0fa557836fa35aee7d60776ef0c88176dbcd22ac</Sha>
+      <SourceBuild RepoName="nuget-client" ManagedOnly="true" />
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23205.4">
diff --git a/eng/Versions.props b/eng/Versions.props
index fc6ce71eff2..fd0133b6f7a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,5 +20,7 @@
     <!-- Dependencies from https://github.com/dotnet/runtime -->
     <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.3.23170.1</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.3.23170.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <!-- Dependencies from https://github.com/nuget/nuget.client -->
+    <NuGetCredentialsPackageVersion>6.6.0-preview.3.61</NuGetCredentialsPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props
index 4e7c151cf2f..2eac6c19158 100644
--- a/eng/dependabot/Packages.props
+++ b/eng/dependabot/Packages.props
@@ -12,9 +12,6 @@
     <PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Update="NuGet.Configuration" Version="6.5.0" />
-    <PackageReference Update="NuGet.Credentials" Version="6.5.0" />
-    <PackageReference Update="NuGet.Protocol" Version="6.5.0" />
 
     <!--Analyzers-->
     <PackageReference Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />

From a522b42c3a30bcdf4c74ce0588fc306b46c76867 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Fri, 7 Apr 2023 14:00:59 -0500
Subject: [PATCH 2/2] Remove SourceBuild config due to lack of intermediates

---
 eng/Version.Details.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2fc0754d5c6..298bce11867 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -26,7 +26,6 @@
     <Dependency Name="NuGet.Credentials" Version="6.6.0-preview.3.61">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>0fa557836fa35aee7d60776ef0c88176dbcd22ac</Sha>
-      <SourceBuild RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>