[xharness] Add support for specifying whether variations should be generated for Xamarin.iOS projects.

This commit is contained in:
Rolf Bjarne Kvinge 2020-07-20 18:26:17 +02:00
Родитель a510af6078
Коммит e3fdcf59ca
3 изменённых файлов: 8 добавлений и 2 удалений

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

@ -491,7 +491,7 @@ namespace Xharness {
foreach (var monoNativeInfo in IOSTestProjects.Where (x => x.MonoNativeInfo != null).Select (x => x.MonoNativeInfo))
monoNativeInfo.Convert ();
foreach (var proj in IOSTestProjects) {
foreach (var proj in IOSTestProjects.Where ((v) => v.GenerateVariations).ToArray ()) {
var file = proj.Path;
if (!File.Exists (file)) {

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

@ -16,11 +16,14 @@ namespace Microsoft.DotNet.XHarness.iOS.Shared {
public bool GenerateFull => GenerateVariations && (TargetFrameworkFlavors & MacFlavors.Full) == MacFlavors.Full;
public bool GenerateSystem => GenerateVariations && (TargetFrameworkFlavors & MacFlavors.System) == MacFlavors.System;
public bool GenerateVariations {
public override bool GenerateVariations {
get {
// If a bitwise combination of flavors, then we're generating variations
return TargetFrameworkFlavors != MacFlavors.Modern && TargetFrameworkFlavors != MacFlavors.Full && TargetFrameworkFlavors != MacFlavors.System && TargetFrameworkFlavors != MacFlavors.Console;
}
set {
throw new Exception ("This value is read-only");
}
}
public string Platform = "x86";

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

@ -13,6 +13,7 @@ namespace Microsoft.DotNet.XHarness.iOS.Shared {
public class TestProject
{
XmlDocument xml;
bool generate_variations = true;
public string Path;
public string SolutionPath;
@ -42,6 +43,8 @@ namespace Microsoft.DotNet.XHarness.iOS.Shared {
IsExecutableProject = isExecutableProject;
}
public virtual bool GenerateVariations { get => generate_variations; set => generate_variations = value; }
public XmlDocument Xml {
get {
if (xml == null) {