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 #42900

Merged
merged 7 commits into from
Aug 29, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Aug 21, 2024

This pull request updates the following dependencies

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

  • Subscription: 3d9043af-0e17-4eb5-f3e3-08d8e97c775d
  • Build: 20240826.3
  • Date Produced: August 26, 2024 5:01:25 PM UTC
  • Commit: e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4
  • Branch: refs/heads/main

…820.6

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24416.2 -> To Version 9.0.0-beta.24420.6
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Aug 21, 2024
…821.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24420.6 -> To Version 9.0.0-beta.24421.2
@v-wuzhai v-wuzhai requested a review from a team August 22, 2024 08:48
…821.7

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24421.2 -> To Version 9.0.0-beta.24421.7
@dsplaisted
Copy link
Member

This is complaining about 11 new prebuilts:

/vmr/repo-projects/Directory.Build.targets(764,5): warning : 11 new packages used not in baseline! See report at /vmr/artifacts/prebuilt-report/baseline-comparison.xml for more information. Package IDs are: [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Commands.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Common.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Configuration.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Credentials.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.DependencyResolver.Core.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Frameworks.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.LibraryModel.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Packaging.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.ProjectModel.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Protocol.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : NuGet.Versioning.6.11.0 [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : Prebuilt usages are different from the baseline. If detected changes are acceptable, update baseline with: [/vmr/repo-projects/dotnet.proj]
/vmr/repo-projects/Directory.Build.targets(764,5): warning : cp '/vmr/artifacts/prebuilt-report/generated-new-baseline.xml' '/vmr/eng/tools/prebuilt-baseline.xml' [/vmr/repo-projects/dotnet.proj]

@dotnet/source-build-internal Can you fix / route appropriately?

@ellahathaway
Copy link
Member

@dotnet/source-build-internal Can you fix / route appropriately?

Looking

@ellahathaway
Copy link
Member

This is a result of dotnet/arcade#15010 - we have 6.8.1 versions of these packages in SBRP but not 6.11.0. I'll look into adding these to SBRP for main and 9.0 branches.

These weren't caught as prebuilts in arcade because we currently have an exclusion there for nuget: https://github.com/dotnet/arcade/blob/c8b7f328217240087a32e5dc9877b616ed96b7d8/eng/SourceBuildPrebuiltBaseline.xml#L7

…823.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24421.7 -> To Version 9.0.0-beta.24423.2
@ellahathaway
Copy link
Member

Fix has been merged - once the SBRP reference is updated in sdk, merge in main and the prebuilt errors should be resolved.

…826.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24423.2 -> To Version 9.0.0-beta.24426.3
@dsplaisted
Copy link
Member

Fix has been merged - once the SBRP reference is updated in sdk, merge in main and the prebuilt errors should be resolved.

I'm not sure I follow. I know something was fixed in Arcade, but are you saying we also need to make a change in the SDK, or just wait for Arcade to flow, or what? Thanks.

@ellahathaway
Copy link
Member

ellahathaway commented Aug 27, 2024

are you saying we also need to make a change in the SDK

Yes, we need to update the SBRP reference in sdk in order to fix the errors.

In short, some packages were bumped in arcade and because SBRP did not contain those packages, they were detected as prebuilts when building the VMR. The fix was to add these packages to SBRP + then flow that into sdk (since the VMR builds out of SDK).

#43019 contains the fix from SBRP, so we need that be merged to fix the issues in this PR.

@dotnet-maestro dotnet-maestro bot merged commit 7f4f157 into main Aug 29, 2024
41 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-ae075de8-51b0-42ab-9119-2ac422e989df branch August 29, 2024 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants