mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix build break on Windows

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-03-28 16:54:06 -07:00
parent a23568b4e5
commit 14aa53eeff
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/dotnet-cli-build/TestTargets.cs
View file

@ -60,10 +60,10 @@ namespace Microsoft.DotNet.Cli.Build
[Target(nameof(SetupTestPackages), nameof(SetupTestProjects))] [Target(nameof(SetupTestPackages), nameof(SetupTestProjects))]
public static BuildTargetResult SetupTests(BuildTargetContext c) => c.Success(); 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(); 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(); public static BuildTargetResult SetupTestProjects(BuildTargetContext c) => c.Success();
[Target] [Target]

4
test/dotnet.Tests/PackagedCommandTests.cs
View file

@ -14,10 +14,12 @@ namespace Microsoft.DotNet.Tests
public class PackagedCommandTests : TestBase public class PackagedCommandTests : TestBase
{ {
private readonly string _testProjectsRoot; private readonly string _testProjectsRoot;
private readonly string _desktopTestProjectsRoot;
public PackagedCommandTests() public PackagedCommandTests()
{ {
_testProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects"); _testProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "TestProjects");
_desktopTestProjectsRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets", "DesktopTestProjects");
} }
[Theory] [Theory]
@ -51,7 +53,7 @@ namespace Microsoft.DotNet.Tests
return; return;
} }
var appDirectory = Path.Combine(_testProjectsRoot, "AppWithDirectDependencyDesktopAndPortable"); var appDirectory = Path.Combine(_desktopTestProjectsRoot, "AppWithDirectDependencyDesktopAndPortable");
new BuildCommand(Path.Combine(appDirectory, "project.json")) new BuildCommand(Path.Combine(appDirectory, "project.json"))
.Execute() .Execute()