Skip to content

Merge dev16.6-vs-deps back to dev16.6 #44400

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 393 commits into from
May 19, 2020
Merged

Merge dev16.6-vs-deps back to dev16.6 #44400

merged 393 commits into from
May 19, 2020

Conversation

@JoeRobich
Copy link
Member

@JoeRobich JoeRobich commented May 19, 2020

With 16.6 GA released we can merge the vs-deps branch back.

dibarbet and others added 30 commits February 11, 2020 12:28
@dibarbet
Address review feedback
56ebe09
Merge pull request #41570 from dotnet/merges/master-to-master-vs-deps
658e26c 
Merge master to master-vs-deps
Merge pull request #41612 from dotnet/merges/master-to-master-vs-deps
767a3c7 
Merge master to master-vs-deps
Merge pull request #41622 from dotnet/merges/master-to-master-vs-deps
4e9b439 
Merge master to master-vs-deps
Merge pull request #41621 from dotnet/merges/release/dev16.5-to-relea…
36f07b2 
…se/dev16.5-vs-deps

Merge release/dev16.5 to release/dev16.5-vs-deps
Merge pull request #41637 from dotnet/merges/master-to-master-vs-deps
6016577 
Merge master to master-vs-deps
Merge pull request #41645 from dotnet/merges/release/dev16.5-to-relea…
7a56129 
…se/dev16.5-vs-deps

Merge release/dev16.5 to release/dev16.5-vs-deps
Merge pull request #41646 from dotnet/merges/master-to-master-vs-deps
e77da8a 
Merge master to master-vs-deps
Merge pull request #41644 from dotnet/merges/release/dev16.5-vs-deps-…
a5fe26a 
…to-master-vs-deps

Merge release/dev16.5-vs-deps to master-vs-deps
Merge pull request #41648 from dotnet/merges/master-to-master-vs-deps
9966bca 
Merge master to master-vs-deps
Merge pull request #41669 from dotnet/merges/master-to-master-vs-deps
cfa22b5 
Merge master to master-vs-deps
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20200…
ef6d075 
…213.5

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.20113.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20200…
5c18b7e 
…213.5 (#41679)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.20113.5
@JoeRobich
Merge branch 'master-vs-deps' into merges/release/dev16.5-vs-deps-to-…
f192d6b 
…master-vs-deps
Merge pull request #41685 from dotnet/merges/release/dev16.5-to-relea…
92790e2 
…se/dev16.5-vs-deps

Merge release/dev16.5 to release/dev16.5-vs-deps
Merge pull request #41676 from dotnet/merges/master-to-master-vs-deps
105aaf4 
Merge master to master-vs-deps
Merge pull request #41684 from dotnet/merges/release/dev16.5-vs-deps-…
b352609 
…to-master-vs-deps

Merge release/dev16.5-vs-deps to master-vs-deps
Merge pull request #41691 from dotnet/merges/release/dev16.5-vs-deps-…
e84f7bd 
…to-master-vs-deps

Merge release/dev16.5-vs-deps to master-vs-deps
Merge pull request #41695 from dotnet/merges/master-to-master-vs-deps
a3c8dd1 
Merge master to master-vs-deps
Merge pull request #41715 from dotnet/merges/master-to-master-vs-deps
94bc896 
Merge master to master-vs-deps
Merge pull request #41718 from dotnet/merges/master-to-master-vs-deps
4d30557 
Merge master to master-vs-deps
Merge pull request #41735 from dotnet/merges/master-to-master-vs-deps
75c7b4f 
Merge master to master-vs-deps
Merge pull request #41743 from dotnet/merges/master-to-master-vs-deps
dd5f35c 
Merge master to master-vs-deps
Merge pull request #41744 from dotnet/merges/master-to-master-vs-deps
1dc4b2b 
Merge master to master-vs-deps
Merge pull request #41748 from dotnet/merges/master-to-master-vs-deps
809382a 
Merge master to master-vs-deps
Merge pull request #41750 from dotnet/merges/master-to-master-vs-deps
eeda106 
Merge master to master-vs-deps
Merge pull request #41761 from dotnet/merges/master-to-master-vs-deps
f2f29c2 
Merge master to master-vs-deps
Merge pull request #41770 from dotnet/merges/release/dev16.5-to-relea…
fdeac23 
…se/dev16.5-vs-deps

Merge release/dev16.5 to release/dev16.5-vs-deps
Merge pull request #41771 from dotnet/merges/release/dev16.5-vs-deps-…
b4ccbd5 
…to-master-vs-deps

Merge release/dev16.5-vs-deps to master-vs-deps
@JoeRobich
Merge remote-tracking branch 'origin/master-vs-deps' into merges/mast…
acba1ec 
…er-to-master-vs-deps
dibarbet and others added 22 commits April 8, 2020 11:23
@dibarbet
Use later version
27a67cd
@dibarbet
Update Versions.props
72bc6f2
Merge pull request #43195 from dotnet/merges/release/dev16.5-to-relea…
5bdb97d 
…se/dev16.5-vs-deps

Merge release/dev16.5 to release/dev16.5-vs-deps
Merge pull request #43196 from dotnet/merges/release/dev16.6-to-relea…
ed485ab 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
@dibarbet
Merge pull request #43163 from dibarbet/update_lsp_version
34fad56 
Update lsp package versions.
Merge pull request #43217 from dotnet/merges/release/dev16.6-to-relea…
c777377 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
@JoeRobich
Merge branch 'release/dev16.6-vs-deps' into merges/release/dev16.5-vs…
dd52a55 
…-deps-to-release/dev16.6-vs-deps
@JoeRobich
Merge pull request #43231 from dotnet/merges/release/dev16.5-vs-deps-…
fc1d4e1 
…to-release/dev16.6-vs-deps

Merge release/dev16.5-vs-deps to release/dev16.6-vs-deps
Merge pull request #43244 from dotnet/merges/release/dev16.6-to-relea…
4eafdcb 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
Merge pull request #43266 from dotnet/merges/release/dev16.6-to-relea…
3375a7b 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
Merge pull request #43336 from dotnet/merges/release/dev16.6-to-relea…
f357f89 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
@JoeRobich
Update comment text
e609292
@JoeRobich
Update comment text
641d388
Merge pull request #43466 from dotnet/merges/release/dev16.6-to-relea…
37ad245 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
@v-chmart
LOC CHECKIN | dotnet/roslyn release/dev16.6-vs-deps | 20200421
a8b18ac
@JoeRobich
Merge pull request #43533 from v-chmart/loc_20200421_release/dev16.6-…
57df05e 
…vs-deps

LOC CHECKIN | dotnet/roslyn release/dev16.6-vs-deps | 20200421
Merge pull request #43530 from dotnet/merges/release/dev16.6-to-relea…
3d85b48 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
Merge pull request #43663 from dotnet/merges/release/dev16.6-to-relea…
9bc8f80 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
Merge pull request #43811 from dotnet/merges/release/dev16.6-to-relea…
5473cb3 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
Merge pull request #43859 from dotnet/merges/release/dev16.6-to-relea…
910223b 
…se/dev16.6-vs-deps

Merge release/dev16.6 to release/dev16.6-vs-deps
@JoeRobich
Mark Microsoft.VisualStudio.StaticReviews.Embeddable as private package
9c3d6f8
@JoeRobich
Merge pull request #44369 from dotnet/dev/jorobich/mark-package-private
c94e321 
Mark Microsoft.VisualStudio.StaticReviews.Embeddable as private package
@JoeRobich JoeRobich requested review from a team as code owners May 19, 2020 22:55
ghost
ghost approved these changes May 19, 2020
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approval

@JoeRobich JoeRobich merged commit c94e321 into release/dev16.6 May 19, 2020
@RikkiGibson RikkiGibson mentioned this pull request Oct 14, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Area-Infrastructure auto-merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@JoeRobich @dibarbet @genlu @RikkiGibson @allisonchou @tmat @v-chmart