Skip to content

[automated] Merge branch 'release/10.0' => 'main' #63369

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
merged 15 commits into from
Aug 21, 2025
Merged

[automated] Merge branch 'release/10.0' => 'main' #63369

Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f0e347f
[release/10.0-rc1] Source code updates from dotnet/dotnet (#63293)
dotnet-maestro[bot] Aug 18, 2025
f8a7852
Update dependencies from https://github.com/dotnet/extensions build 2…
dotnet-maestro[bot] Aug 18, 2025
4301ec8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Aug 18, 2025
9451f9a
[10.0-rc1] Mop up changes that missed the RC1 snap (#63318)
wtgodbe Aug 18, 2025
d4dfec9
[release/10.0-rc1] Model nullable types using oneOf in OpenAPI schema…
github-actions[bot] Aug 19, 2025
231674f
[release/10.0-rc1] Initialize hosting trace with OTEL tags for sampli…
github-actions[bot] Aug 20, 2025
6d99c4d
[release/10.0-rc1] Empty "http.route" tags should be set to "/" (#63336)
github-actions[bot] Aug 20, 2025
aa1f0fb
Update dependencies from https://github.com/dotnet/dotnet build 27987…
dotnet-maestro[bot] Aug 20, 2025
d42f403
[release/10.0] Source code updates from dotnet/dotnet (#63327)
dotnet-maestro[bot] Aug 21, 2025
560cd83
Bump form-data from 4.0.2 to 4.0.4 (#63335)
github-actions[bot] Aug 21, 2025
406e556
Update inter-branch-merge-flow.yml (#63361)
wtgodbe Aug 21, 2025
76a8cb3
Merge branch 'release/10.0' into merge/release/10.0-rc1-to-release/10.0
wtgodbe Aug 21, 2025
7c18d3b
Merge pull request #63362 from dotnet/merge/release/10.0-rc1-to-relea…
wtgodbe Aug 21, 2025
7c8a236
Merge branch 'main' into merge/release/10.0-to-main
wtgodbe Aug 21, 2025
592fe64
Update eng/Versions.props
wtgodbe Aug 21, 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: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
<ValidateBaseline>true</ValidateBaseline>
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">8.0.1</IdentityModelVersion>
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">*-*</IdentityModelVersion>
Expand Down
Loading