Skip to content

Commit

Permalink
Merge in 'release/7.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Aug 9, 2023
2 parents 57de90c + 38bb19b commit 8133d0c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23361.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23408.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23361.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23408.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23361.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23408.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<MicrosoftExtensionsLoggingVersion>7.0.0</MicrosoftExtensionsLoggingVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<!-- NB: Roslyn version affects the minimum required Visual Studio version -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"rollForward": "latestMajor"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23361.2"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23408.3"
}
}

0 comments on commit 8133d0c

Please sign in to comment.