Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0'

Conflicts:
	README.md
	build/Microsoft.DotNet.Cli.Monikers.props
	test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
This commit is contained in:
Eric Erhardt 2017-02-23 15:42:35 -06:00
commit ace9526681
29 changed files with 250 additions and 162 deletions

View file

@ -26,8 +26,8 @@ namespace Microsoft.DotNet.Cli.Build
private static string[][] _templatesAndArgs = new string[][]
{
new string[] { "mvc", "-au Individual -f netcoreapp1.0" },
new string[] { "mvc", "-au Individual -f netcoreapp1.1" }
new string[] { "mvc", "-au Individual -f netcoreapp1.0 --no-tools" },
new string[] { "mvc", "-au Individual -f netcoreapp1.1 --no-tools" }
};
public override bool Execute()