From b5223b0d74f823cf959d959169cc97635b0e2386 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Mon, 5 Feb 2024 13:12:22 -0800
Subject: [PATCH 1/3] Update MicrosoftBuildVersion to latest to fix
 System.Security.Cryptography.XML component governance alert.

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 08440b6bb132c6..77f0a260ff181d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -172,7 +172,7 @@
     <NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
     <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
     <DNNEVersion>2.0.5</DNNEVersion>
-    <MicrosoftBuildVersion>17.3.2</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
     <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>

From 43c7780e6226b43e09c08422fb3bdcc0f72c9289 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 9 Apr 2024 13:10:10 -0700
Subject: [PATCH 2/3] Add info to VersionDetails to allow sourcebuild to update
 the MSBuild dependency

---
 eng/Version.Details.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c789ea64ef6eec..582bb9265fac5b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -406,5 +406,14 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>46a7370763921ded24dcb70c585ee97883c615d4</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Build" Version="17.8.3">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
+      <SourceBuild RepoName="msbuild" ManagedOnly="true" />
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From f583948f526d1482da6bddc6e0fe56295ec0fcaa Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Fri, 12 Apr 2024 14:48:16 -0500
Subject: [PATCH 3/3] Update SourceBuildPrebuiltBaseline.xml

---
 eng/SourceBuildPrebuiltBaseline.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 458b2d756cba9a..81041ed6ed6377 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -28,5 +28,11 @@
     <!-- Analyzers cannot be SBRPed + an older release version is being used, meaning there is no intermediate for it
          In full source build, this version is overridden by previous repo outputs or come from previously source-built artifacts. -->
     <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*" />
+
+    <!-- Transitive msbuild dependencies that when build in product source-build, latest/n-1 is used -->
+    <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager*/*7.0.*" />
+    <UsagePattern IdentityGlob="System.Diagnostics.EventLog*/*7.0.*" />
+    <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext*/*7.0.*" />
+    <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData*/*7.0.*" />
   </IgnorePatterns>
-</UsageData>
\ No newline at end of file
+</UsageData>