Merge upstream changes

2017-09-01 13:17:22 -07:00 · 2017-09-01 13:17:22 -07:00 · 9b331673fe
commit 9b331673fe
parent ac67434ea4 8ef162fd13
67 changed files with 877 additions and 316 deletions
--- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
+++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
@ -192,7 +192,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
                         .And.HaveStdOutContaining("Hello World!");
        }

-        [Fact(Skip = "https://github.com/dotnet/cli/issues/7476")]
+        [Fact]
        public void ItRunsAppWhenRestoringToSpecificPackageDirectory()
        {
            var rootPath = TestAssets.CreateTestDirectory().FullName;