Skip to content

Commit c882697

Browse files
committed
Merge in 'release/6.0' changes
2 parents 44718f6 + 958641c commit c882697

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22206.7">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22212.5">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
285+
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22206.7">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22212.5">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
290+
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22206.7">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22212.5">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
294+
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22206.7">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22212.5">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
298+
<Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.4</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.4</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22206.7</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22206.7</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22212.5</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22212.5</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.103"
3+
"version": "6.0.104"
44
},
55
"tools": {
6-
"dotnet": "6.0.103",
6+
"dotnet": "6.0.104",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22206.7"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22212.5"
3434
}
3535
}

0 commit comments

Comments
 (0)