Skip to content

Commit 118c1c7

Browse files
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
2 parents 1591ba7 + c532715 commit 118c1c7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182182
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24201.2">
184+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24210.1">
185185
<Uri>https://github.com/dotnet/source-build-externals</Uri>
186-
<Sha>3099976c92865c40a0edd6ff80926dc85acd7b13</Sha>
186+
<Sha>3006a6cbf9c47169eee8371475f4047528af252f</Sha>
187187
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
188188
</Dependency>
189189
<Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0">

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksInstallersVersion>
138138
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140-
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24201.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
140+
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24210.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->
142142
<MicrosoftWebXdtVersion>7.0.0-preview.22423.2</MicrosoftWebXdtVersion>
143143
</PropertyGroup>

0 commit comments

Comments
 (0)