Add PickBestRid MSBuild task for RID negotiation #50616
Merged
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
Co-authored-by: baronfel <[email protected]>
baronfel
reviewed
Sep 3, 2025
baronfel
reviewed
Sep 3, 2025
Co-authored-by: baronfel <[email protected]>
Copilot
AI
changed the title
Copilot finished work on behalf of
baronfel
September 3, 2025 21:00
…BestRid Co-authored-by: baronfel <[email protected]>
Copilot finished work on behalf of
baronfel
September 3, 2025 21:12
baronfel
reviewed
Sep 3, 2025
src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets
Outdated
Show resolved
Hide resolved
baronfel
reviewed
Sep 3, 2025
…enable nullable Co-authored-by: baronfel <[email protected]>
Copilot finished work on behalf of
baronfel
September 3, 2025 22:01
baronfel
reviewed
Sep 3, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR implements a new MSBuild task called PickBestRid for Runtime Identifier (RID) negotiation within the .NET SDK. The task helps determine the best matching RID from a set of supported RIDs based on a runtime graph.
- Add the
PickBestRidMSBuild task with proper error handling and nullable reference types - Include comprehensive unit tests covering success scenarios and error conditions
- Add localized error messages for the new NETSDK error codes (NETSDK1229 and NETSDK1230)
Reviewed Changes
Copilot reviewed 17 out of 17 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| Microsoft.NET.RuntimeIdentifierInference.targets | Adds UsingTask declaration to make PickBestRid task available to SDK consumers |
| PickBestRid.cs | Implements the core MSBuild task for RID negotiation with proper error handling |
| GivenAPickBestRid.cs | Comprehensive unit tests covering all task scenarios including error cases |
| Strings.resx | Adds new error message resources for NETSDK1229 and NETSDK1230 |
| Multiple .xlf files | Localization files updated with new error message entries |
Co-authored-by: Copilot <[email protected]>
…zation guidelines Co-authored-by: baronfel <[email protected]>
Copilot finished work on behalf of
baronfel
September 3, 2025 22:25
baronfel
approved these changes
Sep 3, 2025
18 tasks
MiYanni
approved these changes
Sep 16, 2025
baronfel
force-pushed
the
copilot/fix-50611
branch
from
11c3644 to
25a9cd6
Compare
baronfel
force-pushed
the
copilot/fix-50611
branch
from
25a9cd6 to
07d579b
Compare
|
/backport to release/10.0.1xx |
|
Started backporting to release/10.0.1xx: https://github.com/dotnet/sdk/actions/runs/17783731892 |
|
@baronfel backporting to "release/10.0.1xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Creating an empty commit: Initial plan
Applying: Implement PickBestRid MSBuild task with unit tests
Using index info to reconstruct a base tree...
M src/Tasks/Common/Resources/Strings.resx
M src/Tasks/Common/Resources/xlf/Strings.cs.xlf
M src/Tasks/Common/Resources/xlf/Strings.de.xlf
M src/Tasks/Common/Resources/xlf/Strings.es.xlf
M src/Tasks/Common/Resources/xlf/Strings.fr.xlf
M src/Tasks/Common/Resources/xlf/Strings.it.xlf
M src/Tasks/Common/Resources/xlf/Strings.ja.xlf
M src/Tasks/Common/Resources/xlf/Strings.ko.xlf
M src/Tasks/Common/Resources/xlf/Strings.pl.xlf
M src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
M src/Tasks/Common/Resources/xlf/Strings.ru.xlf
M src/Tasks/Common/Resources/xlf/Strings.tr.xlf
M src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
M src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
Falling back to patching base and 3-way merge...
Auto-merging src/Tasks/Common/Resources/Strings.resx
CONFLICT (content): Merge conflict in src/Tasks/Common/Resources/Strings.resx
Auto-merging src/Tasks/Common/Resources/xlf/Strings.cs.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.de.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.es.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.fr.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.it.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.ja.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.ko.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.pl.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.ru.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.tr.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
Auto-merging src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
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 0002 Implement PickBestRid MSBuild task with unit tests
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
baronfel
added a commit
that referenced
this pull request
Sep 17, 2025
…mentation (#50887) Co-authored-by: Copilot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #50611
💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.
@baronfel note: I've reviewed and tested this PR and am happy with its coverage.