зеркало из https://github.com/aspnet/KoreBuild.git
Add more integration with aspnet CI
This commit is contained in:
Родитель
8635a04aee
Коммит
fcb6725298
|
@ -17,10 +17,14 @@
|
|||
<_SecondBasedTimeStamp>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::Parse("2015-01-01"))).TotalSeconds.ToString())</_SecondBasedTimeStamp>
|
||||
<_SecondBasedTimeStamp>t$([System.Int64]::Parse($(_SecondBasedTimeStamp.Substring(0, $(_SecondBasedTimeStamp.IndexOf("."))))).ToString("x9"))</_SecondBasedTimeStamp>
|
||||
|
||||
<PackWithoutBuildNumber Condition="'$(PackWithoutBuildNumber)'==''">false</PackWithoutBuildNumber>
|
||||
<!-- for aspnet CI -->
|
||||
<BuildNumber Condition="'$(BuildNumber)'==''">$(KOREBUILD_BUILD_NUMBER)</BuildNumber>
|
||||
|
||||
<BuildNumber Condition="'$(BuildNumber)'==''">$(_SecondBasedTimeStamp)</BuildNumber>
|
||||
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
|
||||
<VersionSuffix Condition="'$(VersionSuffix)'==''">$(BuildNumber)</VersionSuffix>
|
||||
|
||||
<PackWithoutBuildNumber Condition="'$(PackWithoutBuildNumber)'==''">false</PackWithoutBuildNumber>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- PackWithoutBuildNumber only works if 'VersionPrefix' is in use. -->
|
||||
|
|
|
@ -252,7 +252,14 @@ default SAMPLES_PROJECT_GLOB = "samples/*/*.csproj"
|
|||
var projectFiles = Files.Include(TEST_PROJECT_GLOB);
|
||||
foreach (var projectFile in projectFiles)
|
||||
{
|
||||
DotnetTest(projectFile, Configuration, E("KOREBUILD_DOTNET_TEST_OPTIONS"));
|
||||
var options = E("KOREBUILD_DOTNET_TEST_OPTIONS");
|
||||
if (IsTeamCity)
|
||||
{
|
||||
// TODO put all trx files in same folder. See https://github.com/Microsoft/vstest/issues/243
|
||||
// TODO or use TC logger https://github.com/Microsoft/vstest/issues/254
|
||||
options += " --logger:trx ";
|
||||
}
|
||||
DotnetTest(projectFile, Configuration, options);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче