Skip to content

Merge 17.0-vs-deps to 17.0 #57156

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
Merged
merged 152 commits into from
Oct 15, 2021
Merged

Merge 17.0-vs-deps to 17.0 #57156

merged 152 commits into from
Oct 15, 2021

Conversation

@Cosifne
Copy link
Member

@Cosifne Cosifne commented Oct 14, 2021

No description provided.

JoeRobich and others added 30 commits August 31, 2021 17:18
@JoeRobich
Merge remote-tracking branch 'origin/main-vs-deps' into merges/main-t…
f53b0fc 
…o-main-vs-deps
@dotnet-bot
Merge pull request dotnet#56049 from dotnet/merges/release/dev17.0-vs…
e98d13d 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56050 from dotnet/merges/main-to-main-vs-deps
920ea11 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56054 from dotnet/merges/release/dev17.0-vs…
ff1da59 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56057 from dotnet/merges/release/dev17.0-vs…
a8b10ae 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56056 from dotnet/merges/main-to-main-vs-deps
7e4e8c7 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56066 from dotnet/merges/main-to-main-vs-deps
e8bd122 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56088 from dotnet/merges/main-to-main-vs-deps
38aa6ff 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56086 from dotnet/merges/release/dev17.0-vs…
bad1408 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56097 from dotnet/merges/release/dev17.0-vs…
b9d5a1f 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56100 from dotnet/merges/main-to-main-vs-deps
7fb4018 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56106 from dotnet/merges/release/dev17.0-vs…
9c43caf 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56108 from dotnet/merges/main-to-main-vs-deps
1865b5c 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56111 from dotnet/merges/main-to-main-vs-deps
e67ab95 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56118 from dotnet/merges/main-to-main-vs-deps
3a0ccdc 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56121 from dotnet/merges/main-to-main-vs-deps
d9df245 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56127 from dotnet/merges/main-to-main-vs-deps
ffc3289 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56138 from dotnet/merges/main-to-main-vs-deps
53c2d8d 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56148 from dotnet/merges/release/dev17.0-vs…
f74bbb0 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56151 from dotnet/merges/main-to-main-vs-deps
586e1d3 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56158 from dotnet/merges/release/dev17.0-vs…
a8bd1ad 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56160 from dotnet/merges/main-to-main-vs-deps
878e463 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56176 from dotnet/merges/release/dev17.0-vs…
d2a0304 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56168 from dotnet/merges/main-to-main-vs-deps
539a8f5 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56179 from dotnet/merges/release/dev17.0-vs…
45b0c7d 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56194 from dotnet/merges/main-to-main-vs-deps
2bbf85b 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56210 from dotnet/merges/main-to-main-vs-deps
2de0690 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56192 from dotnet/merges/release/dev17.0-vs…
2bdcc01 
…-deps-to-main-vs-deps

Merge release/dev17.0-vs-deps to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56225 from dotnet/merges/main-to-main-vs-deps
f242967 
Merge main to main-vs-deps
@dotnet-bot
Merge pull request dotnet#56235 from dotnet/merges/main-to-main-vs-deps
0f5d36e 
Merge main to main-vs-deps
dotnet-bot and others added 16 commits September 30, 2021 11:38
@dotnet-bot
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
0ffcfdb 
… Build ID 1395771
@dotnet-bot
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
58e6fd7 
… Build ID 1395758
@dotnet-bot
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
70b1355 
… Build ID 1395758
@dotnet-bot
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
b31a497 
… Build ID 1395771
@dotnet-bot
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
2d8e40b 
… Build ID 1395771
@JoeRobich
Merge pull request dotnet#56876 from dotnet/locfiles/a8f5af95-7cd0-42…
9db77be 
…90-a203-3b68c4a3defd

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1395644
@Cosifne
Merge pull request dotnet#56879 from dotnet/locfiles/3d901ccb-4e09-47…
cbc9c80 
…b4-92c3-1665bb4f4740

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1395771
@dotnet-bot
Merge pull request dotnet#56900 from dotnet/merges/release/dev17.0-to…
87373d4 
…-release/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@dotnet-bot
Merge pull request dotnet#56914 from dotnet/merges/release/dev17.0-to…
a4187cc 
…-release/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@dotnet-bot
Merge pull request dotnet#56920 from dotnet/merges/release/dev17.0-to…
8e1779e 
…-release/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@JoeRobich
Merge pull request dotnet#56877 from dotnet/locfiles/ba11b725-66d7-44…
ae62c5f 
…2d-8273-281fa1024c0f

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1395758
@RikkiGibson
Add SolutionSessionId and ProjectsWithAppliedChanges telemetry proper…
d435bb2 
…ties (dotnet#56947) (dotnet#56979)
@dotnet-bot
Merge pull request dotnet#57009 from dotnet/merges/release/dev17.0-to…
66b241b 
…-release/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@dotnet-bot
Merge pull request dotnet#57096 from dotnet/merges/release/dev17.0-to…
8ed6fe0 
…-release/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@333fred @sharwell
Log unexpected cancellation state in RemoteCallback<T> (dotnet#57115)
f251387 
Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com>
@dotnet-bot
Merge pull request dotnet#57150 from dotnet/merges/release/dev17.0-to…
df45061 
…-release/dev17.0-vs-deps

Merge release/dev17.0 to release/dev17.0-vs-deps
@Cosifne Cosifne requested a review from a team October 14, 2021 18:43
@Cosifne Cosifne requested review from a team as code owners October 14, 2021 18:43
@ghost ghost added the Area-Infrastructure label Oct 14, 2021
@Cosifne Cosifne removed request for a team October 14, 2021 18:44
@runfoapp runfoapp bot mentioned this pull request Oct 14, 2021
Open
sharwell
sharwell previously requested changes Oct 14, 2021
View reviewed changes
Copy link
Contributor

@sharwell sharwell left a comment

Choose a reason for hiding this comment

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

Why not just delete the release/dev17.0 branch, like we've done for all former releases when the vs-deps backward merge occurred?

@RikkiGibson
Copy link
Member

RikkiGibson commented Oct 14, 2021

Some examples of where this has been done in the past for release branches:

#46766
#44400

I think deleting the -vs-deps branch is preferred to deleting the non-vs-deps branch because we end up with simpler branch names. It also makes the process of flowing these -vs-deps updates downstream to later releases a little more clear because it fits with our codeflow conventions.

@sharwell
Copy link
Contributor

sharwell commented Oct 14, 2021

I think deleting the -vs-deps branch is preferred to deleting the non-vs-deps branch because we end up with simpler branch names.

Historically we've been consolidating to the vs-deps branch:

image

@sharwell sharwell dismissed their stale review October 14, 2021 20:44

Questions were answered.

@Cosifne Cosifne merged commit 5500014 into dotnet:release/dev17.0 Oct 15, 2021
@Cosifne Cosifne deleted the dev/shech/merge-dev17.0-vs-deps-to-dev17.0 branch October 15, 2021 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RikkiGibson RikkiGibson RikkiGibson approved these changes

+1 more reviewer

@sharwell sharwell sharwell left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Area-Infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@Cosifne @RikkiGibson @sharwell @JoeRobich @dotnet-bot @tmat @dibarbet @333fred