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.

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

Move to MSBuild 16.0 #34010

Closed
wants to merge 492 commits into from
Closed

Move to MSBuild 16.0 #34010

wants to merge 492 commits into from

Conversation

jaredpar
Copy link
Member

@jaredpar jaredpar commented Mar 11, 2019 •
edited
Loading

This is a necessary pre-req to us adotping the 3.0 .NET Core SDK.

As a part of this we're also merging dev16.0-vs-deps as it's necessary to keep integration tests running. Also it's the logical step once Dev16 becomes our base development environment.

dotnet-automerge-bot and others added 30 commits December 31, 2018 17:00
Merge pull request dotnet#32075 from dotnet/merges/master-to-master-v…
dbdb329 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32077 from dotnet/merges/master-to-master-v…
baed380 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32084 from dotnet/merges/master-to-master-v…
4cec819 
…s-deps

Merge master to master-vs-deps
@JoeRobich
Merge branch 'master-vs-deps' into merges/master-to-master-vs-deps
47ef1dc
Merge pull request dotnet#32108 from dotnet/merges/master-to-master-v…
aa27d5a 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32123 from dotnet/merges/master-to-master-v…
d164a6b 
…s-deps

Merge master to master-vs-deps
@ivanbasov
completion: do not insert extra colon if colon has been typed (dotnet…
51e8b02 
…#32134)
@jaredpar
Publish OptProf Data files
ce35caa 
This publishes the OptProf Data files during an official build. This
just allows for us to easily inspect the results without having to do a
download from the drop server.
@ivanbasov
async completion: fixing 'Nullable object must have a value' when del…
b0b5351 
…eting the whole word (dotnet#32143)
@JoeRobich
Merge remote-tracking branch 'origin/master-vs-deps' into merges/mast…
fad6315 
…er-to-master-vs-deps
@JoeRobich
Merge remote-tracking branch 'origin/master' into merges/master-to-ma…
a995fff 
…ster-vs-deps
@JoeRobich
Merge remote-tracking branch 'origin/master-vs-deps' into merges/mast…
b6b6463 
…er-to-master-vs-deps
Merge pull request dotnet#32139 from dotnet/merges/master-to-master-v…
26dc287 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32155 from dotnet/merges/master-to-master-v…
6489016 
…s-deps

Merge master to master-vs-deps
@jmarolf
Merge remote-tracking branch 'upstream/master' into merge-master-to-m…
fbcfd0e 
…aster-vs-deps
@ivanbasov
use global options for async completion (dotnet#32045)
e8c9d6f
@jmarolf
Merge pull request dotnet#32162 from jmarolf/merge-master-to-master-v…
75e3797 
…s-deps

Merge master to master vs deps
@ivanbasov
tabs should not trigger completion (dotnet#32144)
d9b54d1
@ivanbasov
consume NoSideEffects flag in EE (dotnet#31811)
cddb0fa
@JoeRobich
Merge branch 'master-vs-deps' into merges/master-to-master-vs-deps
c640ee9
@JoeRobich
Merge branch 'dev16.0-preview2-vs-deps' into merges/dev16.0-preview2-…
d5e5848 
…to-dev16.0-preview2-vs-deps
Merge pull request dotnet#32181 from dotnet/merges/master-to-master-v…
60541a8 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32189 from dotnet/merges/dev16.0-preview2-t…
cf74cf3 
…o-dev16.0-preview2-vs-deps

Merge dev16.0-preview2 to dev16.0-preview2-vs-deps
Merge pull request dotnet#32198 from dotnet/merges/master-to-master-v…
15504ac 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32220 from dotnet/merges/master-to-master-v…
577f0d5 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32219 from dotnet/merges/dev16.0-preview2-t…
5933884 
…o-dev16.0-preview2-vs-deps

Merge dev16.0-preview2 to dev16.0-preview2-vs-deps
Merge pull request dotnet#32196 from dotnet/merges/dev16.0-preview2-v…
f53cbad 
…s-deps-to-master-vs-deps

Merge dev16.0-preview2-vs-deps to master-vs-deps
Merge pull request dotnet#32239 from dotnet/merges/master-to-master-v…
327bb86 
…s-deps

Merge master to master-vs-deps
Merge pull request dotnet#32238 from dotnet/merges/dev16.0-preview2-v…
24dddba 
…s-deps-to-master-vs-deps

Merge dev16.0-preview2-vs-deps to master-vs-deps
@heejaechang
Update OptimizationData to 3.0.0-beta2-19053-01
f8c07ee
@jaredpar jaredpar closed this Mar 12, 2019
@jaredpar jaredpar reopened this Mar 12, 2019
@tmeschter
Merge pull request dotnet#33940 from v-mdriml/localization
88ca01f 
LOC CHECKIN | dotnet/roslyn dev16.0-vs-deps | 20190307
@jaredpar jaredpar marked this pull request as ready for review March 12, 2019 17:54
@jaredpar jaredpar requested review from a team as code owners March 12, 2019 17:54
@jaredpar
Copy link
Member Author

I juts fixed these merges... and time to od it again.

@jaredpar
Copy link
Member Author

@dotnet/roslyn-ide, @dotnet/roslyn-infrastructure for review.

IDE team I made merge adjustments to the following files:

  • src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/IntellisenseQuickInfoBuilder.cs
  • src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
  • src/EditorFeatures/TestUtilities2/Intellisense/ITestState.vb
  • src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpReplIntellisense.cs

The changes were straight forward but someone should give them a once over.

@tmat
Copy link
Member

tmat commented Mar 12, 2019

I am confused. Why does this PR have 200+ commits?

@jaredpar
Copy link
Member Author

@tmat

I am confused. Why does this PR have 200+ commits?

It's both a move to MSBuild 16.0 + a merge from dev16.0-vs-deps. The latter is required to get integration tests running. Sent an email this morning explaining. Will update PR info .

@jaredpar
Copy link
Member Author

FYI: messed up a merge. Need to redo it. Hold off reviewing for a bit.

@tmat
Copy link
Member

tmat commented Mar 12, 2019

Can we do the merge from dev16.0-vs-deps separately?

@tmat
Copy link
Member

tmat commented Mar 12, 2019

(I guess not)

@tmat
Copy link
Member

tmat commented Mar 12, 2019

Is "xcopy-msbuild": "16.0.0-rc1-alpha" the only change that's not the merge from dev16.0-vs-deps?

@jaredpar
Copy link
Member Author

@tmat

Is "xcopy-msbuild": "16.0.0-rc1-alpha" the only change that's not the merge from dev16.0-vs-deps?

That and the docs change for contributing

Can we do the merge from dev16.0-vs-deps separately?

In theory it's possible. Just need to change the LocateVisualStudio call in Deploy-VsixViaTool function to look for dev15. That went down a different rabbit hole though. Eventually I just found this was faster.

jaredpar and others added 3 commits March 12, 2019 16:13
@jaredpar
XLF
f6e10be
@jaredpar
Update TODO to point at issue
220f4ee
@ivanbasov @jaredpar
Regex Completion + Async Completion = Failure to trigger on [ in VB (…
45c1380 
…dotnet#33921)

* Regex Completion + Async Completion = Failure to trigger on `[` in VB

* Update VisualBasicCompletionCommandHandlerTests_Regex.vb
@jaredpar jaredpar mentioned this pull request Mar 13, 2019
Merged
@jaredpar
Copy link
Member Author

Closing in favor of #34081

@jaredpar jaredpar closed this Mar 13, 2019
@jaredpar jaredpar deleted the fix-msbuild branch March 13, 2019 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sharwell sharwell sharwell left review comments

@rainersigwald rainersigwald rainersigwald left review comments

Assignees
No one assigned
Labels
Area-Infrastructure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.