From 372d464ee2f4bfd09fd154c91a6b3be8b1218f3e Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Tue, 4 Mar 2025 12:25:52 +0100
Subject: [PATCH 1/2] Update MSBuild (#18347)

* msbuild

* Update Versions.props

* Revert "Update Versions.props"

This reverts commit c1c61eb947a74e7ff182d7d5af724f90a48d5fb3.

* Update SourceBuildPrebuiltBaseline.xml

---------

Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
---
 eng/SourceBuildPrebuiltBaseline.xml | 8 ++++++++
 eng/Versions.props                  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 18f3b782d76..cc63b5594e3 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -26,4 +26,12 @@
     <!-- Tracked in https://github.com/dotnet/source-build/issues/3438 -->
     <UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
   </IgnorePatterns>
+
+  <Usages>
+    <Usage Id="Microsoft.Build.Framework" Version="17.12.6" IsDirectDependency="true" />
+    <Usage Id="Microsoft.Build.Tasks.Core" Version="17.12.6" IsDirectDependency="true" />
+    <Usage Id="Microsoft.Build.Utilities.Core" Version="17.12.6" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NET.StringTools" Version="17.12.6" />
+    <Usage Id="System.Formats.Asn1" Version="8.0.1" />
+  </Usages>
 </UsageData>
diff --git a/eng/Versions.props b/eng/Versions.props
index bacdd4e3233..97afcbb5f76 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -94,7 +94,7 @@
     <MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
     <VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
     <MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
-    <MicrosoftBuildVersion>17.11.0-preview-24178-03</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion>17.12.6</MicrosoftBuildVersion>
     <!-- Roslyn packages -->
     <MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
     <MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>

From 70171b7ebd461c10345861558c8afddc84e8ef29 Mon Sep 17 00:00:00 2001
From: Ben Hopkins <ben@hopkins.tech>
Date: Wed, 5 Mar 2025 15:40:10 +0000
Subject: [PATCH 2/2] Update xcopy-msbuild to latest available version (#18351)

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 598d8b7367b..c4d9f0a9ee5 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
         "Microsoft.VisualStudio.Component.FSharp"
       ]
     },
-    "xcopy-msbuild": "17.12.0"
+    "xcopy-msbuild": "17.13.0"
   },
   "native-tools": {
     "perl": "5.38.2.2"