Proper workload support for 2xx#3705
Merged
mthalman merged 14 commits intodotnet:release/10.0.2xxfrom Jan 9, 2026
Merged
Conversation
ViktorHofer
reviewed
Dec 9, 2025
ViktorHofer
reviewed
Dec 9, 2025
ViktorHofer
reviewed
Dec 9, 2025
ViktorHofer
reviewed
Dec 9, 2025
Member
Author
|
Reviewers: I need some eyes on this. Thanks. |
akoeplinger
reviewed
Dec 18, 2025
akoeplinger
reviewed
Dec 18, 2025
Make the 1xx experience (building shared components) the default by setting DotNetBuildSharedComponents=true in sdk's Directory.Build.props. Only pass /p:DotNetBuildSharedComponents=false to sdk when explicitly needed, reducing unnecessary build argument passing. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
Document the purpose of this property to help prevent merge conflicts and clarify why this dependency exists for 2xx+ branches. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
Clarify why MSI packages are marked as Internal when not building shared components - they are downloaded from 1xx builds and should not be republished. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
Clarify why the Windows runtime packages have ExcludeAsMsi=true - they are included in the SDK directly and don't need MSI wrappers for workload installation. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
Member
Author
|
@ViktorHofer and @akoeplinger - PTAL at the updates. Need to get this in soon. |
ViktorHofer
reviewed
Jan 8, 2026
ViktorHofer
reviewed
Jan 8, 2026
ViktorHofer
reviewed
Jan 8, 2026
ViktorHofer
reviewed
Jan 8, 2026
ViktorHofer
approved these changes
Jan 8, 2026
Member
ViktorHofer
left a comment
ViktorHofer
left a comment
There was a problem hiding this comment.
Thanks for addressing my feedback
4 tasks
Member
Author
|
/backport to main |
Contributor
|
Started backporting to |
Contributor
|
@mthalman backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Proper workload support for 2xx
.git/rebase-apply/patch:82: trailing whitespace.
.git/rebase-apply/patch:163: trailing whitespace.
<PackageDownload Include="%(RuntimeWorkloadPacksToDownload.Identity).Msi.x64"
.git/rebase-apply/patch:166: trailing whitespace.
<PackageDownload Include="%(RuntimeWorkloadPacksToDownload.Identity).Msi.x86"
.git/rebase-apply/patch:169: trailing whitespace.
<PackageDownload Include="%(RuntimeWorkloadPacksToDownload.Identity).Msi.arm64"
.git/rebase-apply/patch:172: trailing whitespace.
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
Using index info to reconstruct a base tree...
M eng/Version.Details.props
M eng/Version.Details.xml
M eng/Versions.props
M repo-projects/Directory.Build.props
M repo-projects/sdk.proj
M src/sdk/src/Workloads/VSInsertion/workloads.csproj
Falling back to patching base and 3-way merge...
Auto-merging eng/Version.Details.props
CONFLICT (content): Merge conflict in eng/Version.Details.props
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging repo-projects/Directory.Build.props
Auto-merging repo-projects/sdk.proj
CONFLICT (content): Merge conflict in repo-projects/sdk.proj
Auto-merging src/sdk/src/Workloads/VSInsertion/workloads.csproj
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 Proper workload support for 2xx
Error: The process '/usr/bin/git' failed with exit code 128 |
mthalman
added a commit
to mthalman/dotnet
that referenced
this pull request
Jan 13, 2026
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Implements property workload support for the 2xx feature band. This does two things:
Example build containing the artifacts for inspection.
Fixes #3126