Sridhar Periyasamy 2a94a1e384 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx ... Conflicts: Microsoft.DotNet.Cli.sln scripts/dockerbuild.sh scripts/test/setup/build-test-prerequisites.ps1 test/dotnet-build.Tests/IncrementalTestBase.cs test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs test/dotnet-publish.Tests/project.json		2016-02-12 17:26:58 -08:00
..
Program.cs	TestFramework with support for managing test projects.	2016-02-10 00:21:19 -08:00
project.json	Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx	2016-02-12 17:26:58 -08:00