[xharness] Fix how .NET projects are ignored. (#9168)

* [xharness] Fix how .NET projects are ignored.

Now they're actually ignored if .NET tests are not included.

* Fix compile error.
This commit is contained in:
Rolf Bjarne Kvinge 2020-07-24 14:56:08 +02:00 коммит произвёл GitHub
Родитель dd1205a222
Коммит e0986916e5
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 4 добавлений и 1 удалений

Просмотреть файл

@ -40,15 +40,17 @@ namespace Xharness.Jenkins {
foreach (var config in configurations) { foreach (var config in configurations) {
foreach (var pair in ps) { foreach (var pair in ps) {
MSBuildTask derived; MSBuildTask derived;
var configIgnored = pair.Item3;
if (project.IsDotNetProject) { if (project.IsDotNetProject) {
derived = new DotNetBuildTask (jenkins: jenkins, testProject: project, processManager: processManager); derived = new DotNetBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
configIgnored |= !jenkins.IncludeDotNet;
} else { } else {
derived = new MSBuildTask (jenkins: jenkins, testProject: project, processManager: processManager); derived = new MSBuildTask (jenkins: jenkins, testProject: project, processManager: processManager);
} }
derived.ProjectConfiguration = config; derived.ProjectConfiguration = config;
derived.ProjectPlatform = "iPhoneSimulator"; derived.ProjectPlatform = "iPhoneSimulator";
derived.Platform = pair.Item2; derived.Platform = pair.Item2;
derived.Ignored = pair.Item3; derived.Ignored = configIgnored;
derived.TestName = project.Name; derived.TestName = project.Name;
derived.Dependency = project.Dependency; derived.Dependency = project.Dependency;
derived.CloneTestProject (jenkins.MainLog, processManager, pair.Item1); derived.CloneTestProject (jenkins.MainLog, processManager, pair.Item1);

Просмотреть файл

@ -222,6 +222,7 @@ namespace Xharness.Jenkins {
MSBuildTask build; MSBuildTask build;
if (clone.IsDotNetProject) { if (clone.IsDotNetProject) {
build = new DotNetBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager); build = new DotNetBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager);
ignored |= !jenkins.IncludeDotNet;
} else { } else {
build = new MSBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager); build = new MSBuildTask (jenkins: jenkins, testProject: clone, processManager: processManager);
} }