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

Merged
merged 11 commits into from
Feb 26, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Feb 20, 2025

This pull request updates the following dependencies

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

  • Updates to .NET SDKs:
    • Updates sdk.version to 10.0.100-preview.3.25125.5
    • Updates tools.dotnet to 10.0.100-preview.3.25125.5

…219.2

Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25119.2
@ViktorHofer
Copy link
Member

@ericstj would you mind reviewing my commits in this PR which resolve NU1511 warnings?

<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and ('$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi')">true</DebuggerSupport>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- This test library intentionally references an inbox P2P as it needs the implementation, instead of the contract.
Suppress the NU1511 warning in the whole project as putting it on a P2P doesn't work: https://github.com/NuGet/Home/issues/14121 -->
<NoWarn>$(NoWarn);NU1511</NoWarn>
Copy link
Member

@ericstj ericstj Feb 21, 2025

Choose a reason for hiding this comment

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

Good issue 👍

Another way we could workaround this in runtime centrally would be to have a target that runs during restore and removes the PrunePackageReference items that overlap with ProjectReference. Something like

  <Target Name="_RemoveProjectPrunePackageReferences" AfterTargets="AddPrunePackageReferences">
    <ItemGroup>
      <PrunePackageReference Remove="@(ProjectReference->'%(FileName)')" />
    </ItemGroup>
  </Target>

Copy link
Member

@ericstj ericstj left a comment

Choose a reason for hiding this comment

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

All the cleanup looks great. Consider my minor suggestion as an alternative to NoWarn if you think it might make things easier to maintain.

@lewing
Copy link
Member

lewing commented Feb 21, 2025

@maraf @ilonatommy please take a look at the fingerprinting test failure from the latest sdk

@maraf
Copy link
Member

maraf commented Feb 22, 2025

I have unblocked the WBT and opened #112814 to evaluate the test

…220.6

Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25120.6
dotnet-maestro bot and others added 2 commits February 24, 2025 15:07
…224.2

Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25124.2
dotnet-maestro bot and others added 2 commits February 25, 2025 20:54
…225.2

Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25125.2
@jkoritzinsky jkoritzinsky merged commit 3d9e014 into main Feb 26, 2025
156 of 159 checks passed
@jkoritzinsky jkoritzinsky deleted the darc-main-a7ab8d6e-8856-41c6-bbbe-b58a2b4ccb84 branch February 26, 2025 18:53
@am11
Copy link
Member

am11 commented Feb 27, 2025

p3 is currently running into dotnet/msbuild#11515, should we revert back to p1 until that fix propagates to p3?

@akoeplinger
Copy link
Member

@am11 you can use -tl:off to workaround it

@am11
Copy link
Member

am11 commented Feb 27, 2025

Yup that's working. Pure magic 👍

@am11
Copy link
Member

am11 commented Mar 3, 2025

10.0.100-preview.3.25153.3 has the fix.

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

Successfully merging this pull request may close these issues.

7 participants