Skip to content
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.

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

Switch to new Microsoft.DotNet.SharedFramework.Sdk and refactor Host/Installer build subsets #38457

Merged
116 commits merged into from
Nov 13, 2020

Conversation

jkoritzinsky
Copy link
Member

@jkoritzinsky jkoritzinsky commented Jun 26, 2020

Use the new Microsoft.DotNet.SharedFramework.Sdk to build the Microsoft.NETCore.App shared framework, targeting pack, apphost pack, dotnet-host installer, dotnet-hostfxr installer, runtime-deps installers, and the bundle installers.

This PR also replaces the subsets in the installer space with the following subsets:

Parent Subset Subset Name Subset Contents
host
host host.native Native build for dotnet.exe, apphost, hostpolicy, hostfxr, etc.
host host.pkg NuGet packages for hostpolicy, hostfxr, dotnet shared host
host host.tools HostModel assembly
host host.tests Tests for apphost, hostpolicy, hostfxr, dotnet shared host, HostModel, etc.
packs
packs packs.product Microsoft.NETCore.App.Ref/Runtime/Host/Crossgen2 framework packs, installers, archives. dotnet-host, dotnet-hostfxr, runtime-debs, and bundle installers.
packs.product packs.installers Microsoft.NETCore.App.Ref/Runtime/Host, dotnet-host/hostfxr, bundle installers
packs packs.tests Tests for the runtime packs.
publish Generate asset manifests and prepare to publish to BAR.

Fixes #3730
Fixes #1616
Fixes #1622
Fixes #44320

@jkoritzinsky jkoritzinsky added NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) NO-REVIEW Experimental/testing PR, do NOT review it area-Infrastructure-installer labels Jun 26, 2020
eng/Subsets.props Outdated Show resolved Hide resolved
@jkoritzinsky jkoritzinsky added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Nov 11, 2020
@jkoritzinsky
Copy link
Member Author

Marking no merge again until this PR can consume a Microsoft.DotNet.Build.Tasks.Installers with dotnet/arcade#6549

@jkoritzinsky
Copy link
Member Author

Once we have that, we can merge this PR.

@hoyosjs
Copy link
Member

hoyosjs commented Nov 11, 2020

@jkoritzinsky just fyi, the PBsign changes got merges

@jkoritzinsky
Copy link
Member Author

I saw. I'm integrating them now locally and validating.

I'm going to remove the non PBsign path in Signing.props since it doesn't work any more (we'll still sign the DAC and DBI).

@jkoritzinsky jkoritzinsky removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Nov 12, 2020
@ViktorHofer
Copy link
Member

Fix for the wrong msbuild function name: dotnet/arcade#6552

@ghost
Copy link

ghost commented Nov 13, 2020

Hello @jkoritzinsky!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 86d5d16 into dotnet:master Nov 13, 2020
@jkoritzinsky jkoritzinsky deleted the adopt-unified-sharedfx branch November 13, 2020 07:13
@akoeplinger
Copy link
Member

Congrats 🎉

<ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.zip" Condition="'$(PrepareArtifacts)' == 'true'" />

<ItemsToSignWithoutPaths Include="@(ItemsToSignWithPaths->'%(Filename)%(Extension)')" />
<ItemsToSignPostBuild Include="@(ItemsToSignWithoutPaths->Distinct())" />
Copy link
Member

Choose a reason for hiding this comment

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

@jkoritzinsky This PR removed this line, which will break post build signing. Post build signing breaks signing into two categories:

ItemsToSign and ItemsToSignPostBuild. ItemsToSign corresponds to those items that should always be signed during the build (when PostBuildSign is true or false), and ItemsToSignPostBuild should contain items to sign in post build, only if PostBuildSign = true.

The use of target should be unnecessary.

/cc @ViktorHofer

Copy link
Member

Choose a reason for hiding this comment

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

I think that you will only need the setup for ItemGroupsWhen PostBuildSign=true. This does not need to be done in a target.

https://github.com/dotnet/runtime/pull/38457/files#diff-a923a7746e08ef5df4bfd49f340d9f93055d66ba792770a7e1c227b3eaf3d4efL146-L154

Copy link
Member Author

Choose a reason for hiding this comment

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

Shoot. I’ll put out a PR to add back this item group.

@ghost ghost locked as resolved and limited conversation to collaborators Jan 2, 2021
@AntonLapounov AntonLapounov modified the milestone: 6.0.0 Jan 28, 2021
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
10 participants