Skip to content

[release/6.0] Fix AppHost pack prebuilt usage in source-build#37760

Merged
wtgodbe merged 1 commit into
dotnet:release/6.0from
dagood:fix-prebuilt-apphost-6.0
Nov 10, 2021
Merged

[release/6.0] Fix AppHost pack prebuilt usage in source-build#37760
wtgodbe merged 1 commit into
dotnet:release/6.0from
dagood:fix-prebuilt-apphost-6.0

Conversation

@dagood
Copy link
Copy Markdown
Member

@dagood dagood commented Oct 21, 2021

[release/6.0] Fix AppHost pack prebuilt usage in source-build

Cherry picked from commit 2984e3b, PR #37672.

This change removes the NetCoreTargetingPackRoot override during source-build to avoid unnecessarily downloading the apphost pack as a prebuilt dependency. I also updated the comment on the override to be more descriptive and added details on why/when it needs to be disabled for source-build.

Added a non-source-build condition on _InstallTargetingPackIntoLocalDotNet to prevent it from attempting to install the targeting pack into the source-build-wide SDK that's in use. This matches the same condition already present on _InstallFrameworkIntoLocalDotNet.

/cc @wtgodbe

@dagood dagood requested a review from Pilchie as a code owner October 21, 2021 20:42
@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Oct 22, 2021
@Pilchie
Copy link
Copy Markdown
Member

Pilchie commented Nov 8, 2021

@dagood - this never got merged - does it need to for servicing?

@dagood
Copy link
Copy Markdown
Member Author

dagood commented Nov 8, 2021

@wtgodbe wtgodbe added the tell-mode Indicates a PR which is being merged during tell-mode label Nov 10, 2021
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Nov 10, 2021

Branches are open now, merging.

@wtgodbe wtgodbe merged commit 4045de9 into dotnet:release/6.0 Nov 10, 2021
@ghost ghost added this to the 6.0.1 milestone Nov 10, 2021
@dagood dagood deleted the fix-prebuilt-apphost-6.0 branch November 10, 2021 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants