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

[net7.0] Update dependencies from xamarin/xamarin-android #14673

Merged
merged 15 commits into from Jun 21, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Apr 19, 2023

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.Dotnet.Sdk.Internal: from 7.0.203-servicing.23170.23 to 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows)
    • Microsoft.NETCore.App.Ref: from 7.0.5 to 7.0.6 (parent: Microsoft.Android.Sdk.Windows)
    • Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100: from 7.0.5 to 7.0.6 (parent: Microsoft.NETCore.App.Ref)
    • Microsoft.NETCore.App.Ref: from 7.0.5 to 7.0.6 (parent: Microsoft.Android.Sdk.Windows)
    • Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100: from 7.0.5 to 7.0.6 (parent: Microsoft.NETCore.App.Ref)

From https://github.com/xamarin/xamarin-android

  • Subscription: 32c82615-b126-403a-5097-08da86083637
  • Build: 7.0.2xx-d684c649e5129d390e59dd7c835b547e2d19f83a-1
  • Date Produced: May 30, 2023 6:04:57 PM UTC
  • Commit: d684c649e5129d390e59dd7c835b547e2d19f83a
  • Branch: refs/heads/release/7.0.2xx

…uild 7.0.2xx-754b12ac0202a4d3469b3fbdf8d731603b5d2bb3-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.53

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.5 -> To Version 7.0.6 (parent: Microsoft.Android.Sdk.Windows
@ghost ghost added the area/infrastructure 🏗️ CI, Maestro / Coherency label Apr 19, 2023
…uild 7.0.2xx-8d8b77f07771b53281fc93cd47de1d83562e28d6-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.54

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
@jsuarezruiz
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@rmarinho
Copy link
Member

rmarinho commented Apr 20, 2023

Humm failing

microsoft.netcore.app.runtime.mono.android-arm::6.0.17

missing a feed @jonathanpeppers ?

@jonathanpeppers
Copy link
Member

Yes there is an example in the diff: xamarin/xamarin-android@dc07f98...8d8b77f

@rmarinho
Copy link
Member

Do we know when this is going to ship 7.0.6 for example? I m asking this because i need to coordinate with xcode 14.3 bump? can i merge everything and when we have to release XCODE support this can be shipped too?

@dalexsoto do we have a date to ship xcode 14.3 support?

@rmarinho
Copy link
Member

Ok i got a date May 9th for the release of 7.0.6. So the question is are we shipping XCode before?

@rmarinho rmarinho added the do-not-merge Don't merge this PR label Apr 20, 2023
dotnet-maestro bot and others added 3 commits April 25, 2023 21:58
…uild 7.0.2xx-a693bc5e14b692e6ee42752da9da7cfc7a1b160b-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.55

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
…uild 7.0.2xx-837ca0d841a5b57ff34caa1e74829a4f1aa1bdb2-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.56

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
@rmarinho rmarinho removed the do-not-merge Don't merge this PR label Apr 28, 2023
@rmarinho rmarinho added the do-not-merge Don't merge this PR label May 9, 2023
…uild 7.0.2xx-d96a7a1ae693b4fbe7c3eb7319106066c72d439b-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.59

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
…uild 7.0.2xx-61bb272226569775e76514da4e7c576c729a2e44-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.64

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
…uild 7.0.2xx-22dd65a897c9773499e146dde00affc004ae98e8-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.65

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
…uild 7.0.2xx-e66f469fc4ae6dcb76828aff8f6106cc25714c53-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.67

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
…uild 7.0.2xx-a7e0eff127904fe24804423572ac38864346d200-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.68

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
…uild 7.0.2xx-d684c649e5129d390e59dd7c835b547e2d19f83a-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.52 -> To Version 33.0.69

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.203-servicing.23170.23 -> To Version 7.0.204-servicing.23214.3 (parent: Microsoft.Android.Sdk.Windows
@rmarinho rmarinho enabled auto-merge (squash) June 19, 2023 16:59
@rmarinho
Copy link
Member

@jonathanpeppers seems this is hitting some issues building the templates with net7.0, seems to only happen release/windows, they work on debug/windows and on mac works fine

Build FAILED.

D:\a\_work\1\s\bin\dotnet\sdk\7.0.204\Sdks\Microsoft.NET.ILLink.Tasks\build\Microsoft.NET.ILLink.targets(133,5): error MSB6006: "dotnet.exe" exited with code 57005. [D:\a\_work\_temp\templatesTest\maui_DotNet\maui_DotNet.csproj::TargetFramework=net7.0-android]
D:\a\_work\1\s\bin\dotnet\sdk\7.0.204\Sdks\Microsoft.NET.ILLink.Tasks\build\Microsoft.NET.ILLink.targets(86,5): error NETSDK1144: Optimizing assemblies for size failed. Optimization can be disabled by setting the PublishTrimmed property to false. [D:\a\_work\_temp\templatesTest\maui_DotNet\maui_DotNet.csproj::TargetFramework=net7.0-android]
    0 Warning(s)
    2 Error

@jonathanpeppers
Copy link
Member

This looks like the same thing we saw before, that the DOTNET_gcServer=0 works around?

Can you just set it in yaml for the whole pipeline in one place? Workstation GC is the default anyway, and for some reason the linker opts into this custom setting.

It seems like it might already be fixed in .NET 8, I removed it in main here: xamarin/xamarin-android@622abe1

@rmarinho
Copy link
Member

Seems this wasn't updated with latest net7.0? branch, trying again with the merge. and seems with that fix, it runs when workloads are installed so should be add always

@rmarinho rmarinho removed the do-not-merge Don't merge this PR label Jun 21, 2023
@rmarinho rmarinho merged commit bf919ec into net7.0 Jun 21, 2023
30 checks passed
@rmarinho rmarinho deleted the darc-net7.0-ad7d9b62-670f-4efa-bb12-3747211bcfd1 branch June 21, 2023 14:11
@github-actions github-actions bot locked and limited conversation to collaborators Dec 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants