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 #6029

Merged
merged 9 commits into from
Jun 23, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

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

This pull request updates the following dependencies

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

  • Subscription: 6548876b-06a1-4ab6-a5a5-08d8ed868088
  • Build: 20210621.2
  • Date Produced: 6/21/2021 9:20 AM
  • Commit: 38e12ca5a5e129515e6ff9fd98ca745e14017983
  • Branch: refs/heads/main

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.21304.2 to 6.0.100-preview.6.21317.4 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.NETCore.App.Ref: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.7.21319.2 (parent: Microsoft.Dotnet.Sdk.Internal)

…210615.23

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21315.23
@jonathanpeppers
Copy link
Member

/cc @rolfbjarne triggered this a few minutes ago, and still not seeing anything Preview 7 coming through.

…210618.1

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21318.1
@rolfbjarne
Copy link
Member

Looks like we'll get P7 when this PR is merged: https://github.com/dotnet/installer/pull/10856/files

…210618.5

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21318.5

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref
 From Version 6.0.100-preview.6.21304.2 -> To Version 6.0.100-preview.6.21317.4 (parent: Microsoft.Dotnet.Sdk.Internal
@jonathanpeppers
Copy link
Member

Ok, seeing Preview 7 builds from dotnet/runtime now.

We should branch before we merge this, but I might wait until Monday to see if everything will be Preview 7.

@jonathanpeppers jonathanpeppers marked this pull request as draft June 18, 2021 21:50
@rolfbjarne
Copy link
Member

Ok, seeing Preview 7 builds from dotnet/runtime now.

We should branch before we merge this, but I might wait until Monday to see if everything will be Preview 7.

I branched xamarin-macios, and we're getting P6 bumps there: xamarin/xamarin-macios#11989

…210621.2

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.7.21321.2

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref
 From Version 6.0.100-preview.6.21304.2 -> To Version 6.0.100-preview.6.21317.4 (parent: Microsoft.Dotnet.Sdk.Internal
@jonathanpeppers
Copy link
Member

I just branched for Preview 6 as well: https://github.com/xamarin/xamarin-android/tree/release/6.0.1xx-preview6

Context: dotnet/runtime#53811

dotnet/runtime#53811 is now solved, so we can remove the workaround.
@jonathanpeppers jonathanpeppers marked this pull request as ready for review June 21, 2021 15:37
@jonathanpeppers
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

/cc @steveisok it seems like a native library grew a bit in size here:

689,448 lib/arm64-v8a/libmonosgen-2.0.so

Is this unexpected? ~689K seems like a lot of growth.

The other one, is a small enough difference to ignore:

12,288 lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so

@jonathanpeppers
Copy link
Member

Actually seeing a size difference here, too: #6034

701,736 lib/arm64-v8a/libmonosgen-2.0.so

Context: dotnet/msbuild#6609

It seems that properties are missing from MSBuild logs, ignoring part of this test for now.
Context: dotnet/templating#3325
Context: https://github.com/dotnet/templating/wiki/Reference-for-template.json#content-manipulation

In the current bump, `dotnet new android` + `dotnet build` fails with:

    Resources\mipmap-xxxhdpi\ic_launcher_round.png error APT2000: failed reading from input: PNG chunk type 49444154 is too large: chunk length is 10836 but chunk starts at byte 45/8187.

The .NET templating system has a 'copyOnly' mode for files that do not
need any text replaced. This is a performance feature, but it also
happens to workaround this issue.

We should be doing this on `.png` files *anyway*, as we don't need
potential "text" to be replaced. I will probably need to make similar
changes in xamarin/xamarin-macios and dotnet/maui.
@jonathanpeppers jonathanpeppers merged commit d5a1171 into main Jun 23, 2021
@jonathanpeppers jonathanpeppers deleted the darc-main-1c49b292-2977-4824-8664-7f87e515a873 branch June 23, 2021 20:25
@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