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/sdk #9395

Draft
wants to merge 41 commits into
base: main
Choose a base branch
from

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 14, 2024

Coherency update: Failed to perform coherency update for one or more dependencies. Please review the GitHub checks or run darc update-dependencies --coherency-only locally against darc-main-714b3296-586d-442c-9958-cb73c20d69cb for more information.

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.NETCore.App.Ref: from 9.0.0-rtm.24510.3 to 10.0.0-alpha.1.24619.8 (parent: Microsoft.NET.Sdk)
    • Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport: from 10.0.0-alpha.1.24575.2 to 10.0.0-alpha.1.24613.1 (parent: Microsoft.NETCore.App.Ref)
    • Microsoft.NET.ILLink.Tasks: from 9.0.0-rtm.24510.3 to 10.0.0-alpha.1.24619.8 (parent: Microsoft.NET.Sdk)

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

  • Subscription: 72348f96-04eb-450b-86c3-d2a4f68e3279
  • Build: 20241220.2
  • Date Produced: December 20, 2024 11:35:50 AM UTC
  • Commit: bf452b9e2c47b6cb09c54ff0f44bc90d2a24636b
  • Branch: refs/heads/main

Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24510.13
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.

This is WIP for testing .NET 10 builds. We shouldn't merge until we've branched for .NET 9 GA.

@jonathanpeppers jonathanpeppers added the do-not-merge PR should not be merged. label Oct 14, 2024
@jonathanpeppers jonathanpeppers marked this pull request as draft October 14, 2024 17:43
dotnet-maestro bot and others added 14 commits October 16, 2024 19:47
Microsoft.NET.Sdk
 From Version 10.0.100-alpha.1.24510.13 -> To Version 10.0.100-alpha.1.24524.9

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil
 From Version 10.0.0-alpha.1.24507.22 -> To Version 10.0.0-alpha.1.24523.5 (parent: Microsoft.NET.Sdk
Looking up build with BAR id 243767
Updating 'Microsoft.Android.Sdk.Windows': '34.0.145' => '35.0.7' (from build '9.0.1xx-278e101698269c9bc8840aa94d72e7f24066a96d-1' of 'https://github.com/dotnet/android')
Checking for coherency updates...
Local dependencies updated based on build with BAR id 243767 (9.0.1xx-278e101698269c9bc8840aa94d72e7f24066a96d-1 from https://github.com/dotnet/android@release/9.0.1xx)
Fixes the error:

    error NETSDK1045: The current .NET SDK does not support targeting .NET 9.0.
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24553.6

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24552.2 (parent: Microsoft.NET.Sdk
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable') ">
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable') ">
Copy link
Member

Choose a reason for hiding this comment

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

TODO: change this to AutoImport.in.props and fill in 10.0 dynamically.

jonathanpeppers and others added 8 commits November 8, 2024 14:20
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24560.6

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24557.1 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24568.3

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24565.3 (parent: Microsoft.NET.Sdk
Hopefully, avoids the error on `MAUI Integration` lane:

    error NU1102: Unable to find package Microsoft.NETCore.App.Ref with version (= 9.0.1)
jonathanpeppers pushed a commit that referenced this pull request Nov 22, 2024
In order to bump the stable version of .NET used in `Java.Interop` to
.NET 9 we need to bump it here first.

Originally this was going to be done with the bump to targeting .NET
10, however that [PR][0] is
waiting on fix(es) from other team(s) so we'll do this bump separately
to unblock `Java.Interop`.

[0]: #9395
jonathanpeppers and others added 2 commits November 22, 2024 10:27
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24573.1

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24570.9 (parent: Microsoft.NET.Sdk
@jonathanpeppers
Copy link
Member

jonathanpeppers commented Dec 2, 2024

dotnet-maestro bot and others added 9 commits December 6, 2024 09:03
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24605.38
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24609.2
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24609.4
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24612.16

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24610.2 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24616.1

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24613.10 (parent: Microsoft.NET.Sdk
pjcollins pushed a commit that referenced this pull request Dec 19, 2024
In order to bump the stable version of .NET used in `Java.Interop` to
.NET 9 we need to bump it here first.

Originally this was going to be done with the bump to targeting .NET
10, however that [PR][0] is
waiting on fix(es) from other team(s) so we'll do this bump separately
to unblock `Java.Interop`.

[0]: #9395
dotnet-maestro bot and others added 6 commits December 20, 2024 11:01
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24620.1

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24619.8 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24620.2
@akoeplinger
Copy link
Member

akoeplinger commented Dec 20, 2024

Looks like it's failing because the workload-dependencies.csproj still targets net9.0. You could install the 9.0 runtime into the sdk you download to fix that, i.e. in addition to the 10.0 runtime that is included in the 10.0 sdk. Step_InstallDotNetPreview.cs already seems to support installing runtimeOnly.

@jonathanpeppers
Copy link
Member

jonathanpeppers commented Dec 20, 2024

Looks like it's failing because the workload-dependencies.csproj still targets net9.0. You could install the 9.0 runtime into the sdk you download to fix that, i.e. in addition to the 10.0 runtime that is included in the 10.0 sdk. Step_InstallDotNetPreview.cs already seems to support installing runtimeOnly.

It looks like we use $(RollForward) to fix this in other places, going to try that. This tool doesn't really matter what runtime it runs under.

@jonathanpeppers
Copy link
Member

/azp run

@dotnet dotnet deleted a comment from azure-pipelines bot Dec 20, 2024
@jonathanpeppers jonathanpeppers removed the do-not-merge PR should not be merged. label Dec 20, 2024
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants