We had a bug where the framework for design time runs of dotnet test was hard coded into dnxcore50. Moved some things around so that we will pack the target framework from the project context.
This commit is contained in:
parent
771f4ed163
commit
03b6b8ada0
4 changed files with 12 additions and 4 deletions
|
@ -8,11 +8,13 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
{
|
{
|
||||||
public class FixedPathCommandFactory : ICommandFactory
|
public class FixedPathCommandFactory : ICommandFactory
|
||||||
{
|
{
|
||||||
|
private readonly NuGetFramework _nugetFramework;
|
||||||
private readonly string _configuration;
|
private readonly string _configuration;
|
||||||
private readonly string _outputPath;
|
private readonly string _outputPath;
|
||||||
|
|
||||||
public FixedPathCommandFactory(string configuration, string outputPath)
|
public FixedPathCommandFactory(NuGetFramework nugetFramework, string configuration, string outputPath)
|
||||||
{
|
{
|
||||||
|
_nugetFramework = nugetFramework;
|
||||||
_configuration = configuration;
|
_configuration = configuration;
|
||||||
_outputPath = outputPath;
|
_outputPath = outputPath;
|
||||||
}
|
}
|
||||||
|
@ -28,6 +30,11 @@ namespace Microsoft.DotNet.Cli.Utils
|
||||||
configuration = _configuration;
|
configuration = _configuration;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (framework == null)
|
||||||
|
{
|
||||||
|
framework = _nugetFramework;
|
||||||
|
}
|
||||||
|
|
||||||
return Command.Create(commandName, args, framework, configuration, _outputPath);
|
return Command.Create(commandName, args, framework, configuration, _outputPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,7 +159,8 @@ namespace Microsoft.DotNet.Tools.Test
|
||||||
var messages = new TestMessagesCollection();
|
var messages = new TestMessagesCollection();
|
||||||
using (var dotnetTest = new DotnetTest(messages, assemblyUnderTest))
|
using (var dotnetTest = new DotnetTest(messages, assemblyUnderTest))
|
||||||
{
|
{
|
||||||
var commandFactory = new FixedPathCommandFactory(configuration, outputPath);
|
var commandFactory =
|
||||||
|
new FixedPathCommandFactory(projectContext.TargetFramework, configuration, outputPath);
|
||||||
var testRunnerFactory = new TestRunnerFactory(GetCommandName(testRunner), commandFactory);
|
var testRunnerFactory = new TestRunnerFactory(GetCommandName(testRunner), commandFactory);
|
||||||
|
|
||||||
dotnetTest
|
dotnetTest
|
||||||
|
|
|
@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Tools.Test
|
||||||
return _commandFactory.Create(
|
return _commandFactory.Create(
|
||||||
$"dotnet-{_testRunner}",
|
$"dotnet-{_testRunner}",
|
||||||
commandArgs,
|
commandArgs,
|
||||||
new NuGetFramework("DNXCore", Version.Parse("5.0")),
|
null,
|
||||||
null);
|
null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests
|
||||||
_commandFactoryMock.Setup(c => c.Create(
|
_commandFactoryMock.Setup(c => c.Create(
|
||||||
$"dotnet-{_runner}",
|
$"dotnet-{_runner}",
|
||||||
_testRunnerArguments,
|
_testRunnerArguments,
|
||||||
new NuGetFramework("DNXCore", Version.Parse("5.0")),
|
null,
|
||||||
null)).Returns(_commandMock.Object).Verifiable();
|
null)).Returns(_commandMock.Object).Verifiable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue