huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove framework from dotnet-test

This commit is contained in:
Pranav K 2016-02-23 09:06:05 -08:00
parent a7642bd20d
commit 4bf99de4e4
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
KoreBuild-dotnet/build/_dotnet-test.shade
View File

@ -10,9 +10,6 @@ dotnet-test
projectFile='' projectFile=''
Required. Path to the test project.json to execute Required. Path to the test project.json to execute
framework=''
Required. The TFM to run tests for
configuration='' configuration=''
Optional. The configuration to build in. Defaults to 'Debug'. Optional. The configuration to build in. Defaults to 'Debug'.
*/} */}
@ -21,7 +18,7 @@ default configuration = 'Debug'
@{ @{
var projectFolder = Path.GetDirectoryName(projectFile); var projectFolder = Path.GetDirectoryName(projectFile);
var testArgs = "--configuration " + configuration + " --framework " + framework; var testArgs = "--configuration " + configuration;
Dotnet("test " + testArgs, projectFolder); Dotnet("test " + testArgs, projectFolder);
} }

4
KoreBuild-dotnet/build/_k-standard-goals.shade
View File

@ -195,7 +195,7 @@ default NUGET_FEED = 'https://api.nuget.org/v3/index.json'
var hasTestCommand = project.Keys.Contains("commands") && project.ValueAsJsonObject("commands").Keys.Contains("test"); var hasTestCommand = project.Keys.Contains("commands") && project.ValueAsJsonObject("commands").Keys.Contains("test");
if (projectText.Contains("dotnet-test-xunit")) if (projectText.Contains("dotnet-test-xunit"))
{ {
DotnetTest(projectFile, dnxCore50TFM, Configuration); DotnetTest(projectFile, Configuration);
} }
else if (hasTestCommand) else if (hasTestCommand)
{ {
@ -391,7 +391,7 @@ macro name="DotnetPack" projectFile='string' dotnetPackOutputDir='string' config
macro name="DotnetPublish" projectFile='string' outputFolder='string' framework='string' configuration='string' macro name="DotnetPublish" projectFile='string' outputFolder='string' framework='string' configuration='string'
dotnet-publish dotnet-publish
macro name="DotnetTest" projectFile='string' framework='string' configuration='string' macro name="DotnetTest" projectFile='string' configuration='string'
dotnet-test dotnet-test
macro name="XunitTest" projectFile='string' framework='string' configuration='string' macro name="XunitTest" projectFile='string' framework='string' configuration='string'