Skip to content
This repository has been archived by the owner on Dec 19, 2018. It is now read-only.

[automated] Merge branch 'release/2.2' => 'master' #2577

Merged
merged 12 commits into from
Sep 29, 2018
Merged

[automated] Merge branch 'release/2.2' => 'master' #2577

merged 12 commits into from
Sep 29, 2018

Conversation

dotnet-maestro-bot
Copy link

I detected changes in the release/2.2 branch which have not been merged yet to master.
I'm a robot and am configured to help you automatically keep master up to date, so
I've opened this PR.

This PR merges commits made on release/2.2 by the following committers:

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR
by creating a merge commit, not a squash or rebase commit.

merge button instructions

You can also do this on command line:

git checkout master
git pull
git fetch --force https://github.com/dotnet-maestro-bot/Razor merge/release/2.2-to-master:merge/release/2.2-to-master
git merge merge/release/2.2-to-master
git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging.
You can do this using GitHub
or using the command line.

Maintainers of this repo have permission to the branch 'merge/release/2.2-to-master' on https://github.com/dotnet-maestro-bot/Razor.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on release/2.2.

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

aspnetci and others added 3 commits September 9, 2018 12:26
@aspnetci
Update dependencies.props
51868b4 
[auto-updated: dependencies]
@ajaybhargavb
Better logging to help debug test failure (aspnet#2576)
f93f67a
@rynowak
Clean up timeout reporting
1e8e541 
This was sometimes reporting a null when the timeout takes place. We
need to throw with a timeout for real
@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@aspnetci
Update dependencies.props
2bf00ff 
[auto-updated: dependencies]
@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@pranavkm
Move RazorGenerate and RazorTagHelper tasks in to the Sdk
f70df60 
Loading multiple versions of a task assembly result results in MSBuild on .NET Core to fail.
Addressing this by moving the tasks in to the Sdk and renaming it. This should avoid
immediate issues for a 2.1 and 2.2 project co-existing and future proofs 2.2 and later.

Fixes aspnet#2553
@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@pranavkm
Copy link
Contributor

@rynowak can you handle this merge? Not familiar with BackgroundDocumentGenerator to resolve the merge conflict there.

@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@aspnetci
Update dependencies.props
ecbaf35 
[auto-updated: dependencies]
@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@dotnet-maestro-bot
Copy link
Author

This pull request has been updated.

This PR merges commits made on release/2.2 by the following committers:

@natemcmaster natemcmaster merged commit e4ebae1 into aspnet:master Sep 29, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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.
7 participants
@dotnet-maestro-bot @pranavkm @natemcmaster @aspnetci @ajaybhargavb @rynowak @benaadams