xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[xharness] Rename XBuildTask to MSBuildTask. (#8067) 

We're not using xbuild anymore, and haven't for quite a while.
This commit is contained in:
Rolf Bjarne Kvinge 2020-03-09 16:44:49 +01:00 коммит произвёл GitHub
Родитель 57db46af17
Коммит bd29f99aaa
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 22 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
tests/xharness/Jenkins/Jenkins.cs
Просмотреть файл

@ -182,7 +182,7 @@ namespace Xharness.Jenkins
}
}
IEnumerable<RunSimulatorTask> CreateRunSimulatorTaskAsync (XBuildTask buildTask)
IEnumerable<RunSimulatorTask> CreateRunSimulatorTaskAsync (MSBuildTask buildTask)
{
var runtasks = new List<RunSimulatorTask> ();
@ -373,7 +373,7 @@ namespace Xharness.Jenkins
}
}
IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<XBuildTask, T, IEnumerable<IDevice>, T> creator) where T: RunTestTask
IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuildTask, T, IEnumerable<IDevice>, T> creator) where T: RunTestTask
{
foreach (var task in tests) {
if (string.IsNullOrEmpty (task.Variation))
@ -463,7 +463,7 @@ namespace Xharness.Jenkins
clone.Xml.Save (clone.Path);
});
var build = new XBuildTask {
var build = new MSBuildTask {
Jenkins = this,
TestProject = clone,
ProjectConfiguration = configuration,
@ -512,7 +512,7 @@ namespace Xharness.Jenkins
configurations = new string [] { "Debug" };
foreach (var config in configurations) {
foreach (var pair in ps) {
var derived = new XBuildTask () {
var derived = new MSBuildTask () {
Jenkins = this,
ProjectConfiguration = config,
ProjectPlatform = "iPhoneSimulator",
@ -565,7 +565,7 @@ namespace Xharness.Jenkins
projectTasks.Clear ();
if (!project.SkipiOSVariation) {
var build64 = new XBuildTask {
var build64 = new MSBuildTask {
Jenkins = this,
ProjectConfiguration = "Debug64",
ProjectPlatform = "iPhone",
@ -575,7 +575,7 @@ namespace Xharness.Jenkins
build64.CloneTestProject (project);
projectTasks.Add (new RunDeviceTask (build64, Devices.Connected64BitIOS.Where (d => d.IsSupported (project))) { Ignored = !IncludeiOS64 });
var build32 = new XBuildTask {
var build32 = new MSBuildTask {
Jenkins = this,
ProjectConfiguration = project.Name != "dont link" ? "Debug32" : "Release32",
ProjectPlatform = "iPhone",
@ -586,7 +586,7 @@ namespace Xharness.Jenkins
projectTasks.Add (new RunDeviceTask (build32, Devices.Connected32BitIOS.Where (d => d.IsSupported (project))) { Ignored = !IncludeiOS32 });
var todayProject = project.AsTodayExtensionProject ();
var buildToday = new XBuildTask {
var buildToday = new MSBuildTask {
Jenkins = this,
ProjectConfiguration = "Debug64",
ProjectPlatform = "iPhone",
@ -599,7 +599,7 @@ namespace Xharness.Jenkins
if (!project.SkiptvOSVariation) {
var tvOSProject = project.AsTvOSProject ();
var buildTV = new XBuildTask {
var buildTV = new MSBuildTask {
Jenkins = this,
ProjectConfiguration = "Debug",
ProjectPlatform = "iPhone",
@ -613,7 +613,7 @@ namespace Xharness.Jenkins
if (!project.SkipwatchOSVariation) {
var watchOSProject = project.AsWatchOSProject ();
if (!project.SkipwatchOS32Variation) {
var buildWatch32 = new XBuildTask {
var buildWatch32 = new MSBuildTask {
Jenkins = this,
ProjectConfiguration = "Debug32",
ProjectPlatform = "iPhone",
@ -625,7 +625,7 @@ namespace Xharness.Jenkins
}
if (!project.SkipwatchOSARM64_32Variation) {
var buildWatch64_32 = new XBuildTask {
var buildWatch64_32 = new MSBuildTask {
Jenkins = this,
ProjectConfiguration = "Release64_32", // We don't support Debug for ARM64_32 yet.
ProjectPlatform = "iPhone",
@ -916,7 +916,7 @@ namespace Xharness.Jenkins
//Tasks.AddRange (await CreateRunSimulatorTasksAsync ());
var buildiOSMSBuild_net461 = new XBuildTask ()
var buildiOSMSBuild_net461 = new MSBuildTask ()
{
Jenkins = this,
TestProject = new TestProject (Path.GetFullPath (Path.Combine (Harness.RootDirectory, "..", "msbuild", "tests", "Xamarin.iOS.Tasks.Tests", "Xamarin.iOS.Tasks.Tests.csproj"))),
@ -924,7 +924,6 @@ namespace Xharness.Jenkins
SpecifyConfiguration = true,
ProjectConfiguration = "Debug-net461",
Platform = TestPlatform.iOS,
UseMSBuild = true,
SolutionPath = Path.GetFullPath (Path.Combine (Harness.RootDirectory, "..", "msbuild", "Xamarin.MacDev.Tasks.sln")),
SupportsParallelExecution = false,
};
@ -942,14 +941,13 @@ namespace Xharness.Jenkins
};
Tasks.Add (nunitExecutioniOSMSBuild_net461);
var buildiOSMSBuild_netstandard2 = new XBuildTask () {
var buildiOSMSBuild_netstandard2 = new MSBuildTask () {
Jenkins = this,
TestProject = new TestProject (Path.GetFullPath (Path.Combine (Harness.RootDirectory, "..", "msbuild", "tests", "Xamarin.iOS.Tasks.Tests", "Xamarin.iOS.Tasks.Tests.csproj"))),
SpecifyPlatform = false,
SpecifyConfiguration = true,
ProjectConfiguration = "Debug-netstandard2.0",
Platform = TestPlatform.iOS,
UseMSBuild = true,
SolutionPath = Path.GetFullPath (Path.Combine (Harness.RootDirectory, "..", "msbuild", "Xamarin.MacDev.Tasks.sln")),
SupportsParallelExecution = false,
};
@ -966,7 +964,7 @@ namespace Xharness.Jenkins
};
Tasks.Add (nunitExecutioniOSMSBuild_netstandard2);
var buildInstallSources = new XBuildTask ()
var buildInstallSources = new MSBuildTask ()
{
Jenkins = this,
TestProject = new TestProject (Path.GetFullPath (Path.Combine (Harness.RootDirectory, "..", "tools", "install-source", "InstallSourcesTests", "InstallSourcesTests.csproj"))),
@ -1017,7 +1015,7 @@ namespace Xharness.Jenkins
throw new NotImplementedException (project.TargetFrameworkFlavors.ToString ());
}
foreach (var config in configurations) {
XBuildTask build = new XBuildTask ();
MSBuildTask build = new MSBuildTask ();
build.Platform = platform;
build.CloneTestProject (project);
build.Jenkins = this;
@ -1180,7 +1178,7 @@ namespace Xharness.Jenkins
};
Tasks.Add (runDocsTests);
var buildSampleTests = new XBuildTask {
var buildSampleTests = new MSBuildTask {
Jenkins = this,
TestProject = new TestProject (Path.GetFullPath (Path.Combine (Harness.RootDirectory, "sampletester", "sampletester.sln"))),
SpecifyPlatform = false,

8
tests/xharness/Jenkins/TestTasks/XBuildTask.cs → tests/xharness/Jenkins/TestTasks/MSBuildTask.cs
Просмотреть файл

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;
@ -9,9 +9,8 @@ using Xharness.Logging;
namespace Xharness.Jenkins.TestTasks
{
class XBuildTask : BuildProjectTask
class MSBuildTask : BuildProjectTask
{
public bool UseMSBuild;
public ILog BuildLog;
protected override async Task ExecuteAsync ()
@ -35,8 +34,7 @@ namespace Xharness.Jenkins.TestTasks
args.Add (ProjectFile);
xbuild.StartInfo.Arguments = StringUtils.FormatArguments (args);
SetEnvironmentVariables (xbuild);
if (UseMSBuild)
xbuild.StartInfo.EnvironmentVariables ["MSBuildExtensionsPath"] = null;
xbuild.StartInfo.EnvironmentVariables ["MSBuildExtensionsPath"] = null;
LogEvent (BuildLog, "Building {0} ({1})", TestName, Mode);
if (!Harness.DryRun) {
var timeout = TimeSpan.FromMinutes (60);

2
tests/xharness/Jenkins/TestTasks/RunDeviceTask.cs
Просмотреть файл

@ -32,7 +32,7 @@ namespace Xharness.Jenkins.TestTasks
}
}
public RunDeviceTask (XBuildTask build_task, IEnumerable<Device> candidates)
public RunDeviceTask (MSBuildTask build_task, IEnumerable<Device> candidates)
: base (build_task, candidates.OrderBy ((v) => v.DebugSpeed))
{
switch (build_task.Platform) {

2
tests/xharness/Jenkins/TestTasks/RunSimulatorTask.cs
Просмотреть файл

@ -22,7 +22,7 @@ namespace Xharness.Jenkins.TestTasks
}
}
public RunSimulatorTask (XBuildTask build_task, IEnumerable<SimDevice> candidates = null)
public RunSimulatorTask (MSBuildTask build_task, IEnumerable<SimDevice> candidates = null)
: base (build_task, candidates)
{
var project = Path.GetFileNameWithoutExtension (ProjectFile);

2
tests/xharness/Jenkins/TestTasks/RunTestTask.cs
Просмотреть файл

@ -62,7 +62,7 @@ namespace Xharness.Jenkins.TestTasks
ExecutionResult = TestExecutingResult.BuildFailure;
}
FailureMessage = BuildTask.FailureMessage;
if (Harness.InCI && BuildTask is XBuildTask projectTask)
if (Harness.InCI && BuildTask is MSBuildTask projectTask)
XmlResultParser.GenerateFailure (Logs, "build", projectTask.TestName, projectTask.Variation, "AppBuild", $"App could not be built {FailureMessage}.", projectTask.BuildLog.FullPath, Harness.XmlJargon);
} else {
ExecutionResult = TestExecutingResult.Built;

2
tests/xharness/xharness.csproj
Просмотреть файл

@ -87,7 +87,7 @@
<Compile Include="TestExecutingResult.cs" />
<Compile Include="TestPlatform.cs" />
<Compile Include="Jenkins\TestTasks\TestTask.cs" />
<Compile Include="Jenkins\TestTasks\XBuildTask.cs" />
<Compile Include="Jenkins\TestTasks\MSBuildTask.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Harness.cs" />