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

Merge release/dev17.0-vs-deps to main #55030

Merged
merged 608 commits into from
Jul 23, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
608 commits
Select commit Hold shift + click to select a range
9516cbd
Make ServiceHub.CoreComponents non-shipping
genlu May 24, 2021
c575192
Update version of platform library we reference.
CyrusNajmabadi May 25, 2021
c1394eb
Merge pull request #53655 from dotnet/merges/release/dev17.0-preview1…
Cosifne May 25, 2021
a776edd
Merge pull request #53648 from dotnet/merges/main-to-main-vs-deps
Cosifne May 25, 2021
6967597
Merge pull request #53666 from dotnet/merges/main-to-main-vs-deps
May 25, 2021
cbe69db
Remove Compiler's dependency on net472 package
genlu May 25, 2021
0eef599
Merge pull request #53674 from genlu/RemoveDep
genlu May 25, 2021
a96c755
Merge pull request #53678 from dotnet/merges/release/dev16.11-to-rele…
Cosifne May 25, 2021
46592bc
Merge pull request #53679 from dotnet/merges/main-to-main-vs-deps
Cosifne May 25, 2021
0825ee7
Merge remote-tracking branch 'upstream/main-vs-deps' into asyncLightbulb
CyrusNajmabadi May 25, 2021
421ad6d
Merge pull request #53685 from dotnet/merges/release/dev16.11-to-rele…
JoeRobich May 25, 2021
6403b5e
Update version
CyrusNajmabadi May 25, 2021
3f5d239
Fix
CyrusNajmabadi May 26, 2021
aaf78ca
Merge pull request #53681 from dotnet/merges/release/dev17.0-preview1…
Cosifne May 26, 2021
5ff2685
Move to an enum
CyrusNajmabadi May 26, 2021
188be8f
Add docs
CyrusNajmabadi May 26, 2021
4aa0237
Move new code into new files
CyrusNajmabadi May 26, 2021
677099f
Wrap
CyrusNajmabadi May 26, 2021
1d8249a
REvert
CyrusNajmabadi May 26, 2021
6475254
Make sync
CyrusNajmabadi May 26, 2021
dd8e145
Fix
CyrusNajmabadi May 26, 2021
63320d4
Revert
CyrusNajmabadi May 26, 2021
726bec2
Merge remote-tracking branch 'upstream/main-vs-deps' into asyncLightbulb
CyrusNajmabadi May 26, 2021
3062206
No alloc
CyrusNajmabadi May 26, 2021
00ea3f0
Simplify
CyrusNajmabadi May 26, 2021
b19ba66
Merge pull request #53690 from dotnet/merges/release/dev16.11-vs-deps…
Cosifne May 26, 2021
4e3524b
Update src/Features/Core/Portable/AddImport/AbstractAddImportCodeFixP…
CyrusNajmabadi May 26, 2021
fe96d77
Update src/Workspaces/Core/Portable/CodeActions/CodeActionPriority.cs
CyrusNajmabadi May 26, 2021
3423ad9
Update src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionSource_…
CyrusNajmabadi May 26, 2021
8ab7971
Update src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionSource_…
CyrusNajmabadi May 26, 2021
c2b1f61
Simplify
CyrusNajmabadi May 27, 2021
ddcf0b0
Simplify
CyrusNajmabadi May 27, 2021
cb1d5bd
Merge branch 'asyncLightbulb' of https://github.com/CyrusNajmabadi/ro…
CyrusNajmabadi May 27, 2021
1d59ca0
Simplify
CyrusNajmabadi May 27, 2021
8a7679f
Simplify
CyrusNajmabadi May 27, 2021
e626d4b
Rename type
CyrusNajmabadi May 27, 2021
e0ca75c
Move away from a bool
CyrusNajmabadi May 27, 2021
39636d4
Merge pull request #53682 from dotnet/merges/main-to-main-vs-deps
Cosifne May 27, 2021
6aa11cc
Merge remote-tracking branch 'upstream/release/dev16.11' into merges/…
Cosifne May 27, 2021
3ad1549
Merge remote-tracking branch 'upstream/main' into merges/main-to-main…
Cosifne May 27, 2021
504d73f
Exclude MS.Win32.Registry
genlu May 27, 2021
01e2ab0
Merge pull request #53716 from dotnet/merges/main-to-main-vs-deps
Cosifne May 27, 2021
a465871
Merge pull request #53688 from dotnet/merges/release/dev16.11-to-rele…
May 27, 2021
951ecde
Fix optprof config drop path
genlu May 27, 2021
ad40a63
Merge pull request #53734 from dotnet/merges/main-to-main-vs-deps
May 27, 2021
c26cd8c
Merge pull request #53732 from dotnet/merges/release/dev16.11-vs-deps…
Cosifne May 27, 2021
0adf94c
Merge pull request #53730 from genlu/fixDrop
genlu May 27, 2021
f8ea171
Merge pull request #53733 from dotnet/merges/release/dev16.11-to-rele…
May 27, 2021
9e145d9
Merge pull request #53739 from dotnet/merges/release/dev16.11-vs-deps…
Cosifne May 28, 2021
b6764ca
Merge pull request #53741 from dotnet/merges/main-to-main-vs-deps
Cosifne May 28, 2021
8397f09
Update debugger contracts to 17.2.0-beta.21262.1 (#53400)
tmat May 28, 2021
966f81f
Merge pull request #53740 from dotnet/merges/release/dev17.0-preview1…
Cosifne May 28, 2021
2111fe2
Merge pull request #53767 from dotnet/merges/release/dev16.11-to-rele…
May 29, 2021
43f55a4
Merge remote-tracking branch 'upstream/main' into merges/main-to-main…
Cosifne May 29, 2021
04f0144
Merge remote-tracking branch 'upstream/release/dev16.11-vs-deps' into…
Cosifne May 29, 2021
a55983a
Merge pull request #53770 from dotnet/merges/release/dev16.11-vs-deps…
Cosifne May 29, 2021
c81e9d6
Merge remote-tracking branch 'upstream/main-vs-deps' into asyncLightbulb
CyrusNajmabadi May 31, 2021
adfeb29
SImplify
CyrusNajmabadi May 31, 2021
2afda3c
Comments
CyrusNajmabadi May 31, 2021
e8851c9
Merge pull request #53807 from dotnet/merges/release/dev16.11-to-rele…
Jun 1, 2021
757770c
Merge pull request #53826 from dotnet/merges/release/dev16.11-to-rele…
Jun 2, 2021
6773aec
Switch to full ngen for Roslyn binaries
genlu Jun 2, 2021
5dc3c06
Merge pull request #53837 from genlu/fullNgen
genlu Jun 2, 2021
fba560d
Add suppressions
RikkiGibson Jun 2, 2021
d1ef2e7
Merge pull request #53760 from dotnet/merges/main-to-main-vs-deps
Cosifne Jun 2, 2021
5b45a56
Merge pull request #53841 from dotnet/merges/release/dev16.11-to-rele…
Jun 2, 2021
12c47f7
Fix OptProf test name
genlu Jun 4, 2021
b6a9f8c
Merge pull request #53884 from genlu/FixOptProfName
genlu Jun 4, 2021
e066466
Merge pull request #53843 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 7, 2021
a127424
Merge pull request #53840 from dotnet/merges/release/dev17.0-preview1…
RikkiGibson Jun 7, 2021
d004bea
Merge pull request #53933 from dotnet/merges/release/dev17.0-preview1…
genlu Jun 8, 2021
04d01c2
Merge pull request #53934 from dotnet/merges/main-to-main-vs-deps
genlu Jun 8, 2021
7bcb60c
Merge branch 'main-vs-deps' into merges/release/dev16.11-vs-deps-to-m…
genlu Jun 8, 2021
e7944de
resolve merge conflict
genlu Jun 8, 2021
1c913a0
Remove whitespace
genlu Jun 8, 2021
a71cf6e
Revert "Switch to full ngen for Roslyn binaries"
genlu Jun 8, 2021
568b06a
Merge pull request #53950 from dotnet/merges/main-to-main-vs-deps
dibarbet Jun 8, 2021
40451fe
Merge remote-tracking branch 'upstream/main-vs-deps' into updateVSCAche
CyrusNajmabadi Jun 9, 2021
249c808
Merge remote-tracking branch 'upstream/main-vs-deps' into asyncLightbulb
CyrusNajmabadi Jun 9, 2021
5536669
Merge pull request #53952 from dotnet/revert-53837-fullNgen
genlu Jun 9, 2021
e366d7d
Merge pull request #53955 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 9, 2021
0458b94
Disable dev17 integration tests in CI (#53971)
RikkiGibson Jun 9, 2021
98f4a39
Merge pull request #53975 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 9, 2021
a1e6361
Merge pull request #53974 from dotnet/merges/release/dev17.0-preview1…
RikkiGibson Jun 9, 2021
fa7e205
Merge pull request #53921 from dotnet/merges/release/dev16.11-vs-deps…
RikkiGibson Jun 9, 2021
3704bbb
Merge pull request #53983 from dotnet/merges/main-to-main-vs-deps
Jun 10, 2021
6cbd967
Merge pull request #53993 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 10, 2021
473e349
Merge pull request #53992 from dotnet/merges/release/dev16.10-to-rele…
JoeRobich Jun 10, 2021
b701abe
Merge pull request #53989 from dotnet/merges/release/dev16.11-to-rele…
Jun 10, 2021
cf03456
Merge pull request #53982 from dotnet/merges/release/dev17.0-preview1…
Jun 10, 2021
c8f739a
Merge pull request #54001 from dotnet/merges/main-to-main-vs-deps
Jun 10, 2021
86fbab9
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
JoeRobich Jun 11, 2021
b090f22
Merge pull request #54000 from dotnet/merges/release/dev16.11-to-rele…
Jun 11, 2021
d6c9ffd
Merge pull request #53998 from dotnet/merges/release/dev16.10-vs-deps…
Jun 11, 2021
560e58c
Merge pull request #54014 from dotnet/merges/main-to-main-vs-deps
Jun 11, 2021
c7c0c9a
Disable WpfCreateProject_SurfaceIsolated optprof
genlu Jun 11, 2021
cdee575
Merge pull request #54018 from dotnet/merges/main-to-main-vs-deps
Jun 11, 2021
194dde6
Merge pull request #54039 from genlu/disableOptProfTest
JoeRobich Jun 11, 2021
c878469
Merge remote-tracking branch 'upstream/release/dev16.11-vs-deps' into…
RikkiGibson Jun 11, 2021
9374a23
Merge pull request #54043 from dotnet/merges/release/dev16.11-vs-deps…
RikkiGibson Jun 11, 2021
6244077
Merge pull request #54045 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 11, 2021
32627e0
Merge pull request #54044 from dotnet/merges/release/dev17.0-preview1…
genlu Jun 14, 2021
208d88d
Merge pull request #54052 from dotnet/merges/main-to-main-vs-deps
allisonchou Jun 14, 2021
2ff151a
Merge remote-tracking branch 'dotnet/main-vs-deps' into servicehubP2
genlu Jun 14, 2021
a7e93be
Merge pull request #54088 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 14, 2021
a579702
Allow WatchHotReloadService to specify runtime apply-update capabilit…
pranavkm Jun 14, 2021
2a76be8
Fix host id for Roslyn Core host
genlu Jun 16, 2021
b0b49a8
Merge pull request #54122 from dotnet/merges/release/dev16.11-to-rele…
genlu Jun 16, 2021
0b37f7b
Add coreclr x64 serverGC host
genlu Jun 16, 2021
cb30f5f
Merge pull request #54150 from dotnet/merges/release/dev16.11-vs-deps…
Jun 16, 2021
60d6fdd
Remove x86 OOP support
genlu Jun 16, 2021
38bcbb3
Merge pull request #54112 from dotnet/merges/main-to-main-vs-deps
genlu Jun 16, 2021
248ab03
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
JoeRobich Jun 17, 2021
67a25e0
Removex64 OOP option from UI
genlu Jun 17, 2021
7e25ed7
Merge pull request #54156 from dotnet/merges/release/dev16.11-to-rele…
Jun 17, 2021
3d99678
Merge pull request #54157 from dotnet/merges/main-to-main-vs-deps
Jun 17, 2021
8ef186c
Merge pull request #54160 from dotnet/merges/release/dev16.11-vs-deps…
Jun 17, 2021
1ae4521
Merge pull request #54161 from dotnet/merges/main-to-main-vs-deps
Jun 17, 2021
ced43c9
Merge pull request #54167 from dotnet/merges/main-to-main-vs-deps
Jun 17, 2021
7205cd9
Merge remote-tracking branch 'origin/separate-prvalidation-yml' into …
JoeRobich Jun 17, 2021
5af84b3
Merge remote-tracking branch 'origin/separate-prvalidation-yml' into …
JoeRobich Jun 17, 2021
2406fb7
Merge remote-tracking branch 'dotnet/main-vs-deps' into servicehubP2
genlu Jun 17, 2021
8514bd2
Remove set build number stage from official build
JoeRobich Jun 17, 2021
b1fc29b
Merge pull request #54177 from dotnet/merges/release/dev16.11-vs-deps…
Jun 17, 2021
e293f0f
Merge pull request #54170 from dotnet/merges/main-to-main-vs-deps
genlu Jun 17, 2021
40150e3
Revert version bump that flowed from dev16.11-vs-deps
JoeRobich Jun 17, 2021
f8d332c
Merge pull request #54178 from dotnet/merges/release/dev16.11-to-rele…
Jun 17, 2021
4a8f423
Merge branch 'use-parameters' into release/dev16.11-vs-deps
JoeRobich Jun 17, 2021
02f16c7
Merge branch 'use-parameters' into main-vs-deps
JoeRobich Jun 17, 2021
07c6589
Merge branch 'remove-pr-step' into release/dev16.11-vs-deps
JoeRobich Jun 17, 2021
76ddf2c
Merge branch 'remove-pr-step' into main-vs-deps
JoeRobich Jun 17, 2021
ef63a5e
Fix formattign
genlu Jun 18, 2021
7ceb633
Merge pull request #54206 from dotnet/merges/release/dev16.10-to-rele…
Jun 18, 2021
871a17d
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
genlu Jun 18, 2021
a222f90
Merge pull request #53571 from genlu/servicehubP2
genlu Jun 18, 2021
37db386
Merge pull request #54225 from dotnet/merges/release/dev16.10-vs-deps…
Jun 18, 2021
cf2f3d0
Merge pull request #54226 from dotnet/merges/release/dev16.11-to-rele…
Jun 18, 2021
e1d9cc3
Merge pull request #54189 from dotnet/merges/main-to-main-vs-deps
Jun 18, 2021
36f5fb6
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
genlu Jun 18, 2021
934166c
Merge pull request #54230 from dotnet/merges/main-to-main-vs-deps
Jun 19, 2021
ead5ec8
Merge pull request #54232 from dotnet/merges/main-to-main-vs-deps
Jun 19, 2021
77d2dfa
Merge pull request #54236 from dotnet/merges/main-to-main-vs-deps
Jun 20, 2021
acc39bc
Merge pull request #54247 from dotnet/merges/main-to-main-vs-deps
Jun 21, 2021
707ed80
Merge pull request #54254 from dotnet/merges/main-to-main-vs-deps
Jun 21, 2021
84d6c24
Merge remote-tracking branch 'upstream/main-vs-deps' into updateVSCAche
CyrusNajmabadi Jun 21, 2021
0affd4d
Update version
CyrusNajmabadi Jun 21, 2021
ddacbbd
Merge pull request #54256 from dotnet/merges/main-to-main-vs-deps
Jun 21, 2021
3ad7059
Turn on loc PRs in release/dev16.11-vs-deps
jonfortescue Jun 21, 2021
998323c
Merge pull request #54273 from jonfortescue/TurnOnLocPrsForDev1611
Jun 21, 2021
1333a27
Merge pull request #54275 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 22, 2021
76d3c4f
Update OneLocBuild call to fix mirror branch
jonfortescue Jun 22, 2021
e668c82
Merge pull request #54295 from jonfortescue/Dev1611OneLocBuildFix
Jun 22, 2021
898c068
Fix OneLocBuild template for updated LocProject generator
jonfortescue Jun 22, 2021
12aa2be
Merge pull request #54300 from dotnet/merges/main-to-main-vs-deps
Jun 22, 2021
245f59e
Revert "Add support for ServiceHub Host on .NET Core" (#54301)
RikkiGibson Jun 22, 2021
7d7bb32
Merge pull request #54312 from dotnet/merges/release/dev16.11-to-rele…
Jun 23, 2021
4552d8b
Merge pull request #54313 from dotnet/merges/main-to-main-vs-deps
Jun 23, 2021
6252f00
Merge pull request #54303 from jonfortescue/LastOneISwear
Jun 23, 2021
1e476ec
Localized file check-in by OneLocBuild Task
dotnet-bot Jun 23, 2021
ea54d99
Merge pull request #53658 from CyrusNajmabadi/updateVSCAche
CyrusNajmabadi Jun 23, 2021
58df3bc
Merge remote-tracking branch 'upstream/main-vs-deps' into asyncLightbulb
CyrusNajmabadi Jun 23, 2021
ddb105d
Merge pull request #54315 from dotnet/merges/main-to-main-vs-deps
Jun 23, 2021
4c7bc54
Merge pull request #54319 from dotnet/merges/main-to-main-vs-deps
Jun 23, 2021
d1c4ad5
Block deployment to Dev16 (#54266)
tmat Jun 23, 2021
d060307
Merge pull request #54334 from dotnet/merges/release/dev16.11-to-rele…
Jun 23, 2021
6eb2f75
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
tmat Jun 23, 2021
93d1a4a
Merge pull request #54341 from dotnet/merges/main-to-main-vs-deps
Jun 24, 2021
c6bdb82
Merge pull request #54351 from dotnet/merges/main-to-main-vs-deps
Jun 24, 2021
b7ba16e
Merge pull request #54350 from dotnet/merges/release/dev16.11-to-rele…
Jun 24, 2021
641f5d6
Localized file check-in by OneLocBuild Task
dotnet-bot Jun 24, 2021
9d5ad74
Merge pull request #54356 from dotnet/merges/main-to-main-vs-deps
Jun 24, 2021
ac1878d
Merge pull request #54314 from dotnet/locfiles/9facf15e-70d1-464e-b21…
Jun 24, 2021
445e572
Merge pull request #54358 from dotnet/merges/main-to-main-vs-deps
Jun 25, 2021
8c13f49
Merge pull request #54369 from dotnet/merges/release/dev16.11-to-rele…
RikkiGibson Jun 25, 2021
efbe3e5
Merge pull request #54393 from dotnet/merges/release/dev16.11-to-rele…
Jun 25, 2021
06ae412
Merge pull request #54394 from dotnet/merges/main-to-main-vs-deps
RikkiGibson Jun 25, 2021
a65961d
Merge branch 'release/dev16.11-vs-deps' of github.com:dotnet/roslyn i…
RikkiGibson Jun 25, 2021
0614659
Merge pull request #54399 from dotnet/merges/main-to-main-vs-deps
Jun 25, 2021
a385f68
Merge pull request #54398 from dotnet/merges/release/dev16.11-vs-deps…
Jun 25, 2021
c1a11ab
Merge pull request #54405 from dotnet/merges/main-to-main-vs-deps
Jun 27, 2021
cf20979
Merge pull request #54425 from dotnet/merges/main-to-main-vs-deps
Jun 27, 2021
03a07d1
Merge pull request #54426 from dotnet/merges/main-to-main-vs-deps
Jun 27, 2021
cb4a5a5
Merge pull request #54440 from dotnet/merges/main-to-main-vs-deps
Jun 28, 2021
15e2796
Merge pull request #54442 from dotnet/merges/main-to-main-vs-deps
Jun 28, 2021
4794e1f
Merge pull request #54446 from dotnet/merges/main-to-main-vs-deps
Jun 28, 2021
7011bab
Merge remote-tracking branch 'upstream/main-vs-deps' into asyncLightbulb
CyrusNajmabadi Jun 28, 2021
adf9a40
Merge pull request #54445 from dotnet/merges/release/dev16.11-to-rele…
Jun 28, 2021
ffe832e
Add option
CyrusNajmabadi Jun 28, 2021
75b96cb
Update version
CyrusNajmabadi Jun 28, 2021
d3a74c3
Rename string
CyrusNajmabadi Jun 28, 2021
88dd36f
Merge remote-tracking branch 'upstream/main-vs-deps' into merges/main…
ryzngard Jun 29, 2021
446caeb
Merge branch 'main' of github.com:dotnet/roslyn into merges/main-to-m…
RikkiGibson Jun 29, 2021
3aecf23
Merge main to main-vs-deps (#54452)
RikkiGibson Jun 29, 2021
568f852
Merge pull request #54459 from dotnet/merges/release/dev16.11-vs-deps…
Jun 29, 2021
5336a84
Merge pull request #54462 from dotnet/merges/main-to-main-vs-deps
Jun 29, 2021
b7359c6
Merge remote-tracking branch 'upstream/main-vs-deps' into asyncLightbulb
CyrusNajmabadi Jun 29, 2021
0d317a4
Merge pull request #53117 from CyrusNajmabadi/asyncLightbulb
CyrusNajmabadi Jun 29, 2021
49ee1bd
Update cache version.
CyrusNajmabadi Jun 29, 2021
050a533
Merge pull request #54471 from CyrusNajmabadi/updateVersion
CyrusNajmabadi Jun 29, 2021
38838a6
Merge pull request #54473 from dotnet/merges/main-to-main-vs-deps
Jun 29, 2021
37b86e1
Merge pull request #54477 from dotnet/merges/release/dev16.11-to-rele…
Jun 29, 2021
faf0018
Merge pull request #54482 from dotnet/merges/release/dev17.0-to-relea…
Jun 30, 2021
246ce64
Merge pull request #54475 from dotnet/merges/release/dev16.10-to-rele…
Jun 30, 2021
395042f
Merge pull request #54483 from dotnet/merges/release/dev16.11-vs-deps…
Jun 30, 2021
68b0bff
Merge pull request #54485 from dotnet/merges/release/dev16.10-vs-deps…
Jun 30, 2021
d13c0d3
Merge pull request #54488 from dotnet/merges/release/dev16.11-vs-deps…
Jun 30, 2021
0075eea
Enable EnC diagnostics in LSP
dibarbet Jun 30, 2021
4d82a56
Merge pull request #54354 from dotnet/locfiles/cc88c28e-669c-4b88-bc2…
RikkiGibson Jun 30, 2021
9187d54
Cache multiple compile time solutions
dibarbet Jun 30, 2021
8daffab
rename
dibarbet Jun 30, 2021
96c8859
Fix cache checks to compare design time input against previous design…
dibarbet Jul 1, 2021
5e938c3
Merge pull request #54523 from dotnet/merges/release/dev16.11-to-rele…
Jul 1, 2021
b081f1a
Merge pull request #54541 from dotnet/merges/release/dev16.10-to-rele…
Jul 1, 2021
a432812
Move suggestion options down to EditorFeatures lib.
CyrusNajmabadi Jul 1, 2021
347c4f6
Merge pull request #54549 from dibarbet/backport_54546
RikkiGibson Jul 1, 2021
49a655e
Merge pull request #54553 from dotnet/merges/release/dev16.10-vs-deps…
Jul 2, 2021
62eb30f
Merge pull request #54501 from dotnet/merges/release/dev16.11-vs-deps…
Jul 2, 2021
a0fd004
Merge pull request #54564 from dotnet/merges/release/dev16.11-to-rele…
RikkiGibson Jul 2, 2021
2d31f5d
Merge pull request #54572 from dotnet/merges/release/dev17.0-to-relea…
RikkiGibson Jul 2, 2021
e73cf01
Merge pull request #54578 from dotnet/merges/release/dev16.11-to-rele…
Jul 3, 2021
805440e
Merge pull request #54579 from dotnet/merges/release/dev17.0-to-relea…
RikkiGibson Jul 3, 2021
f02b222
Merge pull request #54593 from dotnet/merges/release/dev17.0-to-relea…
RikkiGibson Jul 4, 2021
5db0d4c
Merge pull request #54591 from dotnet/merges/release/dev16.11-vs-deps…
RikkiGibson Jul 4, 2021
687d7ea
Merge pull request #54608 from dotnet/merges/release/dev17.0-to-relea…
RikkiGibson Jul 5, 2021
d16c8bd
Merge pull request #54500 from dibarbet/enc_lsp_diagnostics
JoeRobich Jul 6, 2021
395856e
Fix nuget warnings
JoeRobich Jul 6, 2021
e1611f3
Merge pull request #54656 from dotnet/merges/release/dev17.0-to-relea…
JoeRobich Jul 7, 2021
973cb56
Merge remote-tracking branch 'upstream/release/dev17.0' into merges/r…
allisonchou Jul 8, 2021
0bc8176
Merge pull request #54683 from dotnet/merges/release/dev17.0-to-relea…
JoeRobich Jul 8, 2021
c7ab506
Merge pull request #54721 from dotnet/merges/release/dev16.11-to-rele…
dotnet-bot Jul 9, 2021
bfbe0b4
Merge pull request #54733 from dotnet/merges/release/dev17.0-to-relea…
dotnet-bot Jul 10, 2021
ca27d12
Merge pull request #54732 from dotnet/merges/release/dev16.11-vs-deps…
dotnet-bot Jul 10, 2021
e9b1a09
Revert "Merge pull request #53117 from CyrusNajmabadi/asyncLightbulb"
CyrusNajmabadi Jul 12, 2021
5f7ddf6
Merge pull request #54773 from CyrusNajmabadi/reversions
JoeRobich Jul 12, 2021
dbce5ad
Merge pull request #54854 from dotnet/merges/release/dev16.11-to-rele…
dotnet-bot Jul 16, 2021
c074697
Merge pull request #54862 from dotnet/merges/release/dev17.0-to-relea…
dotnet-bot Jul 16, 2021
4961398
Merge remote-tracking branch 'upstream/release/dev16.11-vs-deps' into…
allisonchou Jul 16, 2021
68b71f5
Merge pull request #54865 from dotnet/merges/release/dev16.11-vs-deps…
JoeRobich Jul 16, 2021
a85559a
Merge pull request #54954 from JoeRobich/fix-nuget-warnings-17
JoeRobich Jul 20, 2021
6d0ef14
Merge pull request #55029 from dotnet/merges/release/dev17.0-to-relea…
dotnet-bot Jul 21, 2021
2bffbf0
Fix merge conflicts
allisonchou Jul 21, 2021
ea2a852
Dev16->17 changes
allisonchou Jul 22, 2021
e6752bd
update queue name
allisonchou Jul 22, 2021
644e516
Update docs/wiki/Diagnosing-Project-System-Build-Errors.md
allisonchou Jul 22, 2021
7e47e72
Update azure-pipelines-integration.yml
allisonchou Jul 22, 2021
7f6f33b
Update azure-pipelines-official.yml
allisonchou Jul 22, 2021
65397ca
Update global.json
allisonchou Jul 22, 2021
58c7ccd
Fix merge conflicts
allisonchou Jul 22, 2021
d41f184
Dev16->17 updates
allisonchou Jul 22, 2021
63fc7ef
Update MSBuild Workspace test projects target framework
JoeRobich Jul 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions azure-pipelines-integration.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# Branches that trigger a build on commit

# Temporarily disabling integration tests in CI in dev17 until we have a public preview to run them on
trigger: none
# - main
# - main-vs-deps
# - release/*
# - features/*
# - demos/*
trigger:
- main
- main-vs-deps
- release/*
- features/*
- demos/*

# Branches that trigger builds on PR
pr: none
# - main
# - main-vs-deps
# - release/*
# - features/*
# - demos/*
pr:
- main
- main-vs-deps
- release/*
- features/*
- demos/*

jobs:
- job: VS_Integration
Expand Down
12 changes: 5 additions & 7 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,11 @@ stages:
displayName: Build and Test

jobs:
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev16.11-vs-deps') }}:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
MirrorRepo: roslyn
MirrorBranch: release/dev16.11-vs-deps
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-ROSLYN'
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
CreatePr: false
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-ROSLYN'

- template: eng/common/templates/jobs/source-build.yml

Expand Down
2 changes: 1 addition & 1 deletion docs/compilers/Compiler Toolset NuPkgs.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ older version of MSBuild. For example using Microsoft.Net.Compilers.Toolset
3.5 (C# 8) inside MSBuild 15 is explicitly not a supported scenario.

Customers who want to use the compiler as a part of their supported build
infrastructure should use the [Visual Studio Build Tools SKU](https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019])
infrastructure should use the [Visual Studio Build Tools SKU](https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022])
) or [.NET SDK](https://dotnet.microsoft.com/download/visual-studio-sdks)

## NuPkg Installation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Using the command line, Roslyn can be developed using the following pattern:

The minimal required version of .NET Framework is 4.7.2.

## Developing with Visual Studio 2019
## Developing with Visual Studio 2022

1. [Visual Studio 2019 16.9](https://visualstudio.microsoft.com/downloads/)
1. [Visual Studio 2022 17.0 Preview](https://visualstudio.microsoft.com/vs/preview/vs2022/)
- Ensure C#, VB, MSBuild, .NET Core and Visual Studio Extensibility are included in the selected work loads
- Ensure Visual Studio is on Version "16.9" or greater
- Ensure Visual Studio is on Version "17.0" or greater
- Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
- Restart Visual Studio
1. [.NET 6.0 Preview 3 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-6.0.100-preview.3-windows-x64-installer)
Expand All @@ -37,7 +37,7 @@ There are a number of options for running the core Roslyn unit tests:

The Test.cmd script will run our unit test on already built binaries. It can be passed the `-build` argument to force a new build before running tests.

1. Run the "Developer Command Prompt for VS2019" from your start menu.
1. Run the "Developer Command Prompt for VS2022" from your start menu.
2. Navigate to the directory of your Git clone.
3. Run `Test.cmd` in the command prompt.

Expand Down
2 changes: 1 addition & 1 deletion docs/wiki/Building-Testing-and-Debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Here are the main branches you should know about:

| Branch | |
| ------ | ----- |
| [**main**](https://github.com/dotnet/roslyn/tree/main) | Our primary branch. Changes here currently target Visual Studio 2019 16.4. If in doubt, this is where you should work, and submit pull requests. <br/>[Instructions for Building on Windows](https://github.com/dotnet/roslyn/blob/main/docs/contributing/Building,%20Debugging,%20and%20Testing%20on%20Windows.md) <br/>[Instructions for Building on Linux and Mac](https://github.com/dotnet/roslyn/blob/main/docs/infrastructure/cross-platform.md) |
| [**main**](https://github.com/dotnet/roslyn/tree/main) | Our primary branch. Changes here currently target Visual Studio 2022 17.0. If in doubt, this is where you should work, and submit pull requests. <br/>[Instructions for Building on Windows](https://github.com/dotnet/roslyn/blob/main/docs/contributing/Building,%20Debugging,%20and%20Testing%20on%20Windows.md) <br/>[Instructions for Building on Linux and Mac](https://github.com/dotnet/roslyn/blob/main/docs/infrastructure/cross-platform.md) |

## Known Issues
Please see the [known contributor issues](https://github.com/dotnet/roslyn/labels/Contributor%20Pain) that you might encounter contributing to Roslyn. If you issue isn't listed, please file it.
2 changes: 1 addition & 1 deletion docs/wiki/Diagnosing-Project-System-Build-Errors.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ There are a few ways to tell:
3. If you're using Visual Studio 2015 Update 2 or later, look for warning IDE0006 in the error list:
![IDE0006 error example](images/design-time-build-errors/ide0006.png)

## How do I get log files to diagnose what is happening in Visual Studio 2019?
## How do I get log files to diagnose what is happening in Visual Studio 2022?

1. Install the [Project System Tools Extension from the Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.ProjectSystemTools)
allisonchou marked this conversation as resolved.
Show resolved Hide resolved
2. Restart Visual Studio as a part of installing the extension.
Expand Down
3 changes: 1 addition & 2 deletions eng/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,7 @@ function TestUsingRunTests() {
$args += " --tfm net472"
$args += " --retry"
$args += " --sequential"
# Skip VS integration tests prior to having a build of dev17 available for testing
# $args += " --include '\.IntegrationTests'"
$args += " --include '\.IntegrationTests'"
$args += " --include 'Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests'"

if ($lspEditor) {
Expand Down