Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion PowerShell.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,37 @@
<AppHostDotNetSearch>EnvironmentVariable;Global</AppHostDotNetSearch>
</PropertyGroup>


<PropertyGroup Condition=" '$(AppDeployment)' == 'FxDependentDeployment' ">
<!-- If we specify Environment too, it searches that first, no matter what order we specify-->
<AppHostDotNetSearch>Global</AppHostDotNetSearch>
</PropertyGroup>

<!-- Enable ready-to-run only for Release configuration -->
<PropertyGroup Condition=" '$(AppDeployment)' == 'FxDependentDeployment' And '$(Configuration)' == 'Release' ">
<PublishReadyToRun>true</PublishReadyToRun>
<PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
</PropertyGroup>

<PropertyGroup Condition=" '$(AppDeployment)' == 'SelfContained' ">
<AppHostDotNetSearch>AppLocal</AppHostDotNetSearch>
</PropertyGroup>

<!-- Enable ready-to-run only for Release configuration -->
<PropertyGroup Condition=" '$(AppDeployment)' == 'SelfContained' And '$(Configuration)' == 'Release' ">
<PublishReadyToRun>true</PublishReadyToRun>
<PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
</PropertyGroup>

</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))

Copilot AI Feb 12, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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))

Copilot uses AI. Check for mistakes.
</PropertyGroup>

Comment on lines +213 to +221

Copilot AI Feb 12, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>

Copilot uses AI. Check for mistakes.
<!-- Define all OS, release configuration properties -->
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<PublishReadyToRun>true</PublishReadyToRun>
Expand All @@ -219,4 +241,4 @@
<PropertyGroup>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
</PropertyGroup>
</Project>
</Project>
Loading