From 6b1229b212e1bb35d444a66ab336cbd1f5fea6c1 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 7 Mar 2020 12:17:57 +0100 Subject: [PATCH 1/5] Bundle NuGet.Build.Tasks.Console in redist Add the NuGet.Build.Tasks.Console package for the pack bundle. Fixes https://github.com/NuGet/Home/issues/9267 --- eng/Versions.props | 1 + src/Layout/redist/redist.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index a93c5930e009..009021c7ca01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,6 +40,7 @@ 5.6.0-preview.1.6478 + $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index c6748e6ada81..a9fbbb60a902 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -20,6 +20,7 @@ + From 05e596b927898a03667b5160616a0563deceb6c0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 11 Mar 2020 20:13:51 +0100 Subject: [PATCH 2/5] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 009021c7ca01..5868e356f647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ 5.6.0-preview.1.6478 - $(NuGetBuildTasksPackageVersion) + 5.6.0-preview.2.6504 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 70204c7e2f1aaa4715712430152903031d11cfd0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 11 Mar 2020 20:18:48 +0100 Subject: [PATCH 3/5] Update Versions.props --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 334fcbff54a3..4c3fa6f0cfd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,8 +39,8 @@ - 5.6.0-preview.2.6489 - 5.6.0-preview.2.6504 + 5.6.0-preview.2.6504 + $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From bf933a7309a33fe1ae081c4b952a52c95922b13e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 13 Mar 2020 12:45:42 +0100 Subject: [PATCH 4/5] Add RestoreTaskEx tests --- .../GivenThatIWantToRestoreApp.cs | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs index f1aa44c4da97..e27bfea922b5 100644 --- a/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs +++ b/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs @@ -22,8 +22,10 @@ public GivenThatIWantToRestoreApp(ITestOutputHelper log) : base(log) { } - [Fact] - public void ItRestoresAppToSpecificDirectory() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresAppToSpecificDirectory(bool useStaticGraphEvaluation) { var rootPath = _testAssetsManager.CreateTestDirectory().Path; @@ -37,6 +39,7 @@ public void ItRestoresAppToSpecificDirectory() .Path; string[] args = new[] { "--packages", fullPath }; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new DotnetRestoreCommand(Log) .WithWorkingDirectory(projectDirectory) .Execute(args) @@ -48,8 +51,10 @@ public void ItRestoresAppToSpecificDirectory() Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0); } - [Fact] - public void ItRestoresLibToSpecificDirectory() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresLibToSpecificDirectory(bool useStaticGraphEvaluation) { var rootPath = _testAssetsManager.CreateTestDirectory().Path; @@ -64,6 +69,7 @@ public void ItRestoresLibToSpecificDirectory() .Pass(); string[] args = new[] { "--packages", dir }; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new DotnetRestoreCommand(Log) .WithWorkingDirectory(rootPath) .Execute(args) @@ -75,8 +81,10 @@ public void ItRestoresLibToSpecificDirectory() Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0); } - [Fact] - public void ItRestoresTestAppToSpecificDirectory() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresTestAppToSpecificDirectory(bool useStaticGraphEvaluation) { var rootPath = _testAssetsManager.CopyTestAsset("VSTestCore") .WithSource() @@ -87,6 +95,7 @@ public void ItRestoresTestAppToSpecificDirectory() string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); string[] args = new[] { "--packages", dir }; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new DotnetRestoreCommand(Log) .WithWorkingDirectory(rootPath) .Execute(args) @@ -98,8 +107,10 @@ public void ItRestoresTestAppToSpecificDirectory() Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0); } - [Fact] - public void ItRestoresWithTheSpecifiedVerbosity() + [Theory] + [InlineData(true)] + [InlineData(false)] + public void ItRestoresWithTheSpecifiedVerbosity(bool useStaticGraphEvaluation) { var rootPath = _testAssetsManager.CreateTestDirectory().Path; @@ -114,6 +125,7 @@ public void ItRestoresWithTheSpecifiedVerbosity() .Pass(); string[] args = new[] { "--packages", dir, "--verbosity", "quiet" }; + args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); new DotnetRestoreCommand(Log) .WithWorkingDirectory(rootPath) .Execute(args) @@ -122,5 +134,10 @@ public void ItRestoresWithTheSpecifiedVerbosity() .And.NotHaveStdErr() .And.NotHaveStdOut(); } + + private static string[] HandleStaticGraphEvaluation(bool useStaticGraphEvaluation, string[] args) => + useStaticGraphEvaluation ? + args.Append("/p:RestoreUseStaticGraphEvaluation=true").ToArray() : + args; } } From a17158465b0e24169601bdc3368459af64eb3901 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 14 Mar 2020 16:10:00 +0100 Subject: [PATCH 5/5] Update NuGet to 5.6.0-preview.2.6508 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4c3fa6f0cfd6..3b3769207fc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 5.6.0-preview.2.6504 + 5.6.0-preview.2.6508 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion)