[main] Update dependencies from 10 repositories #90517
Conversation
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?s=60&v=4){kind=small}
…0814.1 Microsoft.DotNet.ILCompiler , Microsoft.NET.ILLink.Tasks , Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , System.Text.Json From Version 8.0.0-rc.1.23406.6 -> To Version 8.0.0-rc.1.23414.1
…ence-packages build 20230808.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23381.3 -> To Version 8.0.0-alpha.1.23408.2
dotnet-maestro
bot
changed the title
lewing
added
the
area-Tools-ILLink
|
Tagging subscribers to this area: @agocke, @sbomer, @vitek-karas Issue DetailsThis pull request updates the following dependencies From https://github.com/dotnet/runtime
From https://github.com/dotnet/source-build-reference-packages
|
Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-rc.1.23414.3
dotnet-maestro
bot
changed the title
|
@sbomer looks like the illink task invocation in illink.targets now complains about the SDK not being recent enough:
Probably because of c13739b |
|
Looks like we're still using the latest ILLink package for the framework linking step. We can do one of:
I think 2. would be ideal, but might be better to do as a separate change. I suggest 1. as a short-term fix (I think this is fine for .NET 8 assuming we'll be using an RC version to build the final product). @vitek-karas @ViktorHofer @agocke any thoughts? |
|
(1) sounds fine as a quick fix, and I agree (2) is ideal. I would even say, if we have time, I would consider taking (2) as an infra-only change for .NET 8. But unblocking dependency flow is even more important. |
sbomer
force-pushed
the
darc-main-24d23629-0a47-41d9-bbc9-f3145469db0c
branch
from
02dd28c to
8c0dbf1
Compare
…14.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rc.1.23411.2 -> To Version 8.0.0-rc.1.23414.1
dotnet-maestro
bot
changed the title
…814.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23411.1 -> To Version 8.0.0-beta.23414.5 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23408.1 -> To Version 1.0.0-beta.23412.1 (parent: Microsoft.DotNet.Arcade.Sdk
dotnet-maestro
bot
changed the title
Microsoft.NETCore.Runtime.ICU.Transport From Version 8.0.0-rc.1.23407.2 -> To Version 9.0.0-alpha.1.23414.4
dotnet-maestro
bot
changed the title
…14.1 Microsoft.DotNet.Cecil From Version 0.11.4-alpha.23407.2 -> To Version 0.11.4-alpha.23414.1
dotnet-maestro
bot
changed the title
Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 8.0.100-rc.1.23415.5
dotnet-maestro
bot
changed the title
…822.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23411.1 -> To Version 8.0.0-beta.23422.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23408.1 -> To Version 1.0.0-beta.23418.1 (parent: Microsoft.DotNet.Helix.Sdk
…ld 20230823.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 8.0.0-beta.23408.1 -> To Version 8.0.0-beta.23423.1
…22.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.0-alpha.1.23415.2 -> To Version 9.0.0-alpha.1.23422.1
Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 9.0.100-alpha.1.23423.2
runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.23408.1 -> To Version 16.0.5-alpha.1.23414.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport
|
Looks like the only real failure left is from the source build leg: This kind of makes sense since we have a PackageReference to that package now, but we're using the same version that ships inside of the SDK. Not sure what to do about that one. |
|
@NikolaMilosavljevic - Can you help investigate/provide guidance? TIA |
I've reproed this locally - investigating... |
| <PropertyGroup> | ||
| <!-- Don't use the prebuilt illink that is referenced by Arcade. --> | ||
| <UsingToolMicrosoftNetILLinkTasks>false</UsingToolMicrosoftNetILLinkTasks> | ||
| </PropertyGroup> |
There was a problem hiding this comment.
This is the root cause of source-build failure. It is causing the usage of prebuilt version of Microsoft.Net.ILLink.Tasks package. Is this accidental? @akoeplinger @vikoeplinger
There was a problem hiding this comment.
These changes intentionally use the version of ILLink.Tasks that is referenced by the SDK in global.json (BundledNETCoreAppPackageVersion in https://github.com/dotnet/runtime/pull/90517/files#diff-361b24a1b39d592c236441b48457113d003aeb3bc03df5bbc0318fd0b2e05cd2R50-R53).
This packagereference is effectively equivalent to building with the SDK, with <UsingToolMicrosoftNetILLinkTasks>false</UsingToolMicrosoftNetILLinkTasks>. The packagereference was required as a workaround (see these comments), but I'd expect that for the purpose of source-build it is no different.
There was a problem hiding this comment.
I suspect this would would in the product source-build because the ILLink version we have in n-1 artifacts would be coherent with the SDK we use to build therefore it wouldn't be a prebuilt. During the repo leg this may need to be marked as an allowed prebuilt. This full product source build should be validated.
There was a problem hiding this comment.
I suspect this would would in the product source-build because the ILLink version we have in n-1 artifacts would be coherent with the SDK we use to build therefore it wouldn't be a prebuilt. During the repo leg this may need to be marked as an allowed prebuilt. This full product source build should be validated.
I'll validate full product build locally.
There was a problem hiding this comment.
I suspect this would would in the product source-build because the ILLink version we have in n-1 artifacts would be coherent with the SDK we use to build therefore it wouldn't be a prebuilt. During the repo leg this may need to be marked as an allowed prebuilt. This full product source build should be validated.
I'll validate full product build locally.
Full source-build is showing 20 prebuilts but not the one for Microsoft.Net.ILLink.Tasks. I'm unsure about this - @MichaelSimons
Here's the full list of prebuilts:
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="Microsoft.CodeAnalysis.Common" Version="4.7.0-3.23314.3" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-3.23314.3" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" IsDirectDependency="true" />
<Usage Id="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.7.0-3.23314.3" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23414.4" File="src/sdk/artifacts/source-build/self/src/artifacts/obj/Microsoft.NET.Build.Containers/project.assets.json" />
<Usage Id="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.1.23414.4" File="src/sdk/artifacts/source-build/self/src/artifacts/obj/Microsoft.NET.Build.Containers/project.assets.json" />
<Usage Id="Microsoft.Extensions.Logging" Version="8.0.0-rc.1.23414.4" File="src/sdk/artifacts/source-build/self/src/artifacts/obj/Microsoft.NET.Build.Containers/project.assets.json" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-rc.1.23414.4" File="src/sdk/artifacts/source-build/self/src/artifacts/obj/Microsoft.NET.Build.Containers/project.assets.json" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.Options" Version="8.0.0-rc.1.23414.4" File="src/sdk/artifacts/source-build/self/src/artifacts/obj/Microsoft.NET.Build.Containers/project.assets.json" />
<Usage Id="Microsoft.Extensions.Primitives" Version="8.0.0-rc.1.23414.4" File="src/sdk/artifacts/source-build/self/src/artifacts/obj/Microsoft.NET.Build.Containers/project.assets.json" />
<Usage Id="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-8.0.100-rc.1" Version="8.0.0-rc.1.23414.4" />
<Usage Id="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-8.0.100-rc.1" Version="8.0.0-rc.1.23414.4" />
<Usage Id="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-8.0.100-rc.1" Version="8.0.0-rc.1.23414.4" />
<Usage Id="System.Composition" Version="7.0.0" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="System.Composition.AttributedModel" Version="7.0.0" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="System.Composition.Convention" Version="7.0.0" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="System.Composition.Hosting" Version="7.0.0" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="System.Composition.Runtime" Version="7.0.0" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
<Usage Id="System.Composition.TypedParts" Version="7.0.0" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" />
There was a problem hiding this comment.
There is only one direct dependency coming from runtime
<Usage Id="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" IsDirectDependency="true" />
This is a result of #90340 which was addressed in #91006. I suspect the commit tested didn't have the fix. I think the test has proven this will not introduce a prebuilt in the product level source-build.
There was a problem hiding this comment.
There is only one direct dependency coming from runtime
<Usage Id="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3" File="src/runtime/artifacts/source-build/self/src/artifacts/obj/Microsoft.Extensions.Configuration.Binder.SourceGeneration/project.assets.json" IsDirectDependency="true" />This is a result of #90340 which was addressed in #91006. I suspect the commit tested didn't have the fix. I think the test has proven this will not introduce a prebuilt in the product level source-build.
Thanks - I'll work on a fix to add exclusion for ILLink.Tasks.
Microsoft.DotNet.ApiCompat.Task From Version 8.0.100-preview.7.23329.3 -> To Version 9.0.100-alpha.1.23424.6
|
I've pulled the latest changes and now I'm seeing two prebuilts: |
Something odd about this one because the version.details.xml is referencing a newer version - 9.0.100-alpha.1.23424.6 |
Doing another build - this might have been an issue with stale cache. |
I plan to try this for ILLink.Tasks: |
OK - that didn't work - how about? |
|
Your only option is wild cards - you can't reference msbuild props. I think 8.* is acceptable. |
|
Pushed the fix for source-build leg. |
ghost
locked as resolved and limited conversation to collaborators
This pull request updates the following dependencies
From https://github.com/dotnet/runtime
From https://github.com/dotnet/source-build-reference-packages
From https://github.com/dotnet/sdk
From https://github.com/dotnet/emsdk
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
From https://github.com/dotnet/arcade
From https://github.com/dotnet/icu
From https://github.com/dotnet/cecil
From https://github.com/dotnet/xharness
From https://github.com/dotnet/runtime-assets
From https://github.com/dotnet/hotreload-utils