Skip to content

[release/v7.5] Specify .NET Search by Build Type #26408

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

Merged
daxian-dbw merged 1 commit into from
Feb 12, 2026
Merged

[release/v7.5] Specify .NET Search by Build Type #26408

Show file tree
Hide file tree
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
21 changes: 21 additions & 0 deletions PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,27 @@
<DebugType>portable</DebugType>
</PropertyGroup>

<!-- 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,
Copy link

Copilot AI Nov 9, 2025

Choose a reason for hiding this comment

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

Comment uses 'Environment' as shorthand but line 188 sets the actual property value to 'EnvironmentVariable'. For clarity and consistency, the comment should use 'EnvironmentVariable' to match the actual property value.

Suggested change
For FxDependent, we want to search for the apphost in the Environment or global location,
For FxDependent, we want to search for the apphost in the EnvironmentVariable or global location,

Copilot uses AI. Check for mistakes.
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>
</PropertyGroup>

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

Copilot AI Nov 9, 2025

Choose a reason for hiding this comment

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

Comment uses 'Environment' as shorthand for 'EnvironmentVariable'. For consistency with line 188 which uses the full property name 'EnvironmentVariable', the comment should use 'EnvironmentVariable' instead of 'Environment'.

Suggested change
<!-- If we specify Environment too, it searches that first, no matter what order we specify-->
<!-- If we specify EnvironmentVariable too, it searches that first, no matter what order we specify-->

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

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

<!-- Define all OS, release configuration properties -->
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<PublishReadyToRun>true</PublishReadyToRun>
Expand Down
21 changes: 16 additions & 5 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,13 +492,24 @@ Fix steps:
$Arguments += "/property:IsWindows=false"
}

# Framework Dependent builds do not support ReadyToRun as it needs a specific runtime to optimize for.
# The property is set in Powershell.Common.props file.
# We override the property through the build command line.
if(($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) -and $Options.Runtime -notmatch $optimizedFddRegex) {
$Arguments += "/property:PublishReadyToRun=false"
# We pass in the AppDeployment property to indicate which type of deployment we are doing.
# This allows the PowerShell.Common.props to set the correct properties for the build.
$AppDeployment = if(($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) -and $Options.Runtime -notmatch $optimizedFddRegex) {
# Global and zip files
"FxDependent"
}
elseif($Options.Runtime -like 'fxdependent*' -and $Options.Runtime -match $optimizedFddRegex) {
# These are Optimized and must come from the correct version of the runtime.
# Global
"FxDependentDeployment"
}
else {
# The majority of our packages
# AppLocal
"SelfContained"
}

$Arguments += "/property:AppDeployment=$AppDeployment"
$Arguments += "--configuration", $Options.Configuration
$Arguments += "--framework", $Options.Framework

Expand Down
Loading