Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.0] Add servicing config: project skip infrastructure #8827

Merged
merged 1 commit into from
Nov 21, 2019

Conversation

dagood
Copy link
Member

@dagood dagood commented Nov 11, 2019

Description

For https://github.com/dotnet/core-setup/issues/8735, Disable producing targeting packs in servicing builds (unless patching). Ports dotnet/arcade#4318 to release/3.0.

Customer Impact

The way the build currently works, downstream repos like core-sdk have to manually pin the targeting pack versions so the auto-update PRs don't insert bad targeting packs that we don't plan to ship.

After this PR, dependencies on Core-Setup's targeting packs will no longer need to be pinned because the packs will only be produced when they should be used. This reduces the chance of creating a bad build, reducing maintenance cost of servicing.

Regression?

No.

Risk

This may cause build breaks in downstream repos. This would be a good thing from a correctness standpoint, because it reveals bad assumptions that targeting packs are always produced. However, it's unlikely any new issues will show up because the targeting pack versions were already pinned manually for 3.0.1.

To keep this PR simple, targeting pack tests now pass rather than fail if the nupkg isn't found on disk. This allows the tests to pass when the targeting pack isn't being patched. It adds a risk that the tests won't catch a situation where a targeting pack wasn't built but should have been. I believe this risk isn't significant: I've only observed missing nupkgs along with a build failure (so it would get noticed anyway) or major refactoring (which I don't see happening in release/3.0). We can backport improvements to these tests in the future.


/cc @wtgodbe @mmitche @Anipik @nguerrera

@dagood dagood added area-Infrastructure-installer Servicing-consider Issue for next servicing release review labels Nov 11, 2019
@dagood dagood added this to the 3.0 milestone Nov 11, 2019
@dagood dagood requested a review from MichaelSimons November 11, 2019 20:26
@dagood dagood self-assigned this Nov 11, 2019
@mmitche
Copy link
Member

mmitche commented Nov 11, 2019

Please wait till we get a final signoff for 3.0.1 and update branding to merge.

@leecow leecow added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Nov 12, 2019
@leecow leecow modified the milestones: 3.0, 3.0.2 Nov 12, 2019
@mmitche mmitche merged commit 07f338c into dotnet:release/3.0 Nov 21, 2019
@dagood dagood deleted the servicing-skips-3.0 branch November 21, 2019 21:07
mmitche pushed a commit that referenced this pull request Nov 25, 2019
* update branding to 3.0.2 (#8864)

* [release/3.0] Update tests to explicit set/unset environment variables as they expect (#8811)

* Explicitly set DOTNET_MULTILEVEL_LOOKUP in tests (#7541)

* Unset $DOTNET_ROOT environment variable for tests that don't require it

If this variable is set in your environment, running `build.sh -t` will
pass it to the test harness, causing these tests to fail.

Teach Command.EnvironmentVariable() to handle `null` as an empty string,
so that if the DotNetRoot() extension method is called with a `null`
parameter, the $DOTNET_ROOT and $DOTNET_ROOT(x86) environment variables
are essentially unset as far as pal::getenv() is concerned.

* HostWriter: Remove signature on MAC host (#8625)

In order to conform with Catalina notarization requirements, the template apphost
will be shipped after codesigning.

This commit implements a change to remove the code-signature when customizing the apphost for an app.

Testing:
- Tested the HostModel library using a locally signed version of apphost
- Verified that unsigned host can be re-signed later
- Verified that the original unsigned-apphost, and the signature-removed-apphost are binary equal.

* Add servicing config: project skip infrastructure (#8827)

* [release/3.0] Update dependencies from dnceng/internal/dotnet-wpf-int (#8866)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20191118.7

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-servicing.19568.7

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20191118.14

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-servicing.19568.14

Dependency coherency updates

- Microsoft.DotNet.Wpf.GitHub - 4.8.0-servicing.19568.4 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20191120.4

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-servicing.19570.4

Dependency coherency updates

- Microsoft.DotNet.Wpf.GitHub - 4.8.0-servicing.19568.4 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20191121.4

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-servicing.19571.4

Dependency coherency updates

- Microsoft.DotNet.Wpf.GitHub - 4.8.0-servicing.19571.2 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#8872)

- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19569.2
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19569.2
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19569.2

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20191121.6 (#8884)

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-servicing.19571.6

Dependency coherency updates

- Microsoft.DotNet.Wpf.GitHub - 4.8.0-servicing.19571.3 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://github.com/dotnet/corefx build 20191121.1 (#8886)

- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19571.1

* Update dependencies from https://github.com/dotnet/corefx build 20191121.2 (#8887)

- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19571.2

* [release/3.0] Update dependencies from dotnet/coreclr (#8875)

* Update dependencies from https://github.com/dotnet/coreclr build 20191120.2

- Microsoft.NETCore.Runtime.CoreCLR - 3.0.2-servicing.19570.2

* Update dependencies from https://github.com/dotnet/coreclr build 20191120.4

- Microsoft.NETCore.Runtime.CoreCLR - 3.0.2-servicing.19570.4

* Update dependencies from https://github.com/dotnet/coreclr build 20191121.1

- Microsoft.NETCore.Runtime.CoreCLR - 3.0.2-servicing.19571.1

* Update dependencies from https://github.com/dotnet/coreclr build 20191121.4

- Microsoft.NETCore.Runtime.CoreCLR - 3.0.2-servicing.19571.4

* Update dependencies from https://github.com/dotnet/coreclr build 20191121.5

- Microsoft.NETCore.Runtime.CoreCLR - 3.0.2-servicing.19571.5

* Update dependencies from https://github.com/dotnet/corefx build 20191121.3 (#8888)

- System.Drawing.Common - 4.6.2-servicing.19571.3
- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19571.3
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants