[release/v7.5] Fix build to only enable ready-to-run for the Release configuration#26795
Closed
daxian-dbw wants to merge 1 commit into
Closed
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Backport to release/v7.5 intended to ensure ReadyToRun is only enabled for Release builds (so Debug builds remain debuggable), by adding configuration-conditional MSBuild properties in PowerShell.Common.props.
Changes:
- Add
PublishReadyToRun/PublishReadyToRunEmitSymbolsproperty groups conditioned on$(Configuration) == 'Release'forFxDependentDeploymentandSelfContaineddeployments. - Adjust whitespace/formatting near the end of
PowerShell.Common.props.
| <PropertyGroup Condition=" '$(AppDeployment)' == 'SelfContained' And '$(Configuration)' == 'Release' "> | ||
| <PublishReadyToRun>true</PublishReadyToRun> | ||
| <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols> | ||
| >>>>>>> b0507ca4c (Fix build to only enable ready-to-run for the Release configuration (#26290)) |
There was a problem hiding this comment.
There is an unresolved merge conflict marker (>>>>>>> ...) in the file, which makes the MSBuild props invalid XML and will break builds. Resolve the conflict and remove the marker, keeping only the intended PropertyGroup block(s).
Suggested change
| >>>>>>> b0507ca4c (Fix build to only enable ready-to-run for the Release configuration (#26290)) |
Comment on lines
+213
to
+221
| </PropertyGroup> | ||
|
|
||
| <!-- Enable ready-to-run only for Release configuration --> | ||
| <PropertyGroup Condition=" '$(AppDeployment)' == 'SelfContained' And '$(Configuration)' == 'Release' "> | ||
| <PublishReadyToRun>true</PublishReadyToRun> | ||
| <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols> | ||
| >>>>>>> b0507ca4c (Fix build to only enable ready-to-run for the Release configuration (#26290)) | ||
| </PropertyGroup> | ||
|
|
There was a problem hiding this comment.
This stray </PropertyGroup> appears without a matching opening tag in the surrounding context, which will also invalidate the props file. After resolving the conflict, ensure all <PropertyGroup> elements are properly balanced and nested.
Suggested change
| </PropertyGroup> | |
| <!-- Enable ready-to-run only for Release configuration --> | |
| <PropertyGroup Condition=" '$(AppDeployment)' == 'SelfContained' And '$(Configuration)' == 'Release' "> | |
| <PublishReadyToRun>true</PublishReadyToRun> | |
| <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols> | |
| >>>>>>> b0507ca4c (Fix build to only enable ready-to-run for the Release configuration (#26290)) | |
| </PropertyGroup> |
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.
Backport of #26290 to release/v7.5
Triggered by @daxian-dbw on behalf of @daxian-dbw
Original CL Label: CL-BuildPackaging
/cc @PowerShell/powershell-maintainers
Impact
REQUIRED: Choose either Tooling Impact or Customer Impact (or both). At least one checkbox must be selected.
Tooling Impact
Customer Impact
Issue found internally during development - ready-to-run was being enabled even for Debug configuration, making it impossible to debug code.
Regression
REQUIRED: Check exactly one box.
This is not a regression.
Testing
The fix was tested by building PowerShell in Debug configuration and verifying that ready-to-run is not enabled, allowing proper debugging. Release builds continue to have ready-to-run enabled.
Risk
REQUIRED: Check exactly one box.
This change adds proper configuration conditions to only enable ready-to-run for Release builds, while leaving Debug builds unchanged. This makes debugging possible again without affecting release builds.
Merge Conflicts
Resolved conflict in PowerShell.Common.props by accepting the new structure that conditionally enables ready-to-run only for Release configuration.