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

Merge dev16.0 to master #6413

Merged
merged 251 commits into from
Apr 4, 2019
Merged

Merge dev16.0 to master #6413

merged 251 commits into from
Apr 4, 2019

Conversation

dotnet-bot
Copy link
Contributor

@dotnet-bot dotnet-bot commented Apr 2, 2019 •
edited by brettfo
Loading

This is an automatically generated pull request from dev16.0 into master.

DON'T REDO THE MERGE VIA THE REGULAR APPROACH!

If you absolutely need to merge new changes do a simple git merge upstream/master or git merge upstream/dev16.0, but ideally you won't need these.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

brettfo and others added 30 commits June 7, 2018 11:05
@brettfo
Merge pull request #5124 from Microsoft/merges/dev15.8-to-dev16.0
262a08d 
Merge dev15.8 to dev16.0
@brettfo
Merge pull request #5127 from Microsoft/merges/master-to-dev16.0
fdc4b7a 
Merge master to dev16.0
@dotnet-bot @dsyme
UIThread (#5128) (#5133)
8ae9028
@dotnet-bot @dsyme
Merge master to dev16.0 (#5134)
021c6e7 
* LOC CHECKIN | Microsoft/visualfsharp master | 20180607 (#5130)

* Optimize format string parsing (#5121)

* normalize source and create line endings array both used for format string parsing once per file

* comments

* let lazy do its job

* remove parens
@dsyme
Merge pull request #5143 from Microsoft/merges/master-to-dev16.0
9c530b2 
Merge master to dev16.0
@KevinRansom
Merge pull request #5142 from Microsoft/merges/dev15.8-to-dev16.0
295538c 
Merge dev15.8 to dev16.0
@KevinRansom
Merge pull request #5147 from Microsoft/merges/master-to-dev16.0
469e050 
Merge master to dev16.0
@brettfo
Merge branch 'dev16.0' into merges/master-to-dev16.0
bf9179a
@brettfo
Merge pull request #5151 from Microsoft/merges/master-to-dev16.0
ba09a31 
Merge master to dev16.0
@KevinRansom
Merge pull request #5156 from Microsoft/merges/master-to-dev16.0
1d6c433 
Merge master to dev16.0
@KevinRansom
Merge pull request #5163 from Microsoft/merges/dev15.8-to-dev16.0
10c1de6 
Merge dev15.8 to dev16.0
@KevinRansom
Merge pull request #5164 from Microsoft/merges/master-to-dev16.0
7e86a0d 
Merge master to dev16.0
@KevinRansom
merge
e9e12ba
@KevinRansom
Merge pull request #5166 from Microsoft/merges/master-to-dev16.0
1e2159d 
Merge master to dev16.0
@KevinRansom
Merge pull request #5168 from Microsoft/merges/dev15.8-to-dev16.0
215ead8 
Merge dev15.8 to dev16.0
@KevinRansom
Merge pull request #5174 from Microsoft/merges/master-to-dev16.0
993ba4d 
Merge master to dev16.0
@KevinRansom
Merge pull request #5177 from Microsoft/merges/master-to-dev16.0
5d15740 
Merge master to dev16.0
@KevinRansom
Merge pull request #5189 from Microsoft/merges/dev15.8-to-dev16.0
7aabee6 
Merge dev15.8 to dev16.0
@KevinRansom
Merge branch 'dev16.0' into merges/master-to-dev16.0
16c9028
Update unit test config file
a0c1f66
Merge branch 'merges/master-to-dev16.0' into dev16.0
343ee40
@KevinRansom
Merge pull request #5202 from Microsoft/merges/dev15.8-to-dev16.0
0474762 
Merge dev15.8 to dev16.0
@dotnet-bot @KevinRansom
resolve mscorlib (#5183) (#5203) (#5209)
dbfcd8a
@KevinRansom
Merge pull request #5219 from Microsoft/merges/dev15.8-to-dev16.0
c0b2069 
Merge dev15.8 to dev16.0
@KevinRansom
Merge pull request #5249 from Microsoft/merges/master-to-dev16.0
ae7e39c 
Merge master to dev16.0
@KevinRansom
Merge branch 'dev16.0' into merges/dev15.8-to-dev16.0
4ca11df
@KevinRansom
Merge pull request #5248 from Microsoft/merges/dev15.8-to-dev16.0
3bbc160 
Merge dev15.8 to dev16.0
@KevinRansom
merge
3379ec9
merge
d3f972f
merge issue
8f30715
KevinRansom and others added 9 commits February 13, 2019 15:22
@brettfo
Copy link
Member

brettfo commented Apr 2, 2019

I removed the Auto-Merge If Tests Pass label because I need to handle this one manually.

@cartermp
Copy link
Contributor

cartermp commented Apr 2, 2019

image

lol

@brettfo brettfo force-pushed the merges/dev16.0-to-master branch from 771dcf2 to 2681748 Compare April 3, 2019 00:02
@v-asdhin
Copy link

v-asdhin commented Apr 3, 2019

@brettfo Check visualfsharp-CI failed. Please have a look.

@brettfo brettfo force-pushed the merges/dev16.0-to-master branch 7 times, most recently from 5316ee6 to f7429a6 Compare April 4, 2019 21:05
@brettfo brettfo force-pushed the merges/dev16.0-to-master branch from f7429a6 to bd24505 Compare April 4, 2019 22:20
@brettfo brettfo merged commit 88d18d9 into master Apr 4, 2019
@brettfo brettfo deleted the merges/dev16.0-to-master branch April 4, 2019 23:22
@brettfo brettfo mentioned this pull request Apr 4, 2019
Closed
nosami pushed a commit to xamarin/visualfsharp that referenced this pull request Jan 26, 2022
@brettfo
Merge pull request dotnet#6413 from Microsoft/merges/dev16.0-to-master
1c21b64 
Merge dev16.0 to master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@dotnet-bot @brettfo @cartermp @v-asdhin @dsyme @KevinRansom @TIHan @v-zbsail @vasily-kirichenko