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

Open
wants to merge 6 commits into
base: release/10.0.1xx-preview1
Choose a base branch
from

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

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.

4 participants