Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Merge release/2.0.0 to master#7074

Merged
livarcocc merged 18 commits intomasterfrom
merges/release/2.0.0-to-master-20170705-070028
Jul 5, 2017
Merged

Merge release/2.0.0 to master#7074
livarcocc merged 18 commits intomasterfrom
merges/release/2.0.0-to-master-20170705-070028

Conversation

@dotnet-bot
Copy link
Copy Markdown

This is an automatically generated pull request from release/2.0.0 into master.

git fetch --all
git checkout merges/release/2.0.0-to-master-20170705-070028
git reset --hard upstream/master
git merge upstream/release/2.0.0
# Fix merge conflicts
git commit
git push merges/release/2.0.0-to-master-20170705-070028 --force

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

KevinRansom and others added 17 commits June 28, 2017 21:18
Enable VB for dotnet cli 1.1
Revert "Pinning the SDK version to: "2.0.0-preview3-006628""
…sgen229Coherence26027

Update to SetupCrossgen 229 - Coherence 26027
…-to-release/2.0.0-20170703-070029

* dotnet/rel/1.1.0:
  feedback
  Enable VB for dotnet cli 1.1
  MSBuild 15.3.402
  Add F# to dotnet cli 1..1.0
…0-20170703-070029

Merge rel/1.1.0 to release/2.0.0
Update SDK to 2.0.0-preview3-20170703-2
Update runtime to 2.0.0-preview3-25502-01
@livarcocc
Copy link
Copy Markdown

@dotnet-bot Test CentOS7.1 x64 Debug Build

@livarcocc livarcocc merged commit 4842c2c into master Jul 5, 2017
@livarcocc livarcocc deleted the merges/release/2.0.0-to-master-20170705-070028 branch July 5, 2017 20:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants