Skip to content

[automated] Merge branch 'release/10.0.2xx' => 'main' #1546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 7 commits into from
Nov 25, 2025
Merged

[automated] Merge branch 'release/10.0.2xx' => 'main' #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a5cc3d4
Condition OneLocBuild to only run for the main branch (#1536)
ViktorHofer Nov 24, 2025
4cc140f
[release/10.0.1xx] Source code updates from dotnet/dotnet (#1541)
dotnet-maestro[bot] Nov 25, 2025
0c6b136
make Microsoft.Build* a truly static dependency for SB and MSFT build…
ViktorHofer Nov 25, 2025
52f4e1a
Make System.IO.Hashing a live dependency (#1543)
ViktorHofer Nov 25, 2025
530dbc5
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…
ViktorHofer Nov 25, 2025
b938629
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' (#1…
ViktorHofer Nov 25, 2025
c35fd34
Merge branch 'main' into merge/release/10.0.2xx-to-main
ViktorHofer Nov 25, 2025
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
2 changes: 2 additions & 0 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ This file should be imported by eng/Versions.props
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-alpha.1.25571.109</SystemCommandLinePackageVersion>
<SystemIOHashingPackageVersion>10.0.0-rc.2.25502.107</SystemIOHashingPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
<SystemIOHashingVersion>$(SystemIOHashingPackageVersion)</SystemIOHashingVersion>
</PropertyGroup>
</Project>
17 changes: 4 additions & 13 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,15 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.2.25502.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25571.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
</Dependency>
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
<Dependency Name="Microsoft.Build" Version="17.11.48">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.11.48">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.3.25571.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
1 change: 0 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<!-- nuget -->
<NuGetVersioningVersion>6.12.1</NuGetVersioningVersion>
<!-- runtime -->
<SystemIOHashingVersion>10.0.0</SystemIOHashingVersion>
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
</PropertyGroup>

Expand Down