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

[release/7.0.1xx-rc1] Update dependencies from dotnet/installer #7310

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Aug 24, 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.22415.4 to 7.0.100-1.22423.4 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22421.12 to 7.0.0-rc.1.22423.16 (parent: Microsoft.Dotnet.Sdk.Internal)

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

  • Subscription: 87fa023c-e87e-46a2-d75a-08da808e3901
  • Build: 20220824.4
  • Date Produced: August 24, 2022 8:35:09 PM UTC
  • Commit: bcf1c82b2c5aa3a9bbfea49b62e214826e59fff2
  • Branch: refs/heads/release/7.0.1xx-rc1

fixes #7252

…220824.3

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22423.7 -> To Version 7.0.100-rc.1.22424.3

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref
 From Version 7.0.100-1.22415.4 -> To Version 7.0.100-1.22423.4 (parent: Microsoft.Dotnet.Sdk.Internal
Copy link
Member

@lewing lewing left a comment

Choose a reason for hiding this comment

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

versions look good for runtime and emsdk

* Add feeds in `NuGet.config` from our .NET 6 release branch
* Install both net6 & net7 workload manifests for Mono and Emscripten
* Extend both net6 & net7 Mono workloads
* Support for `$(AotAssemblies)` property (directly uses Mono workload pack names)
Comment on lines -17 to +22
"extends" : [ "microsoft-net-runtime-android", "microsoft-net-runtime-android-aot" ]
"extends" : [
"microsoft-net-runtime-android-net6",
"microsoft-net-runtime-android-aot-net6",
"microsoft-net-runtime-android",
"microsoft-net-runtime-android-aot"
]
Copy link
Member

Choose a reason for hiding this comment

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

@rolfbjarne you'll want to take similar changes here on the xamarin-macios side.

Copy link
Member

Choose a reason for hiding this comment

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

@jonathanpeppers I ended up doing something slightly different, I split it in two different workloads: https://gist.github.com/rolfbjarne/4c9f93d892837a9b13e9cd577f8554a7#file-workloadmanifest-json-L3-L37 - although I'm not sure if that will cause any problems? Should I out everything in the ios workload instead?

Copy link
Member

Choose a reason for hiding this comment

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

You might want to keep them all together for now. If you open a net6.0-ios project without a workload installed, this logic will prompt VS to install MAUI:

https://github.com/dotnet/sdk/blob/09b31215867d1ffe4955fd5b7cd91eb552d3632c/src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs#L24-L26

I don't think this code would work if there is an ios-net6 workload.

We might get them to rework this logic in .NET 7 RC 2, so that we can make the .NET 6 packs optional?

Copy link
Member

Choose a reason for hiding this comment

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

OK, I'll look into changing that tomorrow.

Copy link
Member

Choose a reason for hiding this comment

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

I've changed this in our cross/multi targeting PR for RC 1.

NuGet.config Outdated Show resolved Hide resolved
@jonathanpeppers
Copy link
Member

This is looking pretty green, I reran a couple phases.

The InstallAndroidDependenciesTest we can ignore, it's failing on main and other PRs.

dotnet-maestro bot and others added 3 commits August 25, 2022 13:11
…220824.4

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.1.22423.7 -> To Version 7.0.100-rc.1.22424.4

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref
 From Version 7.0.100-1.22415.4 -> To Version 7.0.100-1.22423.4 (parent: Microsoft.Dotnet.Sdk.Internal
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.

Only failures are:

 [BT : 1.8.1] error : Error retrieving device SDK version. Please try again.

And then InstallAndroidDependenciesTest.

Going to merge this one.

@jonathanpeppers jonathanpeppers merged commit 2bf5153 into release/7.0.1xx-rc1 Aug 25, 2022
@jonathanpeppers jonathanpeppers deleted the darc-release/7.0.1xx-rc1-f7b5e1cf-6bf3-4b35-a13a-74286993cc97 branch August 25, 2022 20:50
@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