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

Remove extra spaces in Publishing.props #6251

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Conversation

premun
Copy link
Contributor

@premun premun commented Feb 4, 2025

This removes some extraneous whitespace characters introduced in #6233.
The VMR synchronization has problems with these thanks to the CRLF in this repo and we are unable to remove a patch for this in dotnet/sdk#46361

This might help with the VMR sync problems we have in dotnet/sdk#46361
@premun premun requested a review from a team as a code owner February 4, 2025 13:42
@microsoft-github-policy-service microsoft-github-policy-service bot added the Community PRs created by someone not in the NuGet team label Feb 4, 2025
@premun
Copy link
Contributor Author

premun commented Feb 4, 2025

@ViktorHofer @mmitche @NikolaMilosavljevic this fixes the VMR synchronization issues from dotnet/sdk#46361

@premun
Copy link
Contributor Author

premun commented Feb 4, 2025

@jeffkl can you help us merge this please?

@mmitche
Copy link
Contributor

mmitche commented Feb 4, 2025

@premun Is there a longer term fix that we can do on the Maestro side?

@premun
Copy link
Contributor Author

premun commented Feb 4, 2025

Possibly. I think this started happening with newer git as I cannot reproduce it on a similar Linux image with older one.
I think it's something about how git handles whitespace during patch creation/application. But it might be quite risky. It might be possibly only the combination of a VMR patch + a change + patch removal.

@nkolev92 nkolev92 enabled auto-merge (squash) February 4, 2025 16:33
@nkolev92 nkolev92 self-assigned this Feb 4, 2025
@nkolev92
Copy link
Member

nkolev92 commented Feb 4, 2025

@NuGet/nuget-client

I've enable auto-merged for this since it's the infra issues might be blocking .NET 10 P1.

@premun
Copy link
Contributor Author

premun commented Feb 4, 2025

/azp run NuGet.Client-PrivateDev

Copy link

Commenter does not have sufficient privileges for PR 6251 in repo NuGet/NuGet.Client

@nkolev92
Copy link
Member

nkolev92 commented Feb 4, 2025

It's already running, I kicked that off.

@premun do you need another code flow from NuGet to fix dotnet/sdk#46361?
Is there any way it can be unblocked without this PR?

@premun
Copy link
Contributor Author

premun commented Feb 4, 2025

If we can have another code flow, it would be great as I am at the end of my working day.

Or we can try creating a patch from this PR and adding it to dotnet/sdk#46361 - it might just work

@nkolev92 nkolev92 merged commit b410acc into NuGet:dev Feb 4, 2025
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Community PRs created by someone not in the NuGet team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants