Make packtool targets light up only on pack #50445
Open
+86
−56
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
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an issue where PackTool.targets were incorrectly modifying properties that affected tool publishing behavior, not just packaging. The fix restructures the targets to ensure tool-specific modifications only activate during pack operations.
Key changes:
- Moves tool-specific property modifications from global scope to pack-specific targets
- Adds
_IsPackingproperty to PackCommand and related test framework classes - Updates file-based program support to include
dotnet packfunctionality
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets | Restructures targets to move property modifications into pack-specific scope |
| src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets | Removes PackAsTool condition from runtime identifier inference |
| src/Cli/dotnet/Commands/Pack/PackCommand.cs | Adds file-based program support and refactors command creation |
| test/Microsoft.NET.TestFramework/Commands/*.cs | Adds _IsPacking and _IsPublishing properties to test commands |
| test/dotnet.Tests/CommandTests/Run/RunFileTests.cs | Adds comprehensive tests for pack functionality with file-based programs |
| test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAToolProject.cs | Adds regression test for normal publish behavior |
| eng/Version.Details.xml | Updates Microsoft.Testing.Platform and MSTest package versions |
| @@ -51,28 +48,15 @@ NOTE: This file is imported from the following contexts, so be aware when writin | |||
| <_UserSpecifiedToolPackageRids Condition="'$(_UserSpecifiedToolPackageRids)' == ''">$(RuntimeIdentifiers)</_UserSpecifiedToolPackageRids> | |||
| <_HasRIDSpecificTools Condition=" '$(_UserSpecifiedToolPackageRids)' != '' ">true</_HasRIDSpecificTools> | |||
| <_HasRIDSpecificTools Condition="'$(_HasRIDSpecificTools)' == ''">false</_HasRIDSpecificTools> | |||
| <!-- unlike all of the other computed properties here, we _do_ want to mutate RuntimeIdentifiers here so that we ensure that the shims are included in restores --> | |||
| <RuntimeIdentifiers Condition="'$(PackAsToolShimRuntimeIdentifiers)' != ''">$(_UserSpecifiedToolPackageRids);$(PackAsToolShimRuntimeIdentifiers)</RuntimeIdentifiers> | |||
There was a problem hiding this comment.
[nitpick] This property modification is in global scope but the comment on line 51 indicates it should mutate RuntimeIdentifiers. This creates inconsistency with the goal of moving modifications to pack-specific targets. Consider moving this to a pack-specific target if possible.
Suggested change
| <RuntimeIdentifiers Condition="'$(PackAsToolShimRuntimeIdentifiers)' != ''">$(_UserSpecifiedToolPackageRids);$(PackAsToolShimRuntimeIdentifiers)</RuntimeIdentifiers> |
Copilot uses AI. Check for mistakes.
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 #50435
The PackTool.targets were modifying critical properties of the tool package project that impacted the way the tool would be published, not just packed.
To fix this, I looked at the data dependencies between the various properties and pushed them into a series of Targets that happen early on in tool packaging to ensure that tool projects can be published as normal, and the tool-specific modifications only ever light up on packaging-based Targets