Skip to content

Commit 428bf19

Browse files
committed
Merged PR 30041: [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 0c04a4b + 10fef4f commit 428bf19

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>71aa107082fd9d77e460bc428c634459ed94a4ab</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23164.3">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
307+
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23114.3">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23164.3">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
312+
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23114.3">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23164.3">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
316+
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23114.3">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23164.3">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
320+
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.5</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.5</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23114.3"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23164.3"
3232
}
3333
}

0 commit comments

Comments
 (0)