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

Merged
merged 11 commits into from
Jul 22, 2022

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 14, 2022

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 7.0.100-1.22354.1 to 7.0.100-1.22365.1 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22356.1 to 7.0.0-rc.1.22366.5 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.7.22330.1 to 7.0.0-rc.1.22362.2 (parent: Microsoft.NETCore.App.Ref)

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

  • Subscription: 97ee8954-2ef3-4217-5719-08da2edb85ba
  • Build: 20220718.2
  • Date Produced: July 18, 2022 10:38:22 AM UTC
  • Commit: a9c056cd39d431a1b419f24de6d22d2ff24da7c1
  • Branch: refs/heads/main

…220714.7

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-preview.7.22361.1 -> To Version 7.0.100-rc.1.22364.7

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.100-1.22354.1 -> To Version 7.0.100-1.22362.3 (parent: Microsoft.Dotnet.Sdk.Internal
jonathanpeppers added a commit to jonathanpeppers/xamarin-android that referenced this pull request Jul 14, 2022
Context: https://github.com/xamarin/xamarin-android/tree/release/7.0.1xx-preview7
Context: dotnet#7170

We branched for .NET 7 Preview 7, and there is already a Maestro bump
for .NET 7 RC 1.

Let's update xamarin-android/main's version number.
Companion to dotnet/linker#2856

* Update src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
* Remove more usages of TrimMode
* Update linker versions manually

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
This was causing an .apk size regression.

I admit the code that was here needs updated, but we should do it in a way that `.apk` sizes do not regress.

Potentially update AndroidX libraries in tests? And then we can rely on the default behavior?
jonpryor pushed a commit that referenced this pull request Jul 15, 2022
Context: https://github.com/xamarin/xamarin-android/tree/release/7.0.1xx-preview7
Context: #7170

We branched for .NET 7 Preview 7, and there is already a Maestro bump
for .NET 7 RC 1.

Let's update xamarin-android/main's version number.
jonathanpeppers and others added 5 commits July 16, 2022 14:47
…220718.2

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-preview.7.22361.1 -> To Version 7.0.100-rc.1.22368.2

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.100-1.22354.1 -> To Version 7.0.100-1.22365.1 (parent: Microsoft.Dotnet.Sdk.Internal
GitHub desktop somehow messed this up, and didn't commit this file.
@jonathanpeppers
Copy link
Member

Ok, I'm confused how this test is failing on only some lanes:

image

Mono.Android.dll is increasing in size, only in some lanes?

 35,627 assemblies/Mono.Android.dll

@jonathanpeppers
Copy link
Member

Ok, maybe the failing ones are Xamarin.Android (not .NET 7) and something is broken in main.

@Youssef1313
Copy link
Member

@jonathanpeppers As a workaround for the size increase, you can try adding <LangVersion>10</LangVersion> in this property group https://github.com/xamarin/xamarin-android/blob/3781fc17e00a5cccb6d394c61f57bbbc73d67756/src/Mono.Android/Mono.Android.csproj#L7

@jonathanpeppers jonathanpeppers merged commit 938b2cb into main Jul 22, 2022
@jonathanpeppers jonathanpeppers deleted the darc-main-1a7fcdae-fd29-44ca-936b-bdbc39f54705 branch July 22, 2022 00:19
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 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.

4 participants