Skip to content

Fix patch removing aspnetcore apphost pack prebuilt#12469

Merged
MichaelSimons merged 1 commit into
dotnet:release/6.0.1xxfrom
dagood:prebuilt-apphost-aspnetcore
Oct 21, 2021
Merged

Fix patch removing aspnetcore apphost pack prebuilt#12469
MichaelSimons merged 1 commit into
dotnet:release/6.0.1xxfrom
dagood:prebuilt-apphost-aspnetcore

Conversation

@dagood
Copy link
Copy Markdown
Member

@dagood dagood commented Oct 20, 2021

See dotnet/aspnetcore#37672 for info on the mistake, and the fix. Essentially:

This is a .props file, but the SDK sets UseAppHost to true in Microsoft.NET.RuntimeIdentifierInference.targets. 🙁 At the point this condition ['$(DotNetBuildFromSource)' != 'true' or '$(UseAppHost)' != 'true'] is evaluated, UseAppHost is still empty string.

@dagood
Copy link
Copy Markdown
Member Author

dagood commented Oct 20, 2021

Confirmed that in my local build, aspnetcore's prebuilt report is empty and the global prebuilt report no longer has this line:

<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="6.0.0-rc.2.21423.6" />

(Only 3.1.18 and 5.0.9 are listed and only in the global report. These are known from other repos.)

@dagood dagood force-pushed the prebuilt-apphost-aspnetcore branch from 0aa29d7 to 388ed26 Compare October 21, 2021 00:53
@dagood dagood marked this pull request as ready for review October 21, 2021 01:03
@dagood dagood requested a review from a team as a code owner October 21, 2021 01:03
+ Source-build doesn't run tests, so the property is simply conditioned out.
+ -->
+ <LocalDotNetRoot Condition="'$(DotNetBuildFromSource)' != 'true' or '$(UseAppHost)' != 'true'">$(RepoRoot).dotnet\</LocalDotNetRoot>
+ <NetCoreTargetingPackRoot Condition="'$(LocalDotNetRoot)' != ''">$(LocalDotNetRoot)packs\</NetCoreTargetingPackRoot>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah...Reviewing patch changes in GitHub with the unified view is terribly confusing!

Copy link
Copy Markdown
Member

@MichaelSimons MichaelSimons left a comment

Choose a reason for hiding this comment

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

LGTM

@MichaelSimons
Copy link
Copy Markdown
Member

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@MichaelSimons
Copy link
Copy Markdown
Member

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@MichaelSimons MichaelSimons merged commit d38d804 into dotnet:release/6.0.1xx Oct 21, 2021
@dagood dagood deleted the prebuilt-apphost-aspnetcore branch October 21, 2021 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants