85b2a129db
Conflicts: TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj build.proj build/Compile.targets build/Microsoft.DotNet.Cli.Compile.targets build/Microsoft.DotNet.Cli.DependencyVersions.props build/Microsoft.DotNet.Cli.Monikers.props build/Microsoft.DotNet.Cli.Prepare.targets build/package/Microsoft.DotNet.Cli.Nupkg.targets build/package/Nupkg.targets build/test/TestPackageProjects.targets build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs build_projects/dotnet-cli-build/GetCommitCount.cs build_projects/dotnet-cli-build/dotnet-cli-build.csproj build_projects/shared-build-targets-utils/Utils/BuildVersion.cs src/dotnet-archive/dotnet-archive.csproj src/tool_msbuild/tool_msbuild.csproj src/tool_nuget/tool_nuget.csproj test/ArgumentForwardingTests/ArgumentForwardingTests.csproj test/ArgumentsReflector/ArgumentsReflector.csproj test/EndToEnd/EndToEnd.csproj test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj test/binding-redirects.Tests/binding-redirects.Tests.csproj test/crossgen.Tests/crossgen.Tests.csproj test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj test/dotnet-build.Tests/dotnet-build.Tests.csproj test/dotnet-help.Tests/dotnet-help.Tests.csproj test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj test/dotnet-new.Tests/dotnet-new.Tests.csproj test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj test/dotnet-pack.Tests/dotnet-pack.Tests.csproj test/dotnet-publish.Tests/dotnet-publish.Tests.csproj test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj test/dotnet-restore.Tests/dotnet-restore.Tests.csproj test/dotnet-run.Tests/dotnet-run.Tests.csproj test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj test/dotnet-test.Tests/dotnet-test.Tests.csproj test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj test/dotnet.Tests/dotnet.Tests.csproj test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj tools/Archiver/Archiver.csproj
351 lines
12 KiB
C#
351 lines
12 KiB
C#
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
|
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
|
|
|
using System;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using FluentAssertions;
|
|
using Microsoft.DotNet.Cli.Utils;
|
|
using Microsoft.DotNet.TestFramework;
|
|
using Microsoft.DotNet.Tools.Test.Utilities;
|
|
using NuGet.Frameworks;
|
|
using NuGet.ProjectModel;
|
|
using NuGet.Versioning;
|
|
using Xunit;
|
|
|
|
namespace Microsoft.DotNet.Tests
|
|
{
|
|
public class GivenAProjectToolsCommandResolver : TestBase
|
|
{
|
|
private static readonly NuGetFramework s_toolPackageFramework =
|
|
FrameworkConstants.CommonFrameworks.NetCoreApp10;
|
|
|
|
private const string TestProjectName = "AppWithToolDependency";
|
|
|
|
[Fact]
|
|
public void ItReturnsNullWhenCommandNameIsNull()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = null,
|
|
CommandArguments = new string[] { "" },
|
|
ProjectDirectory = "/some/directory"
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().BeNull();
|
|
}
|
|
|
|
[Fact]
|
|
public void ItReturnsNullWhenProjectDirectoryIsNull()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "command",
|
|
CommandArguments = new string[] { "" },
|
|
ProjectDirectory = null
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().BeNull();
|
|
}
|
|
|
|
[Fact]
|
|
public void ItReturnsNullWhenProjectDirectoryDoesNotContainAProjectFile()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var projectDirectory = TestAssets.CreateTestDirectory();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "command",
|
|
CommandArguments = new string[] { "" },
|
|
ProjectDirectory = projectDirectory.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().BeNull();
|
|
}
|
|
|
|
[Fact]
|
|
public void ItReturnsNullWhenCommandNameDoesNotExistInProjectTools()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "nonexistent-command",
|
|
CommandArguments = null,
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().BeNull();
|
|
}
|
|
|
|
[Fact]
|
|
public void ItReturnsACommandSpecWithDOTNETAsFileNameAndCommandNameInArgsWhenCommandNameExistsInProjectTools()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "dotnet-portable",
|
|
CommandArguments = null,
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().NotBeNull();
|
|
|
|
var commandFile = Path.GetFileNameWithoutExtension(result.Path);
|
|
|
|
commandFile.Should().Be("dotnet");
|
|
|
|
result.Args.Should().Contain(commandResolverArguments.CommandName);
|
|
}
|
|
|
|
[Fact]
|
|
public void ItEscapesCommandArgumentsWhenReturningACommandSpec()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "dotnet-portable",
|
|
CommandArguments = new[] { "arg with space" },
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().NotBeNull("Because the command is a project tool dependency");
|
|
result.Args.Should().Contain("\"arg with space\"");
|
|
}
|
|
|
|
[Fact]
|
|
public void ItReturnsACommandSpecWithArgsContainingCommandPathWhenReturningACommandSpecAndCommandArgumentsAreNull()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "dotnet-portable",
|
|
CommandArguments = null,
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().NotBeNull();
|
|
|
|
var commandPath = result.Args.Trim('"');
|
|
commandPath.Should().Contain("dotnet-portable.dll");
|
|
}
|
|
|
|
[Fact]
|
|
public void ItReturnsACommandSpecWithArgsContainingCommandPathWhenInvokingAToolReferencedWithADifferentCasing()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "dotnet-prefercliruntime",
|
|
CommandArguments = null,
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().NotBeNull();
|
|
|
|
var commandPath = result.Args.Trim('"');
|
|
commandPath.Should().Contain("dotnet-prefercliruntime.dll");
|
|
}
|
|
|
|
[Fact]
|
|
public void ItWritesADepsJsonFileNextToTheLockfile()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "dotnet-portable",
|
|
CommandArguments = null,
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var repoDirectoriesProvider = new RepoDirectoriesProvider();
|
|
|
|
var nugetPackagesRoot = repoDirectoriesProvider.NugetPackages;
|
|
|
|
var toolPathCalculator = new ToolPathCalculator(nugetPackagesRoot);
|
|
|
|
var lockFilePath = toolPathCalculator.GetLockFilePath(
|
|
"dotnet-portable",
|
|
new NuGetVersion("1.0.0"),
|
|
s_toolPackageFramework);
|
|
|
|
var directory = Path.GetDirectoryName(lockFilePath);
|
|
|
|
var depsJsonFile = Directory
|
|
.EnumerateFiles(directory)
|
|
.FirstOrDefault(p => Path.GetFileName(p).EndsWith(FileNameSuffixes.DepsJson));
|
|
|
|
if (depsJsonFile != null)
|
|
{
|
|
File.Delete(depsJsonFile);
|
|
}
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().NotBeNull();
|
|
|
|
new DirectoryInfo(directory)
|
|
.Should().HaveFilesMatching("*.deps.json", SearchOption.TopDirectoryOnly);
|
|
}
|
|
|
|
[Fact]
|
|
public void GenerateDepsJsonMethodDoesntOverwriteWhenDepsFileAlreadyExists()
|
|
{
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var repoDirectoriesProvider = new RepoDirectoriesProvider();
|
|
|
|
var nugetPackagesRoot = repoDirectoriesProvider.NugetPackages;
|
|
|
|
var toolPathCalculator = new ToolPathCalculator(nugetPackagesRoot);
|
|
|
|
var lockFilePath = toolPathCalculator.GetLockFilePath(
|
|
"dotnet-portable",
|
|
new NuGetVersion("1.0.0"),
|
|
s_toolPackageFramework);
|
|
|
|
var lockFile = new LockFileFormat().Read(lockFilePath);
|
|
|
|
var depsJsonFile = Path.Combine(
|
|
Path.GetDirectoryName(lockFilePath),
|
|
"dotnet-portable.deps.json");
|
|
|
|
if (File.Exists(depsJsonFile))
|
|
{
|
|
File.Delete(depsJsonFile);
|
|
}
|
|
File.WriteAllText(depsJsonFile, "temp");
|
|
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
projectToolsCommandResolver.GenerateDepsJsonFile(
|
|
lockFile,
|
|
depsJsonFile,
|
|
new SingleProjectInfo("dotnet-portable", "1.0.0", Enumerable.Empty<ResourceAssemblyInfo>()));
|
|
|
|
File.ReadAllText(depsJsonFile).Should().Be("temp");
|
|
File.Delete(depsJsonFile);
|
|
}
|
|
|
|
[Fact]
|
|
public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get("MSBuildTestApp")
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "dotnet-prefercliruntime",
|
|
CommandArguments = null,
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().NotBeNull();
|
|
|
|
result.Args.Should().Contain("--fx-version 2.0.0");
|
|
}
|
|
|
|
[Fact]
|
|
public void ItDoesNotAddFxVersionAsAParamWhenTheToolDoesNotHaveThePrefercliruntimeFile()
|
|
{
|
|
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
|
|
|
var testInstance = TestAssets.Get(TestProjectName)
|
|
.CreateInstance()
|
|
.WithSourceFiles()
|
|
.WithRestoreFiles();
|
|
|
|
var commandResolverArguments = new CommandResolverArguments()
|
|
{
|
|
CommandName = "dotnet-portable",
|
|
CommandArguments = null,
|
|
ProjectDirectory = testInstance.Root.FullName
|
|
};
|
|
|
|
var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
|
|
|
|
result.Should().NotBeNull();
|
|
|
|
result.Args.Should().NotContain("--fx-version");
|
|
}
|
|
|
|
private ProjectToolsCommandResolver SetupProjectToolsCommandResolver()
|
|
{
|
|
Environment.SetEnvironmentVariable(
|
|
Constants.MSBUILD_EXE_PATH,
|
|
Path.Combine(new RepoDirectoriesProvider().Stage2Sdk, "MSBuild.dll"));
|
|
|
|
var packagedCommandSpecFactory = new PackagedCommandSpecFactoryWithCliRuntime();
|
|
|
|
var projectToolsCommandResolver =
|
|
new ProjectToolsCommandResolver(packagedCommandSpecFactory, new EnvironmentProvider());
|
|
|
|
return projectToolsCommandResolver;
|
|
}
|
|
}
|
|
}
|