Skip to content

[release/v7.4]!!!MERGE_CONFLICT!!! Fix build to only enable ready-to-run for the Release configuration #26341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pwshBot wants to merge 1 commit into from
Closed

[release/v7.4]!!!MERGE_CONFLICT!!! Fix build to only enable ready-to-run for the Release configuration #26341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 38 additions & 0 deletions PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,44 @@
<DebugType>portable</DebugType>
</PropertyGroup>

<<<<<<< HEAD
=======
<!-- Define properties for Framework dependent deployments in Packages
https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#apphostdotnetsearch
For FxDependent, we want to search for the apphost in the Environment or global location,
as this was not causing any issues.
For FxDependentDeployment, we want to search ONLY in global location.
For SelfContained, we want to search in the app local location.
-->
<PropertyGroup Condition=" '$(AppDeployment)' == 'FxDependent' ">
<!-- Specify both to keep existing behavior because we have not had complaints about this scenario -->
<AppHostDotNetSearch>EnvironmentVariable;Global</AppHostDotNetSearch>
<PublishReadyToRun>false</PublishReadyToRun>
<PublishReadyToRunEmitSymbols>false</PublishReadyToRunEmitSymbols>
</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>

>>>>>>> b0507ca4c (Fix build to only enable ready-to-run for the Release configuration (#26290))
<!-- Define all OS, release configuration properties -->
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<PublishReadyToRun>true</PublishReadyToRun>
Expand Down
Loading