Skip to content

Merge dev15.8-preview3 to master#27551

Merged
Shyam-Gupta merged 3 commits intomasterfrom
merges/dev15.8-preview3-to-master
Jun 8, 2018
Merged

Merge dev15.8-preview3 to master#27551
Shyam-Gupta merged 3 commits intomasterfrom
merges/dev15.8-preview3-to-master

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from dev15.8-preview3 into master.

git fetch --all
git checkout merges/dev15.8-preview3-to-master
git reset --hard upstream/master
git merge upstream/dev15.8-preview3
# Fix merge conflicts
git commit
git push merges/dev15.8-preview3-to-master --force

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

* Stop NGENing System.Net.Http and dependencies

* Added comment to explain why

* Fix BuildBoss
@dotnet-bot dotnet-bot requested a review from a team as a code owner June 7, 2018 02:00
@Shyam-Gupta
Copy link
Copy Markdown
Member

Build windows_build_correctness_prtest failed with error:

10:06:40 Failed
10:06:40 Command failed to execute: D:\j\workspace\windows_build---1b9ec577\Binaries\Release\Exes\BuildBoss\BuildBoss.exe Roslyn.sln Compilers.sln SourceBuild.sln -r D:\j\workspace\windows_build---1b9ec577 -release
10:06:40 System.Management.Automation.RuntimeException: Command failed to execute: D:\j\workspace\windows_build---1b9ec577\Binaries\Release\Exes\BuildBoss\BuildBoss.exe Roslyn.sln Compilers.sln SourceBuild.sln -r D:\j\workspace\windows_build---1b9ec577 -release

https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_build_correctness_prtest/14274/consoleFull#-410211996a086b3e-df04-41d2-bc4d-43e8f9406d07

Rerunning

@Shyam-Gupta
Copy link
Copy Markdown
Member

@dotnet-bot retest windows_build_correctness_prtest please

@OmarTawfik OmarTawfik self-assigned this Jun 8, 2018
@Shyam-Gupta Shyam-Gupta merged commit b3f19d8 into master Jun 8, 2018
@Shyam-Gupta Shyam-Gupta deleted the merges/dev15.8-preview3-to-master branch June 8, 2018 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants