Share the Profile information for WindowsDesktop between runtime and targeting packs#3402
Merged
ericstj merged 1 commit intodotnet:mainfrom Nov 18, 2025
Merged
Conversation
Member
Author
|
/backport to release/10.0.1xx |
Contributor
|
Started backporting to |
Contributor
|
@ericstj backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Share the Profile information for WindowsDesktop between runtime and targeting packs
.git/rebase-apply/patch:79: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/windowsdesktop/src/windowsdesktop/src/sfx/Directory.Build.targets
M src/windowsdesktop/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj
Falling back to patching base and 3-way merge...
Auto-merging src/windowsdesktop/src/windowsdesktop/src/sfx/Directory.Build.targets
CONFLICT (content): Merge conflict in src/windowsdesktop/src/windowsdesktop/src/sfx/Directory.Build.targets
Auto-merging src/windowsdesktop/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj
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 Share the Profile information for WindowsDesktop between runtime and targeting packs
Error: The process '/usr/bin/git' failed with exit code 128 |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR consolidates Windows Desktop profile information to be shared between runtime and targeting packs by moving common file classifications from .props files to a shared .targets file. This ensures consistency and prevents the issue where profile information was not being shared properly between the runtime and targeting packs.
- Moved all package references and framework file classifications from
Directory.Build.propstoDirectory.Build.targetsto enable use of NuGet-generated properties - Fixed WinForms targeting pack conditions to use
PlatformPackageTypeinstead ofPackageTargetRuntime - Removed duplicate Windows Forms classifications from runtime-specific project files
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| System.Windows.Forms.FileClassification.props | Updated conditions to use PlatformPackageType property instead of PackageTargetRuntime for determining ref vs runtime pack |
| Microsoft.WindowsDesktop.App.Runtime.sfxproj | Removed Windows Forms specific file classifications that are now defined in shared location |
| Microsoft.WindowsDesktop.App.Ref.sfxproj | Removed import of WinForms classifications (now imported from shared Directory.Build.targets) |
| Directory.Build.targets | Added all shared package references and framework file classifications, including WinForms import |
| Directory.Build.props | Removed all package references and file classifications (moved to Directory.Build.targets) |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ViktorHofer
approved these changes
Nov 18, 2025
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
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 dotnet/windowsdesktop#5405
Did this in a way that should make sure it won't happen again. Moved all the classifications in the same place, had to do it in targets so that the import could use the property defined by nuget (not available in props).
Fixed the broken conditions in the WinForms targets.