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

Add comment for coordinating with other .NET repos for relevant deps #6024

Closed
wants to merge 1 commit into from

Conversation

aortiz-msft
Copy link
Contributor

@aortiz-msft aortiz-msft commented Sep 11, 2024

Description

As a follow up to dotnet/sdk#43339, add a comment for coordinating with other .NET repos for relevant dependencies:

  1. msbuild assemblies
  2. System.Text.Json
  3. System.Collections.Immutable
  4. System.Reflection.Metadata
  5. System.Reflection.MetadataLoadContext

PR Checklist

  • Meaningful title, helpful description and a linked NuGet/Home issue
  • Added tests - N/A
  • Link to an issue or pull request to update docs if this PR changes settings, environment variables, new feature, etc. - N/A

@aortiz-msft aortiz-msft requested a review from a team as a code owner September 11, 2024 23:01
<NewtonsoftJsonPackageVersion Condition="'$(NewtonsoftJsonPackageVersion)' == ''">13.0.3</NewtonsoftJsonPackageVersion>
<SystemFormatsAsn1PackageVersion Condition="'$(SystemFormatsAsn1PackageVersion)' == ''">8.0.1</SystemFormatsAsn1PackageVersion>

<!-- Do not update the version of System.Text.Json without explicit approval from the .NET SDK and .NET MsBuild repo owners. -->
Copy link
Contributor

@kartheekp-ms kartheekp-ms Sep 11, 2024

Choose a reason for hiding this comment

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

At a quick glance, I was unable to identify the changes proposed in this pull request. Therefore, I am adding this review comment to help team members understand the proposed changes. In summary, the <!-- Do not update the version of System.Text.Json without explicit approval from the .NET SDK and .NET MsBuild repo owners. --> comment has been added in this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, Kartheek. Why is this document completely modified? Was the indentation wrong before, or is it wrong now?

Please try reverting and just adding the comment to minimize the change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Weird... I used GitHub Web Editor, which shows the expected diff. However, GitHub itself shows that the entire file changed.

Copy link
Member

Choose a reason for hiding this comment

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

Pressing . on github on this PR opens https://github.dev/NuGet/NuGet.Client/pull/6024.
From there, opening Directory.Packages.props, vscode shows at the bottom of the screen: UTF-8 CRLF.

Editing the URL to https://github.dev/NuGet/NuGet.Client/ and again opening Directory.Packages.props, it now says UTF-8 LF

So, github changed every line ending from LF to CRLF. It did the wrong thing:

# Auto detect text files and perform LF normalization
* text=auto

For what it's worth, I'm preparing a branch that will split package versions depending if the project inserts into the .NET SDK or not, because for some packages, it's necessary due to the VS SDK to avoid package downgrade warnings. I'll be adding comments similar to what I added in this release-6.11.x fix: https://github.com/NuGet/NuGet.Client/pull/6015/files

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Codeflow also shows the expected diff and shows no whitespace changes.
image

Copy link
Member

Choose a reason for hiding this comment

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

actually, github did not do the wrong thing, the dev branch has the wrong line endings

*.props text eol=crlf

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unless I hear otherwise, I'm going to send a PR just to update to CRLF, then rebase this branch against that.

Copy link
Contributor

This PR has been automatically marked as stale because it has no activity for 7 days. It will be closed if no further activity occurs within another 7 days of this comment. If it is closed, you may reopen it anytime when you're ready again, as long as you don't delete the branch.

@dotnet-policy-service dotnet-policy-service bot added the Status:No recent activity PRs that have not had any recent activity and will be closed if the label is not removed label Sep 19, 2024
@KirillOsenkov
Copy link
Contributor

Did this get lost?

@microsoft-github-policy-service microsoft-github-policy-service bot removed the Status:No recent activity PRs that have not had any recent activity and will be closed if the label is not removed label Sep 28, 2024
@aortiz-msft
Copy link
Contributor Author

Did this get lost?

Yeah. Whitespace handling by the tooling is making it too hard to rebase this PR, so I just created a new one: https://github.com/NuGet/NuGet.Client/pull/6112/files

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

Successfully merging this pull request may close these issues.

6 participants