[release/10.0] Update package baseline for RTM #64332
Merged
+582
−581
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wtgodbe
added
the
tell-mode
Copilot finished reviewing on behalf of
wtgodbe
November 12, 2025 18:43
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR updates the package baseline configuration from version 9.0 to 10.0 as part of the regular release activities for the RTM (Release to Manufacturing) version. The changes ensure all package versions, framework references, and dependency constraints are correctly updated for the new major release.
Key Changes
- Updated root baseline version from 9.0.0 to 10.0.0
- Updated all 106 package versions from 9.0.0 to 10.0.0
- Updated framework target moniker references from net9.0 to net10.0
- Updated external dependency versions (Microsoft.OpenApi, Microsoft.Data.SqlClient, xunit, System.ValueTuple)
- Added new package dependencies (Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Validation)
- Removed some package dependencies (System.Text.Json in certain contexts, System.Threading.Channels for net10.0)
Reviewed Changes
Copilot reviewed 1 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| eng/Baseline.xml | Updated baseline version and all 106 package versions from 9.0.0 to 10.0.0, including package ID updates for runtime and template packages |
| eng/Baseline.Designer.props | Updated AspNetCoreBaselineVersion, all package baseline versions, framework conditions from net9.0 to net10.0, and external dependency versions |
Member
Author
|
/backport to main |
Contributor
|
Started backporting to |
Contributor
|
@wtgodbe backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update baseline
Using index info to reconstruct a base tree...
M eng/Baseline.Designer.props
M eng/Baseline.xml
Falling back to patching base and 3-way merge...
Auto-merging eng/Baseline.Designer.props
CONFLICT (content): Merge conflict in eng/Baseline.Designer.props
Auto-merging eng/Baseline.xml
CONFLICT (content): Merge conflict in eng/Baseline.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Update baseline
Error: The process '/usr/bin/git' failed with exit code 128 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of regular release activities - upgrade contents of the package baseline from 9.0 to 10.0