Skip to content

[main] Update dependencies from dotnet/installer - #6986

Merged
jonathanpeppers merged 12 commits into
mainfrom
darc-main-04566ff0-1607-4087-8a3d-6d438ad46f9d
May 19, 2022
Merged

[main] Update dependencies from dotnet/installer#6986
jonathanpeppers merged 12 commits into
mainfrom
darc-main-04566ff0-1607-4087-8a3d-6d438ad46f9d

Conversation

@dotnet-maestro

@dotnet-maestrodotnet-maestroBot commented May 5, 2022

Copy link
Copy Markdown
Contributor

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.22173.2 to 7.0.100-1.22259.1 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.NETCore.App.Ref: from 7.0.0-preview.4.22172.7 to 7.0.0-preview.5.22258.4 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.3.22121.1 to 7.0.0-preview.4.22215.1 (parent: Microsoft.NETCore.App.Ref)

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

  • Subscription: 97ee8954-2ef3-4217-5719-08da2edb85ba
  • Build: 20220513.22
  • Date Produced: May 14, 2022 1:37:20 AM UTC
  • Commit: 2071f2cdca14396b68b38d719f291e3767f70d46
  • Branch: refs/heads/main

…220505.6
Microsoft.Dotnet.Sdk.Internal
From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22255.6
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.22173.2 -> To Version 7.0.100-1.22228.1 (parent: Microsoft.Dotnet.Sdk.Internal
@jonpryor

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jonathanpeppersjonathanpeppers left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't see dotnet/runtime@288de11 in the dotnet/runtime diff. So apps crash on launch...

I'll try getting a newer build.

@dotnet-maestro
dotnet-maestroBot requested a review from grendello as a code ownerMay 6, 2022 13:36
…220506.2
Microsoft.Dotnet.Sdk.Internal
From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22256.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.22173.2 -> To Version 7.0.100-1.22228.1 (parent: Microsoft.Dotnet.Sdk.Internal
@dotnet-maestro
dotnet-maestroBot requested a review from dellis1972 as a code ownerMay 6, 2022 19:10
@jonathanpeppers

Copy link
Copy Markdown
Member

Ignore above, it was a net6.0-android app. When testing net7.0-android apps, Debug builds work.

But a Release build logs this and then crashes after:

05-06 15:59:29.032 5556 5556 D Mono : AOT NOT FOUND: (wrapper managed-to-native) Interop/Globalization:<GetSortHandle>g____PInvoke__|10_0 (byte*,intptr*).

ndk-stack gives:

********** Crash dump: **********
Build fingerprint: 'google/redfin/redfin:12/SP2A.220305.012/8177914:user/release-keys'
#00 0x0000000000000000 <unknown>
#01 0x0000000000291de4 /data/app/~~ItthawCn0DOlo1Ki4imiRA==/com.companyname.foo-W3RWpuZlKreSEizITM-Dpg==/split_config.arm64_v8a.apk!libmonosgen-2.0.so (BuildId: 37b4820b2e370de25a652bab573817fa6b135ac1)
GlobalizationNative_GetSortHandle
/__w/1/s\src/native/libs/System.Globalization.Native/pal_collation.c:462:46
#02 0x000000000000f6d0 <anonymous:74e811b000>
Crash dump is completed

Full log: adb.txt

@jonathanpeppers

Copy link
Copy Markdown
Member

If I build this net7.0-android app with:

-c Release -r android-arm64 -p:RunAOTCompilation=false -p:PublishTrimmed=false

Then it works.

…220508.1
Microsoft.Dotnet.Sdk.Internal
From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22258.1
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.22173.2 -> To Version 7.0.100-1.22228.1 (parent: Microsoft.Dotnet.Sdk.Internal
@marek-safar

Copy link
Copy Markdown
Contributor

This is tracked as dotnet/linker#2759

dotnet-maestroBotand others added 5 commits May 10, 2022 13:26
…220510.3
Microsoft.Dotnet.Sdk.Internal
From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22260.3
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.22173.2 -> To Version 7.0.100-1.22259.1 (parent: Microsoft.Dotnet.Sdk.Internal
…220513.22
Microsoft.Dotnet.Sdk.Internal
From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22263.22
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.22173.2 -> To Version 7.0.100-1.22259.1 (parent: Microsoft.Dotnet.Sdk.Internal
 Conflicts:
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
src/monodroid/jni/monodroid-glue.cc
Some of these were just from the merge conflicts in main
@jonathanpeppers

Copy link
Copy Markdown
Member

Commit message, as I think this might be green after I retried some test phases:

Bump to dotnet/installer/main@2071f2c 7.0.100-preview.5.22263.22
Changes: https://github.com/dotnet/installer/compare/c7afae6...2071f2c
Changes: https://github.com/dotnet/linker/compare/04c49c9...b9c9da2
Changes: https://github.com/dotnet/runtime/compare/c5d40c9...3e5517b
Changes: https://github.com/dotnet/emsdk/compare/b8e7143...f41e658
Updates:
* Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.4.22174.1 to 7.0.100-preview.5.22263.22
* Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22173.2 to 7.0.100-1.22259.1
* Microsoft.NETCore.App.Ref: from 7.0.0-preview.4.22172.7 to 7.0.0-preview.5.22258.4
* Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.3.22121.1 to 7.0.0-preview.4.22215.1
~~ Changes ~~
We can use `mono_opt_aot_lazy_assembly_load` now, as this change is in
this .NET 7 version.
Updated `.apkdesc` files, since `.apk` size has improved (gotten smaller).
~~ Known Issues ~~
* Force invariant globalization by default to workaround:
https://github.com/dotnet/linker/issues/2759
* Ignore tests that were hitting `InvalidProgramException`:
https://github.com/dotnet/linker/issues/2799

@jonathanpeppers
jonathanpeppers merged commit b250c04 into mainMay 19, 2022
@jonathanpeppers
jonathanpeppers deleted the darc-main-04566ff0-1607-4087-8a3d-6d438ad46f9d branch May 19, 2022 13:36
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jan 24, 2024
Sign up for freeto 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

@jonpryor@jonathanpeppers@marek-safar@grendello