Merged PR 38966: [internal/release/7.0] Merge from public

Merge from public release/7.0 to internal/release/7.0 and resolve conflicts if necessary
dotnet · Apr 16, 2024 · 118c1c7 · 118c1c7
2 parents 1591ba7 + c532715
commit 118c1c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -181,9 +181,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24201.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24210.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>3099976c92865c40a0edd6ff80926dc85acd7b13</Sha>
+      <Sha>3006a6cbf9c47169eee8371475f4047528af252f</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -137,7 +137,7 @@
     <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksTemplatingVersion>
     <!-- Packages from dotnet/source-build-externals -->
-    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24201.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
+    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24210.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/xdt -->
     <MicrosoftWebXdtVersion>7.0.0-preview.22423.2</MicrosoftWebXdtVersion>
   </PropertyGroup>