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.

Sign up for GitHub

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

Jump to bottom

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

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

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

wants to merge 9 commits into from
+82 −118

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 28, 2025 •
edited
Loading

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

@dotnet-maestro
Update dependencies from https://github.com/nuget/nuget.client build …
d4d0438 
…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
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-CodeFlow untriaged Request triage from a team member labels Jan 28, 2025
This was referenced Jan 28, 2025
Open
Open
Open
@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
@dsplaisted
Revert removal of workaround
d992386 
Probably the change to not prune packages if there are no FrameworkReferences reverted this to the old behavior
@dotnet-maestro
Update dependencies from https://github.com/nuget/nuget.client build …
e4d9f6a 
…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
@dotnet-maestro
Update dependencies from https://github.com/nuget/nuget.client build …
9e93af5 
…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
This was referenced Jan 30, 2025
Open
Open
Open
@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

@azure-pipelines Azure Pipelines
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 •
edited
Loading

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
@premun
Remove extra spaces in Publishing.props
a4ab845 
This might help with the VMR sync problems we have in dotnet/sdk#46361
@premun premun mentioned this pull request Feb 4, 2025
Merged
@premun
Copy link
Member

premun commented Feb 4, 2025 •
edited
Loading

This PR fixes the file and I got the synchronization working: NuGet/NuGet.Client#6251

@ericstj
Copy link
Member

ericstj commented Feb 4, 2025

@premun do you need NuGet.Client to flow, or can you patch here to unblock? Seems like flowing might take more time and risk Preview1.

@premun
Copy link
Member

premun commented Feb 4, 2025 •
edited
Loading

I think this needs to flow. We could try adding a patch that would just do something banal to the file. Like adding a comment or so. That might do the trick.

Or we can try creating a patch from my PR too.

@nkolev92
Copy link
Contributor

nkolev92 commented Feb 4, 2025

Or we can try creating a patch from my PR too.

Can you try that @premun?

@premun
Copy link
Member

premun commented Feb 4, 2025

@NikolaMilosavljevic/@mmitche can you try forming a patch from NuGet/NuGet.Client#6251 and adding it back here (keep the old patch file that was removed in this PR possibly). I think it might unblock us. I won't have time today to try that.

@premun
Copy link
Member

premun commented Feb 4, 2025

I can try, but tomorrow

nkolev92 pushed a commit to NuGet/NuGet.Client that referenced this pull request Feb 4, 2025
@premun
Remove extra spaces in Publishing.props (#6251)
b410acc 
This might help with the VMR sync problems we have in dotnet/sdk#46361
@NikolaMilosavljevic
Copy link
Member

@NikolaMilosavljevic/@mmitche can you try forming a patch from NuGet/NuGet.Client#6251 and adding it back here (keep the old patch file that was removed in this PR possibly). I think it might unblock us. I won't have time today to try that.

OK, I'm going to try that.

@NikolaMilosavljevic
Copy link
Member

Pushed the patch for NuGet/NuGet.Client#6251

I don't think we need the old patch, as it is not applicable anymore and would fail to apply during vmr-sync.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkolev92 nkolev92 nkolev92 approved these changes

Assignees
No one assigned
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@MiYanni @dsplaisted @NikolaMilosavljevic @mmitche @premun @ericstj @nkolev92