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 master to fsharp5 #6575

Merged
3 commits merged into from
Apr 19, 2019
Merged

Merge master to fsharp5 #6575

3 commits merged into from
Apr 19, 2019

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from master into fsharp5.

git fetch --all
git checkout merges/master-to-fsharp5
git reset --hard upstream/fsharp5
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-fsharp5 --force

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

dotnet-maestro bot and others added 3 commits April 18, 2019 17:07
…418.1 (#6571)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19218.1
* Trying to build benchmarks

* Benchmark testing 100 referenced projects in the compiler service

* Fixed project reference bit

* Change stamp

* Fixed build
* cleanup fcs props

* cleanup fcs props

* fix build

* fix paths

* remove file
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

@ghost ghost merged commit 43e0459 into fsharp5 Apr 19, 2019
@ghost ghost deleted the merges/master-to-fsharp5 branch April 19, 2019 02:00
@dotnet-bot dotnet-bot restored the merges/master-to-fsharp5 branch April 19, 2019 12:01
@dotnet-bot dotnet-bot deleted the merges/master-to-fsharp5 branch April 19, 2019 12:01
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants