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

[release/10.0.1xx-preview1] Update dependencies from nuget/nuget.client #46361

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 28, 2025

This pull request updates the following dependencies

From https://github.com/nuget/nuget.client

  • Subscription: 49a98350-347f-47ae-be2e-050c0e8545b0
  • Build: 6.14.0.17
  • Date Produced: January 29, 2025 9:40:56 PM UTC
  • Commit: 4ccad7689eaf96f30d41709369bebc888e4a5db3
  • Branch: dev

…6.14.0.14

Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning
 From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.14
@dsplaisted dsplaisted requested a review from a team as a code owner January 29, 2025 00:09
dsplaisted and others added 3 commits January 28, 2025 21:50
Probably the change to not prune packages if there are no FrameworkReferences reverted this to the old behavior
…6.14.0.15

Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning
 From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.15
…6.14.0.17

Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning
 From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.17
@MiYanni
Copy link
Member

MiYanni commented Jan 30, 2025

@dotnet/source-build Some kind of synchronization issue.

@dsplaisted
Copy link
Member

/azp run dotnet-sdk-public-ci

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NikolaMilosavljevic
Copy link
Member

@dotnet/source-build Some kind of synchronization issue.

Patch conflict as it is not needed anymore - will remove it.

@NikolaMilosavljevic NikolaMilosavljevic requested review from a team as code owners January 31, 2025 16:31
@NikolaMilosavljevic
Copy link
Member

NikolaMilosavljevic commented Jan 31, 2025

New error in vmr sync is strange:

fail: Failed to synchronize repo sdk
      Failed to check out 46361/merge in /__w/1/vmr
      Exit code: 1
      Std err:
      error: Your local changes to the following files would be overwritten by checkout:
      	src/nuget-client/eng/Publishing.props
      Please commit your changes or stash them before you switch branches.
      Aborting

@premun can you help? This file was being modified with a patch, which I've now removed. What would be the root cause of this failure? Branch 46361/merge is in a local clone, there should not be any local changes to this file. Could this be related to the other issue with line-ending change, as this PR contains the change to this file that has modified the line-ending: https://github.com/NuGet/NuGet.Client/pull/6233/files

@mmitche
Copy link
Member

mmitche commented Feb 4, 2025

@dkurepa Was working on the sync issue and may have it figured out tomorrow.

@premun
Copy link
Member

premun commented Feb 4, 2025

@NikolaMilosavljevic I think it is a combination of those two and the CRLF EOLs while synchronizing on Linux, yes.

@premun
Copy link
Member

premun commented Feb 4, 2025

Oh, I noticed the patch contains 2 updates to the same file (eng/Publishing.props). That's another possible cause as we usually don't have that.

premun added a commit to premun/NuGet.Client that referenced this pull request Feb 4, 2025
This might help with the VMR sync problems we have in dotnet/sdk#46361
@premun premun force-pushed the darc-release/10.0.1xx-preview1-0ea97523-6b79-49bf-a1c9-6a3616027ea2 branch from 4862a5b to 1066240 Compare February 5, 2025 15:42
@premun premun force-pushed the darc-release/10.0.1xx-preview1-0ea97523-6b79-49bf-a1c9-6a3616027ea2 branch from 1066240 to 1314631 Compare February 5, 2025 15:44
@NikolaMilosavljevic
Copy link
Member

Is it possible to merge the patches that both target same file?

VMR sync worked after I added a second, dummy, patch. I presume this needs to be updated to unblock future syncs, is that correct?

@premun
Copy link
Member

premun commented Feb 5, 2025

@NikolaMilosavljevic yeah, your dummy patch worked but then you merged main and it stopped working again so I tried to resolve it with a single patch but had a few attempts where my git UI client generated invalid patches.

@premun
Copy link
Member

premun commented Feb 5, 2025

@NikolaMilosavljevic the latest commit seems to work - it just removes the offending line that had the spaces

@dsplaisted
Copy link
Member

@premek @NikolaMilosavljevic It looks like there's still a VMR sync error here. What do we need to do next to get this merge?

@premek
Copy link

premek commented Feb 5, 2025

@premun Wrong Přemek :)

@premun
Copy link
Member

premun commented Feb 6, 2025

I honestly don't understand what's going on here. The stage 1 job succeeds and the same container running the same image fails in the stage 2 job..

@premun
Copy link
Member

premun commented Feb 6, 2025

@NikolaMilosavljevic I believe you are unblocked now

@ViktorHofer
Copy link
Member

