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

[main] Update dependencies from dotnet/installer #6007

Merged
merged 3 commits into from
Jun 8, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jun 7, 2021

This pull request updates the following dependencies

Coherency Updates

The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format

  • Coherency Updates:
    • Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21277.2 to 6.0.100-preview.6.21304.2 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.NETCore.App.Ref: from 6.0.0-preview.6.21276.13 to 6.0.0-preview.6.21306.1 (parent: Microsoft.Dotnet.Sdk.Internal)

From https://github.com/dotnet/installer

  • Subscription: 6548876b-06a1-4ab6-a5a5-08d8ed868088
  • Build: 20210606.2
  • Date Produced: 6/7/2021 5:43 AM
  • Commit: c83bef2f34e5302bfc651d12df2f8bbcd2a981dc
  • Branch: refs/heads/main

…210606.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.6.21280.2 -> To Version 6.0.100-preview.6.21306.2

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref
 From Version 6.0.100-preview.6.21277.2 -> To Version 6.0.100-preview.6.21304.2 (parent: Microsoft.Dotnet.Sdk.Internal
Looks like `libmonosgen-2.0.so` increased in size by ~20KB.
@dotnet-maestro dotnet-maestro bot requested a review from dellis1972 as a code owner June 7, 2021 15:43
Context: dotnet/linker#2082
Fixes: #5997

Otherwise we are getting a `RemoveDesigner` test failure that looks
like it is related:

    RemoveDesigner
    All Nested Resource Types should be removed.
    Expected: 0
    But was:  5
@jonpryor
Copy link
Member

jonpryor commented Jun 8, 2021

Bump to dotnet/installer/main@c83bef2f 6.0.100-preview.6.21306.2 (#6007)

Fixes: https://github.com/xamarin/xamarin-android/issues/5997

Context: https://github.com/mono/linker/pull/2082

Changes: https://github.com/dotnet/installer/compare/46b17bd1587380d190dcdfd45a61a5b5c1eb6c93...c83bef2f34e5302bfc651d12df2f8bbcd2a981dc
Changes: https://github.com/mono/linker/compare/50901f9ba5c8672c2758577a61f45fea3cc6cd76...21df7dbbf881507c98026c1b9e7532303b3c0a06
Changes: https://github.com/dotnet/runtime/compare/6e5f722a9dab49f9626ea95326ef6e74129621ca...5b8e1780ad7740e632c285bc2af13a8d0b20c5a9
 
Updates:
 
  * Microsoft.Dotnet.Sdk.Internal:
    [from 6.0.100-preview.6.21280.2 to 6.0.100-preview.6.21306.2][0]
 
  * Microsoft.NET.ILLink.Tasks:
    [from 6.0.100-preview.6.21277.2 to 6.0.100-preview.6.21304.2][1]
 
  * Microsoft.NETCore.App.Ref:
    [from 6.0.0-preview.6.21276.13 to 6.0.0-preview.6.21306.1][2]

Update the `*.apkdesc` files; looks like `libmonosgen-2.0.so`
increased in size by ~20KB.

Update the `@(_TrimmerCustomSteps)` ordering so that we use
{ RemoveResourceDesignerStep, GetAssembliesStep } instead of
{ GetAssembliesStep, RemoveResourceDesignerStep }.
This change is needed because of mono/linker#2082.

Co-authored-by: Jonathan Pryor <jonpryor@vt.edu>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

[0]: https://github.com/dotnet/installer/compare/46b17bd1587380d190dcdfd45a61a5b5c1eb6c93...c83bef2f34e5302bfc651d12df2f8bbcd2a981dc
[1]: https://github.com/mono/linker/compare/50901f9ba5c8672c2758577a61f45fea3cc6cd76...21df7dbbf881507c98026c1b9e7532303b3c0a06
[2]: https://github.com/dotnet/runtime/compare/6e5f722a9dab49f9626ea95326ef6e74129621ca...5b8e1780ad7740e632c285bc2af13a8d0b20c5a9

@jonpryor jonpryor merged commit 002b5f9 into main Jun 8, 2021
@jonpryor jonpryor deleted the darc-main-a4271380-909e-4926-b128-8a3344b0732d branch June 8, 2021 20:38
@github-actions github-actions bot locked and limited conversation to collaborators Jan 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants