From 14aa53eeff643c1b86eff8d61a597bef75a29259 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Mon, 28 Mar 2016 16:54:06 -0700 Subject: [PATCH] Fix build break on Windows --- scripts/dotnet-cli-build/TestTargets.cs | 4 ++-- test/dotnet.Tests/PackagedCommandTests.cs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/dotnet-cli-build/TestTargets.cs b/scripts/dotnet-cli-build/TestTargets.cs index a7e1e4819..990cc77da 100644 --- a/scripts/dotnet-cli-build/TestTargets.cs +++ b/scripts/dotnet-cli-build/TestTargets.cs @@ -60,10 +60,10 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(SetupTestPackages), nameof(SetupTestProjects))] public static BuildTargetResult SetupTests(BuildTargetContext c) => c.Success(); - [Target(nameof(RestoreTestAssetPackages), nameof(RestoreDesktopTestAssetProjects), nameof(BuildTestAssetPackages))] + [Target(nameof(RestoreTestAssetPackages), nameof(BuildTestAssetPackages))] public static BuildTargetResult SetupTestPackages(BuildTargetContext c) => c.Success(); - [Target(nameof(RestoreTestAssetProjects), nameof(BuildTestAssetProjects))] + [Target(nameof(RestoreTestAssetProjects), nameof(RestoreDesktopTestAssetProjects), nameof(BuildTestAssetProjects))] public static BuildTargetResult SetupTestProjects(BuildTargetContext c) => c.Success(); [Target] diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index 300cc7d7d..3fee9f023 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -14,10 +14,12 @@ namespace Microsoft.DotNet.Tests public class PackagedCommandTests : TestBase { private readonly string _testProjectsRoot; + private readonly string _desktopTestProjectsRoot; public PackagedCommandTests() { _testProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects"); + _desktopTestProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "DesktopTestProjects"); } [Theory] @@ -51,7 +53,7 @@ namespace Microsoft.DotNet.Tests return; } - var appDirectory = Path.Combine(_testProjectsRoot, "AppWithDirectDependencyDesktopAndPortable"); + var appDirectory = Path.Combine(_desktopTestProjectsRoot, "AppWithDirectDependencyDesktopAndPortable"); new BuildCommand(Path.Combine(appDirectory, "project.json")) .Execute()