From 7cf0ac8f79168b107a5c8f6d22dbff6ebeba22bd Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Wed, 7 Jun 2023 16:45:23 -0500
Subject: [PATCH 1/2] Revert "Turn off static graph restore. (#8498)"

This reverts commit 7c4d75dca8af19f088d507158440cbe8127d436f.
---
 eng/Build.props | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eng/Build.props b/eng/Build.props
index 92315cd00a..f2afe80641 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -2,13 +2,9 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
 <Project>
 
-<!-- Commented out as a temporary fix for the msbuild CI.
-Waiting for https://github.com/NuGet/NuGet.Client/pull/5010 fix to flow to CI machines. -->
-<!--
   <PropertyGroup>
     <RestoreUseStaticGraphEvaluation Condition="'$(DotNetBuildFromSource)' != 'true'">true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
--->
 
   <ItemGroup>
 	<!-- Remove all sln files globbed by arcade so far and add only MSBuild.sln to the build.

From 836053e33f2a83ef1d35094cc6d83fe9c9f2fafe Mon Sep 17 00:00:00 2001
From: Gang Wang <v-gaw@microsoft.com>
Date: Thu, 29 Jun 2023 16:41:46 +0800
Subject: [PATCH 2/2] For solution import .targets file that redirects dotnet
 path used by NuGet.RestoreEx.targets (#8960)

---
 eng/BootStrapMSBuild.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/BootStrapMSBuild.targets b/eng/BootStrapMSBuild.targets
index e625498d4a..44292bebb1 100644
--- a/eng/BootStrapMSBuild.targets
+++ b/eng/BootStrapMSBuild.targets
@@ -246,6 +246,9 @@
     <Copy SourceFiles="$(RepoRoot)src\MSBuild.Bootstrap\RedirectNuGetConsoleProcess.After.Microsoft.Common.targets"
           DestinationFolder="$(BootstrapDestination)\Current\Microsoft.Common.targets\ImportAfter" />
 
+    <Copy SourceFiles="$(RepoRoot)src\MSBuild.Bootstrap\RedirectNuGetConsoleProcess.After.Microsoft.Common.targets"
+          DestinationFolder="$(BootstrapDestination)\Current\SolutionFile\ImportAfter" />
+
     <!-- Disable workload resolver until we can figure out whether it can work in the bootstrap
          https://github.com/dotnet/msbuild/issues/6566 -->
     <Touch Files="$(BootstrapDestination)\DisableWorkloadResolver.sentinel" AlwaysCreate="true" />