From e71eb7a1fc535b438007286c840d7cecc139d13b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 13:29:15 +0100
Subject: [PATCH] [main] Update dependencies from dotnet/roslyn,
 nuget/nuget.client (#9642)

* Update dependencies from https://github.com/dotnet/roslyn build 20240113.2

Microsoft.Net.Compilers.Toolset
 From Version 4.9.0-3.23629.3 -> To Version 4.10.0-1.24063.2

* Update dependencies from https://github.com/dotnet/roslyn build 20240119.13

Microsoft.Net.Compilers.Toolset
 From Version 4.9.0-3.23629.3 -> To Version 4.10.0-1.24069.13

* Update dependencies from https://github.com/nuget/nuget.client build 6.10.0.9

NuGet.Build.Tasks
 From Version 6.9.0-preview.1.70 -> To Version 6.10.0-preview.1.9

* Update dependencies from https://github.com/dotnet/roslyn build 20240126.10

Microsoft.Net.Compilers.Toolset
 From Version 4.9.0-3.23629.3 -> To Version 4.10.0-1.24076.10

* Update dependencies from https://github.com/nuget/nuget.client build 6.10.0.12

NuGet.Build.Tasks
 From Version 6.9.0-preview.1.70 -> To Version 6.10.0-preview.1.12

* Update dependencies from https://github.com/dotnet/roslyn build 20240204.1

Microsoft.Net.Compilers.Toolset
 From Version 4.9.0-3.23629.3 -> To Version 4.10.0-2.24104.1

* Update dependencies from https://github.com/nuget/nuget.client build 6.10.0.18

NuGet.Build.Tasks
 From Version 6.9.0-preview.1.70 -> To Version 6.10.0-preview.1.18

* Update Directory.Build.targets

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 Directory.Build.targets | 9 +++++++++
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index b57a232300f..3c3e5820070 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -37,4 +37,13 @@
     <RemoveDir Directories="$(_PackageFolderInGlobalPackages)"
                Condition="Exists('$(_PackageFolderInGlobalPackages)')" />
   </Target>
+
+  <!-- Make APICompat use roslyn from the toolset SDK instead of from the toolset package. This avoids unification issues on desktop msbuild.
+       TODO: Remove when a 8.0.200 or 9.0 SDK is consumed. -->
+  <Target Name="FixAPICompatWorkAroundRoslynMove" AfterTargets="CollectApiCompatInputs">
+    <PropertyGroup>
+      <RoslynAssembliesPath>$(RoslynTargetsPath)</RoslynAssembliesPath>
+    </PropertyGroup>
+  </Target>
+
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c15b7991810..4622577c8fd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -87,13 +87,13 @@
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.70">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.1.18">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>6a82332d4936d893fb1e22fd86f2e3cb4d54c471</Sha>
+      <Sha>f207cbb3530350f785d1b04014e15563cc9b5e03</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23629.3">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-2.24104.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ebb588725e707db23d8723b633258e7eb918277b</Sha>
+      <Sha>d9272a3f01928b1c3614a942bdbbfeb0fb17a43b</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24060.4">
diff --git a/eng/Versions.props b/eng/Versions.props
index 9f92111ad29..8b628f57553 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,8 +53,8 @@
     <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24060.4</MicrosoftDotNetXUnitExtensionsVersion>
     <MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
-    <MicrosoftNetCompilersToolsetVersion>4.9.0-3.23629.3</MicrosoftNetCompilersToolsetVersion>
-    <NuGetBuildTasksVersion>6.9.0-preview.1.70</NuGetBuildTasksVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.10.0-2.24104.1</MicrosoftNetCompilersToolsetVersion>
+    <NuGetBuildTasksVersion>6.10.0-preview.1.18</NuGetBuildTasksVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
   </PropertyGroup>
   <Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">