Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'release/9.0' into merge/release/8.0-to-release/9.0
  • Loading branch information
cincuranet authored Nov 5, 2025
commit 7d294e145eaff85bc7cf4dac1c02a63cc3760405
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25515.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25515.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25515.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25515.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25515.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25515.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup Label="Version settings">
<VersionPrefix>8.0.23</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<VersionPrefix>9.0.11</VersionPrefix>
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
</PreReleaseVersionIteration>
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
Expand Down Expand Up @@ -34,7 +34,7 @@
<SystemFormatsAsn1Version>9.0.10</SystemFormatsAsn1Version>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25515.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.8.43</MicrosoftBuildFrameworkVersion>
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"sdk": {
"version": "8.0.121",
"version": "9.0.111",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
"tools": {
"dotnet": "8.0.121",
"dotnet": "9.0.111",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
]
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25515.1"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2"
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.