From 135f242e8001a9e83f41adc48e14ad462d425662 Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Tue, 24 Nov 2020 10:13:17 -0600
Subject: [PATCH 1/3] Darc dependency on NuGet

Enable more-automated NuGet reference updating by adding a Darc dependency.

Match the current version; update to come later.
---
 eng/Packages.props      | 8 --------
 eng/Version.Details.xml | 4 ++++
 eng/Versions.props      | 1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/eng/Packages.props b/eng/Packages.props
index 4fe2fb90fc4..61c58d1c90f 100644
--- a/eng/Packages.props
+++ b/eng/Packages.props
@@ -1,12 +1,4 @@
 <Project>
-
-  <PropertyGroup>
-      <NuGetPackageVersion>5.7.0-rtm.6710</NuGetPackageVersion>
-      <NuGetBuildTasksVersion Condition="'$(NuGetBuildTasksVersion)' == ''">$(NuGetPackageVersion)</NuGetBuildTasksVersion>
-      <NuGetCommandsVersion Condition="'$(NuGetCommandsVersion)' == ''">$(NuGetPackageVersion)</NuGetCommandsVersion>
-      <NuGetProtocolVersion Condition="'$(NuGetProtocolVersion)' == ''">$(NuGetPackageVersion)</NuGetProtocolVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Update="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
     <PackageReference Update="LargeAddressAware" Version="1.0.3" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1cd281821d6..7ac6a7eab35 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,5 +5,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>6afe5f93699b6512ee07362fa451317a2ce34f7b</Sha>
     </Dependency>
+    <Dependency Name="NuGet.Build.Tasks" Version="">
+      <Uri>https://github.com/NuGet/NuGet.Client</Uri>
+      <Sha />
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 4fb6d230d23..32a51733dc0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,6 +37,7 @@
   <!-- Toolset Dependencies -->
   <PropertyGroup>
     <DotNetCliVersion>3.1.100</DotNetCliVersion>
+    <NuGetBuildTasksVersion>5.7.0-rtm.6710</NuGetBuildTasksVersion>
   </PropertyGroup>
   <Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
     <!-- See https://github.com/dotnet/arcade/issues/3386

From 6bb3421d682caae1e1e85435aa748662e7ff2ce5 Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Tue, 24 Nov 2020 10:27:45 -0600
Subject: [PATCH 2/3] Darc dependency on Roslyn

Enable more-automated Roslyn reference updating by adding a Darc dependency.

This dependency isn't used to _build_, only to assemble our test folders, so a stale reference isn't super tragic. But should be fixed anyway.

Match the current version; update to come later.
---
 eng/Version.Details.xml | 4 ++++
 eng/Versions.props      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7ac6a7eab35..9f00340945a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,5 +9,9 @@
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
       <Sha />
     </Dependency>
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha />
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 32a51733dc0..7cdcc9439ff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,6 +37,7 @@
   <!-- Toolset Dependencies -->
   <PropertyGroup>
     <DotNetCliVersion>3.1.100</DotNetCliVersion>
+    <MicrosoftNetCompilersToolsetVersion>3.3.1-beta3-final</MicrosoftNetCompilersToolsetVersion>
     <NuGetBuildTasksVersion>5.7.0-rtm.6710</NuGetBuildTasksVersion>
   </PropertyGroup>
   <Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">

From 6ee4e83043940a0d839a71ae75cad93e00b73dd8 Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Tue, 24 Nov 2020 10:30:59 -0600
Subject: [PATCH 3/3] Match Roslyn build-task reference to compilers

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

diff --git a/eng/Packages.props b/eng/Packages.props
index 61c58d1c90f..ebd0d0e551f 100644
--- a/eng/Packages.props
+++ b/eng/Packages.props
@@ -3,7 +3,7 @@
     <PackageReference Update="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
     <PackageReference Update="LargeAddressAware" Version="1.0.3" />
     <PackageReference Update="Microsoft.Build.NuGetSdkResolver" Version="$(NuGetBuildTasksVersion)" />
-    <PackageReference Update="Microsoft.CodeAnalysis.Build.Tasks" Version="3.0.0-beta1-61516-01" />
+    <PackageReference Update="Microsoft.CodeAnalysis.Build.Tasks" Version="$(MicrosoftNetCompilersToolsetVersion)" />
     <PackageReference Update="Microsoft.DotNet.BuildTools.GenAPI" Version="2.1.0-prerelease-02404-02" />
     <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
     <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" />