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/arcade #86494

Merged
merged 10 commits into from
May 31, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

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

This pull request updates the following dependencies

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

  • Subscription: c32383ee-d79c-4435-5b63-08d8d8feb47e
  • Build: 20230530.1
  • Date Produced: May 30, 2023 2:56:32 PM UTC
  • Commit: affe3f66d36e48946fd59ac9fa31b004cb558e7d
  • Branch: refs/heads/main

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.XliffTasks: from 1.0.0-beta.23266.1 to 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk)

…519.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.23268.1 -> To Version 8.0.0-beta.23269.1
…519.2

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.23268.1 -> To Version 8.0.0-beta.23269.2
@lewing lewing added the source-build Issues relating to dotnet/source-build label May 23, 2023
@lewing
Copy link
Member

lewing commented May 23, 2023

cc @dotnet/source-build-contrib

@ViktorHofer
Copy link
Member

ViktorHofer commented May 23, 2023

Will take a look. Related to my change in Arcade.

@ViktorHofer
Copy link
Member

@MichaelSimons @mthalman @oleksandr-didyk I need help with understanding this issue (https://dev.azure.com/dnceng-public/public/_build/results?buildId=280839&view=logs&jobId=e4a6e402-3c79-58b1-6b2c-6d6de3128627&j=e4a6e402-3c79-58b1-6b2c-6d6de3128627&t=4977add1-8c56-5a7c-efa0-f1d583109a84):

Could not load file or assembly 'Microsoft.CodeAnalysis, Version=4.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'. Reference assemblies cannot be loaded for execution. (0x80131058)

Why does GenFacades use a Microsoft.CodeAnalysis from SBRP? I would expect it to use the N-1.

@ViktorHofer ViktorHofer added the blocked Issue/PR is blocked on something - see comments label May 24, 2023
@MichaelSimons
Copy link
Member

@MichaelSimons @mthalman @oleksandr-didyk I need help with understanding this issue (https://dev.azure.com/dnceng-public/public/_build/results?buildId=280839&view=logs&jobId=e4a6e402-3c79-58b1-6b2c-6d6de3128627&j=e4a6e402-3c79-58b1-6b2c-6d6de3128627&t=4977add1-8c56-5a7c-efa0-f1d583109a84):

Could not load file or assembly 'Microsoft.CodeAnalysis, Version=4.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'. Reference assemblies cannot be loaded for execution. (0x80131058)

Why does GenFacades use a Microsoft.CodeAnalysis from SBRP? I would expect it to use the N-1.

This sounds like a regression caused from the prebuilt work. A Version.Details.xml dependency should be added so the N-1 version is used versus an SBRP. Please open an issue. This would likely surface in the source-build product build with dotnet/installer#16111.

@oleksandr-didyk
Copy link
Contributor

A Version.Details.xml dependency should be added so the N-1 version is used versus an SBRP

But wouldn't this hold true only for the product build? When building the intermediate, Arcade would still use 4.4.0 from SBRP, no?

@MichaelSimons
Copy link
Member

But wouldn't this hold true only for the product build? When building the intermediate, Arcade would still use 4.4.0 from SBRP, no?

Not with the per repo pvp work coming in with dotnet/installer#16111. With that work, we will only lift the dependencies specified in the version.details.xml. If the dependency isn't specified, source-build will use what the repo has specified, meaning an SBRP will be utilized.

When building the source-build repo leg, if the dependency is declared in the version.details.xml, it will pull in the intermediate (e.g. N-1). If the dependency is not declared, an SBRP will be used.

@oleksandr-didyk
Copy link
Contributor

oleksandr-didyk commented May 24, 2023

When building the source-build repo leg, if the dependency is declared in the version.details.xml, it will pull in the intermediate (e.g. N-1). If the dependency is not declared, an SBRP will be used.

Oh, my bad, I for some reason thought you meant declaring it in Version.Details.xml with the 4.4.0 version instead of N-1

@ViktorHofer
Copy link
Member

This sounds like a regression caused from the prebuilt work. A Version.Details.xml dependency should be added so the N-1 version is used versus an SBRP.

I assume this needs to be done in arcade so that the N-1 Microsoft.CodeAnalysis is used when building Microsoft.DotNet.GenFacades?

@MichaelSimons
Copy link
Member

This sounds like a regression caused from the prebuilt work. A Version.Details.xml dependency should be added so the N-1 version is used versus an SBRP.

I assume this needs to be done in arcade so that the N-1 Microsoft.CodeAnalysis is used when building Microsoft.DotNet.GenFacades?

Correct.

@ViktorHofer
Copy link
Member

ViktorHofer commented May 24, 2023

Blocked by dotnet/arcade#13681

…524.6

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.23268.1 -> To Version 8.0.0-beta.23274.6
…525.2

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.23268.1 -> To Version 8.0.0-beta.23275.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk
…526.2

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.23268.1 -> To Version 8.0.0-beta.23276.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk
dotnet-maestro bot added 2 commits May 28, 2023 12:10
…527.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.23268.1 -> To Version 8.0.0-beta.23277.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk
…529.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.23268.1 -> To Version 8.0.0-beta.23279.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk
…529.4

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.23268.1 -> To Version 8.0.0-beta.23279.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk
…530.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.23268.1 -> To Version 8.0.0-beta.23280.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk
@ViktorHofer ViktorHofer removed the blocked Issue/PR is blocked on something - see comments label May 30, 2023
@ViktorHofer ViktorHofer merged commit 1345190 into main May 31, 2023
@ViktorHofer ViktorHofer deleted the darc-main-4788e293-2d09-49c7-8768-0ab101c71752 branch May 31, 2023 05:16
@ghost ghost locked as resolved and limited conversation to collaborators Jun 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow source-build Issues relating to dotnet/source-build
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants