From ca4f0fe37455882baa00c75b1ef30a7ff1494457 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:27:42 -0700
Subject: [PATCH] [release/8.0] Update MicrosoftBuildVersion to latest
 (#100595) (#101145)

* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.

* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency

* Update SourceBuildPrebuiltBaseline.xml

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
---
 eng/SourceBuildPrebuiltBaseline.xml | 8 +++++++-
 eng/Version.Details.xml             | 9 +++++++++
 eng/Versions.props                  | 2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 458b2d756cba9..81041ed6ed637 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>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 91df0c87d9cbc..fe35dc0997ea2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -410,5 +410,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>
diff --git a/eng/Versions.props b/eng/Versions.props
index 565f052fc8baa..f012e40909509 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>