Skip to content

Commit f78f77a

Browse files
null511null511
authored
Multi-Targetting (#14)
* multitarget initial build test * remove casing dups * azure build fix test * azure build fix test * test cmd fix * publish cleanup * package update * final/publish
1 parent 7d863fd commit f78f77a

95 files changed

Lines changed: 718 additions & 647 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Jenkins.NET.Publishing/Build_Linux.cs‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎Jenkins.NET.Publishing/Build_Windows.cs‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎Jenkins.NET.Publishing/Jenkins.NET.Publishing.csproj‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,8 @@
8181
<Reference Include="NuGet.Versioning, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8282
<HintPath>..\packages\NuGet.Versioning.4.2.0\lib\net45\NuGet.Versioning.dll</HintPath>
8383
</Reference>
84-
<Reference Include="Photon.Framework, Version=0.0.70.0, Culture=neutral, processorArchitecture=MSIL">
85-
<HintPath>..\packages\Photon.Framework.0.0.70\lib\net46\Photon.Framework.dll</HintPath>
86-
</Reference>
87-
<Reference Include="Photon.MSBuild, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Photon.MSBuild.0.0.6\lib\net46\Photon.MSBuild.dll</HintPath>
89-
</Reference>
90-
<Reference Include="Photon.NuGet, Version=0.0.14.0, Culture=neutral, processorArchitecture=MSIL">
91-
<HintPath>..\packages\Photon.NuGet.0.0.14\lib\net46\Photon.NuGet.dll</HintPath>
84+
<Reference Include="Photon.Framework, Version=0.0.74.0, Culture=neutral, processorArchitecture=MSIL">
85+
<HintPath>..\packages\Photon.Framework.0.0.74\lib\net46\Photon.Framework.dll</HintPath>
9286
</Reference>
9387
<Reference Include="Photon.NuGet.Core, Version=0.0.3.0, Culture=neutral, processorArchitecture=MSIL">
9488
<HintPath>..\packages\Photon.NuGet.Core.0.0.3\lib\net46\Photon.NuGet.Core.dll</HintPath>
@@ -102,14 +96,16 @@
10296
<Reference Include="WindowsBase" />
10397
</ItemGroup>
10498
<ItemGroup>
105-
<Compile Include="Build_Linux.cs" />
106-
<Compile Include="Publish_Windows.cs" />
107-
<Compile Include="Build_Windows.cs" />
99+
<Compile Include="Scripts\Publish.cs" />
100+
<Compile Include="Scripts\Build.cs" />
108101
<Compile Include="Properties\AssemblyInfo.cs" />
102+
<Compile Include="Tools\BuildTools.cs" />
103+
<Compile Include="Tools\TestTools.cs" />
109104
</ItemGroup>
110105
<ItemGroup>
111106
<None Include="app.config" />
112107
<None Include="packages.config" />
113108
</ItemGroup>
109+
<ItemGroup />
114110
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
115111
</Project>

‎Jenkins.NET.Publishing/Publish_Windows.cs‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎Jenkins.NET.Publishing/packages.config‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
<package id="NuGet.Repositories" version="4.2.0" targetFramework="net46" />
1818
<package id="NuGet.RuntimeModel" version="4.2.0" targetFramework="net46" />
1919
<package id="NuGet.Versioning" version="4.2.0" targetFramework="net46" />
20-
<package id="Photon.Framework" version="0.0.70" targetFramework="net46" />
21-
<package id="Photon.MSBuild" version="0.0.6" targetFramework="net46" />
22-
<package id="Photon.NuGet" version="0.0.14" targetFramework="net46" />
20+
<package id="Photon.Framework" version="0.0.74" targetFramework="net46" />
2321
<package id="Photon.NuGet.Core" version="0.0.3" targetFramework="net46" />
2422
<package id="Photon.NUnit" version="0.0.1" targetFramework="net46" />
2523
</packages>

‎Jenkins.NET.Tests/IntegrationTests/ClientTests.cs‎

Lines changed: 65 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,108 @@
11
using JenkinsNET.Models;
22
using JenkinsNET.Tests.Internal;
3-
using NUnit.Framework;
43
using System;
4+
using Xunit;
5+
6+
#if NET_ASYNC
7+
using System.Threading.Tasks;
8+
#endif
9+
10+
#if NETCORE
511
using System.Threading.Tasks;
12+
using Xunit.Abstractions;
13+
#else
14+
using System.IO;
15+
#endif
616

717
namespace JenkinsNET.Tests.IntegrationTests
818
{
9-
[IntegrationTestFixture]
1019
public class ClientTests
1120
{
1221
private const string jobName = "Test Job";
1322

1423

15-
[Test]
24+
#if NETCORE
25+
private readonly ITestOutputHelper output;
26+
27+
public ClientTests(ITestOutputHelper output)
28+
{
29+
this.output = output;
30+
}
31+
#else
32+
private readonly TextWriter output;
33+
34+
public ClientTests()
35+
{
36+
this.output = Console.Out;
37+
}
38+
#endif
39+
40+
[Fact]
41+
[Trait("Category", "Integration")]
42+
public void ListAllJobs()
43+
{
44+
var client = DefaultClient.Create();
45+
46+
var jenkins = client.Get();
47+
48+
foreach (var job in jenkins.Jobs) {
49+
output.WriteLine($"{job.Name} [{job.Class}]");
50+
51+
var jobBase = client.Jobs.Get<JenkinsJobBase>(job.Name);
52+
output.WriteLine($" {jobBase.FullDisplayName}");
53+
output.WriteLine($" {jobBase.Url}");
54+
}
55+
}
56+
57+
#if NET_ASYNC
58+
[Fact]
59+
[Trait("Category", "Integration")]
1660
public async Task ListAllJobsAsync()
1761
{
1862
var client = DefaultClient.Create();
1963

2064
var jenkins = await client.GetAsync();
2165

2266
foreach (var job in jenkins.Jobs) {
23-
TestContext.Out.WriteLine($"{job.Name} [{job.Class}]");
67+
output.WriteLine($"{job.Name} [{job.Class}]");
2468

2569
var jobBase = await client.Jobs.GetAsync<JenkinsJobBase>(job.Name);
26-
TestContext.Out.WriteLine($" {jobBase.FullDisplayName}");
27-
TestContext.Out.WriteLine($" {jobBase.Url}");
70+
output.WriteLine($" {jobBase.FullDisplayName}");
71+
output.WriteLine($" {jobBase.Url}");
2872
}
2973
}
74+
#endif
3075

31-
[Test]
76+
[Fact]
77+
[Trait("Category", "Integration")]
3278
public void Run()
3379
{
34-
var jobRunner = DefaultRunner.Create(TestContext.Out);
80+
var jobRunner = DefaultRunner.Create(output);
3581

3682
var startTime = DateTime.Now;
3783
var build = jobRunner.Run(jobName);
3884
var duration = DateTime.Now.Subtract(startTime);
3985

40-
TestContext.Out.WriteLine();
41-
TestContext.Out.WriteLine($"Result: {build.Result}");
42-
TestContext.Out.WriteLine($"Duration: {duration}");
86+
output.WriteLine(string.Empty);
87+
output.WriteLine($"Result: {build.Result}");
88+
output.WriteLine($"Duration: {duration}");
4389
}
4490

45-
[Test]
91+
#if NET_ASYNC
92+
[Fact]
93+
[Trait("Category", "Integration")]
4694
public async Task RunAsync()
4795
{
48-
var jobRunner = DefaultRunner.Create(TestContext.Out);
96+
var jobRunner = DefaultRunner.Create(output);
4997

5098
var startTime = DateTime.Now;
5199
var build = await jobRunner.RunAsync(jobName);
52100
var duration = DateTime.Now.Subtract(startTime);
53101

54-
TestContext.Out.WriteLine();
55-
TestContext.Out.WriteLine($"Result: {build.Result}");
56-
TestContext.Out.WriteLine($"Duration: {duration}");
102+
output.WriteLine(string.Empty);
103+
output.WriteLine($"Result: {build.Result}");
104+
output.WriteLine($"Duration: {duration}");
57105
}
106+
#endif
58107
}
59108
}

0 commit comments

Comments
 (0)