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

Update branding for 17.0 #6408

Merged
merged 1 commit into from
May 5, 2021
Merged

Update branding for 17.0 #6408

merged 1 commit into from
May 5, 2021

Conversation

ladipro
Copy link
Member

@ladipro ladipro commented May 4, 2021

Context

Mainline development is switching to Visual Studio 17.0.

Changes Made

Merging current vs17.0 branch into main to pick up branding changes.

Testing

Grepped the tree for other occurrences of 16.10.

Notes

README.md Outdated

[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=main)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=main)

We have forked for MSBuild 16.9 in the branch [`vs16.9`](https://github.com/dotnet/msbuild/tree/vs16.9). Changes to that branch need special approval.
We have forked for MSBuild 16.11 in the branch [`vs16.11`](https://github.com/Microsoft/msbuild/tree/vs16.11). Changes to that branch need special approval.
Copy link
Member Author

Choose a reason for hiding this comment

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

There is a possibility we will still need to service 16.10, although it's not LTS so not mentioning it here.

Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

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

Should we merge the vs17.0 branch back into main first?

In my head we should do these things, in either order

  1. Merge Update Visual Studio Version to 17.0 #6361 (maybe with the readme change here added?)
  2. Merge vs17.0 to main

I don't think cherry-picking is the right move since we should have clean merges.

@ladipro
Copy link
Member Author

ladipro commented May 4, 2021

Merging vs17.0 yields the exact same diff as cherry-picking that one commit. Git-sanity wise it's better to merge, that's a good point.

@Forgind
Copy link
Member

Forgind commented May 4, 2021

I think 1 should go first. It should have been a part of the branding in the first place—it wouldn't make sense to have even a build that's partway between dev16 and dev17.

@ladipro
Copy link
Member Author

ladipro commented May 4, 2021

@Forgind I am planning to delete vs17.0 to prevent confusion - main is going to be 17.0 and vs17.0 would be "16.10 with 17.0 branding" which isn't useful. So I was thinking about taking these steps:

  1. Merge this PR. The diff is a traditional branding update that's done after cutting a release branch. The reason I am annoyingly insisting on doing that is that it fits the established pattern.
  2. Delete the vs17.0 branch.
  3. Repoint Update Visual Studio Version to 17.0 #6361 to main and merge. Update Visual Studio Version to 17.0 #6361 is a major version branding update so it's great that it has its own PR.

EDIT: There's actually step 0. Merge #6409 so main history goes nicely from 16.10 to 16.11 to 17.0.

@rainersigwald
Copy link
Member

Works for me

@Forgind
Copy link
Member

Forgind commented May 4, 2021

Is there any reason we have to delete vs17.0? We've created vs16.x branches before they're really properly full before. Are we just going slower here because we have so long before 17.0 ships?

Also, are we then planning to have main insert into VS main and rel/d17, or are we planning to abandon rel/d17?

@ladipro
Copy link
Member Author

ladipro commented May 5, 2021

No strong reason to delete, it's just not needed until the next snap. VS rel/d17 is also sitting unused until the next preview. We'll be inserting our main into VS main for a few months, ignoring the "17" branches on both ends.

It's a good analogy, though. I'm not deleting and will keep the branch around. Thank you!

@ladipro ladipro merged commit b02f8de into dotnet:main May 5, 2021
@ladipro ladipro deleted the 17.0-branding branch May 5, 2021 05:51
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.

3 participants