ViktorHofer commented Feb 6, 2025

@ericstj @nkolev92 a lot of NU1510 errors (package pruning) when building the stack now with a live SDK (stage2 source-build). I think we should temporarily NoWarn the warning in our repositories to get this change into P1. Thoughts? The VMR has a functionality to allow for that.

@MichaelSimons
Copy link
Member

I honestly don't understand what's going on here. The stage 1 job succeeds and the same container running the same image fails in the stage 2 job..

This looks like a potentially new NuGet check flowing in that is causing a build failure. The Stage 2 builds use the sdk/toolset built with stage 1. If new rules are added, they will expose any failures in stage 2.

    /__w/1/vmr/src/source-build-reference-packages/src/referencePackages/src/system.text.json/8.0.5/System.Text.Json.8.0.5.csproj : error NU1510: PackageReference System.Runtime.CompilerServices.Unsafe will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. [TargetFramework=net7.0]

This warning/error can be suppressed in SBRP to workaround the issue.

cc @NikolaMilosavljevic, @ellahathaway, @nkolev92

@ViktorHofer
Copy link
Member

ViktorHofer commented Feb 6, 2025

@MichaelSimons I expect more repositories to be impacted by NU1510. Any project that has a direct dependency on a pruned package would hit this. If you have time, sure start with SBRP and then fix case by case but I don't think that's a realistic option at this point for P1.

Updating

<NoWarn>%24(NoWarn);NU1903;$(RepoNoWarns)</NoWarn>
with the new warning code might be better to unblock the entire VMR at once.

@MichaelSimons
Copy link
Member

@MichaelSimons I expect more repositories to be impacted by NU1510. Any project that has a direct dependency on a pruned package would hit this. If you have time, sure start with SBRP and then fix case by case but I don't think that's a realistic option at this point for P1.

I am onboard with disabling across the board for P1.

@ViktorHofer
Copy link
Member

ViktorHofer commented Feb 6, 2025

Alternatively, it's also possible to disable the packaging pruning feature via a feature knob: <RestoreEnablePackagePruning>false</RestoreEnablePackagePruning> which could be passed in as a build knob. The feature got enabled by default via NuGet/NuGet.Client@2b3475a

@ericstj
Copy link
Member

ericstj commented Feb 6, 2025

I'd expect NU1510 to pop a lot. People often upgraded old packages to avoid CG warnings, and now those can be trimmed. We can temporarily NoWarn and then fix them asynchronously. @nkolev92 -- I think this will be a systemic problem with pruning in the first wave.

We should not disable pruning.

@nkolev92
Copy link
Contributor

nkolev92 commented Feb 6, 2025

Let's just no warn NU1510 temporarily.

I think this is likely to become noisy. This might be one of the candidates that we need to discuss whether to keep.
We can always just choose to enable the warning for .NET 10 only while keep pruning on for all.

I'm tracking that effort in https://github.com/nuget/client.engineering/issues/3111.

@ViktorHofer
Copy link
Member

ViktorHofer commented Feb 6, 2025

We agreed on suppressing NU1510 temporarily for P1 (this PR) and use the main dependency flow PR (#46290) to look into this more deeply to see how many repositories are affected.

Given that we have been doing a lot of work over the last months and years to get rid of netstandard1.x packages in most of our core stack repositories, I don't expect a ton of warnings.

@akoeplinger
Copy link
Member

New warnings/errors about NU1511 now:

/__w/1/vmr/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Formats.Asn1. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Text.Json. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Text.Encodings.Web. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.IO.Pipelines. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Diagnostics/ref/Microsoft.Extensions.Diagnostics.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Diagnostics.DiagnosticSource. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Text.Json. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Text.Encodings.Web. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.IO.Pipelines. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Reflection.Metadata. [/__w/1/vmr/src/runtime/Build.proj]
/__w/1/vmr/src/runtime/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj : error NU1511: Warning As Error: A ProjectReference cannot be pruned, System.Collections.Immutable. [/__w/1/vmr/src/runtime/Build.proj]
    0 Warning(s)
    41 Error(s)

@ViktorHofer ViktorHofer enabled auto-merge (squash) February 7, 2025 16:57
@ViktorHofer ViktorHofer merged commit 1e6a78d into release/10.0.1xx-preview1 Feb 7, 2025
31 checks passed
@ViktorHofer ViktorHofer deleted the darc-release/10.0.1xx-preview1-0ea97523-6b79-49bf-a1c9-6a3616027ea2 branch February 7, 2025 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.