Addressed PR comment
This commit is contained in:
parent
763e6bc946
commit
aea25b1fc5
4 changed files with 13 additions and 12 deletions
|
@ -5,11 +5,6 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
|
||||
<OutputPath>bin\$(Configuration)</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
|
||||
<DefineConstants>NETCOREAPP;$(DefineConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
|
||||
<OutputPath>bin\$(Configuration)</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -32,7 +32,9 @@ namespace Microsoft.DotNet.Cli.Test3.Tests
|
|||
.Pass();
|
||||
|
||||
// Call test3
|
||||
CommandResult result = new Test3Command().WithWorkingDirectory(testProjectDirectory).ExecuteWithCapturedOutput("");
|
||||
CommandResult result = new Test3Command()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
.ExecuteWithCapturedOutput("");
|
||||
|
||||
// Verify
|
||||
// for target framework net46
|
||||
|
|
|
@ -30,7 +30,9 @@ namespace Microsoft.DotNet.Cli.Test3.Tests
|
|||
.Pass();
|
||||
|
||||
// Call test3
|
||||
CommandResult result = new Test3Command().WithWorkingDirectory(testProjectDirectory).ExecuteWithCapturedOutput("--framework netcoreapp1.0");
|
||||
CommandResult result = new Test3Command()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
.ExecuteWithCapturedOutput("--framework netcoreapp1.0");
|
||||
|
||||
// Verify
|
||||
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
|
||||
|
@ -55,14 +57,17 @@ namespace Microsoft.DotNet.Cli.Test3.Tests
|
|||
.Pass();
|
||||
|
||||
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||
string expectedError = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp1.0", "VSTestDotNetCoreProject.dll");
|
||||
expectedError = "The test source file " + "\""+ expectedError + "\"" + " provided was not found.";
|
||||
string expectedError = Path.Combine(testProjectDirectory, "bin",
|
||||
configuration, "netcoreapp1.0", "VSTestDotNetCoreProject.dll");
|
||||
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
|
||||
|
||||
// Call test3
|
||||
CommandResult result = new Test3Command().WithWorkingDirectory(testProjectDirectory).ExecuteWithCapturedOutput("--noBuild");
|
||||
CommandResult result = new Test3Command()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
.ExecuteWithCapturedOutput("--noBuild");
|
||||
|
||||
// Verify
|
||||
result.StdOut.Should().Contain(expectedError);
|
||||
result.StdOut.Should().Contain(expectedError);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue