Skip to content

Commit a9c2a61

Browse files
authored
Photon CI (#10)
* photon pipeline * photon pipeline * photon pipeline * photon pipeline
1 parent 2dc23b1 commit a9c2a61

5 files changed

Lines changed: 22 additions & 10 deletions

File tree

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Jenkins.NET.Publishing
88
{
9-
public class Build_Win : IBuildTask
9+
public class Build_Windows : IBuildTask
1010
{
1111
public IAgentBuildContext Context {get; set;}
1212

@@ -20,8 +20,11 @@ public async Task RunAsync(CancellationToken token)
2020

2121
private async Task BuildSolution()
2222
{
23+
var msbuild_exe = Context.AgentVariables["global"]["msbuild_exe"];
24+
2325
var msBuild = new MsBuild(Context) {
24-
Exe = ".\\bin\\msbuild.cmd",
26+
//Exe = ".\\bin\\msbuild.cmd",
27+
Exe = $"\"{msbuild_exe}\"",
2528
Filename = "Jenkins.NET.sln",
2629
Configuration = "Release",
2730
Platform = "Any CPU",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
</ItemGroup>
9494
<ItemGroup>
9595
<Compile Include="Build_Linux.cs" />
96-
<Compile Include="Publish_Win.cs" />
97-
<Compile Include="Build_Win.cs" />
96+
<Compile Include="Publish_Windows.cs" />
97+
<Compile Include="Build_Windows.cs" />
9898
<Compile Include="Internal\MsBuild.cs" />
9999
<Compile Include="Properties\AssemblyInfo.cs" />
100100
</ItemGroup>
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
using Jenkins.NET.Publishing.Internal;
22
using Photon.Framework.Agent;
33
using Photon.Framework.Tasks;
4+
using Photon.Framework.Tools;
45
using Photon.NuGetPlugin;
56
using System.IO;
67
using System.Threading;
78
using System.Threading.Tasks;
8-
using Photon.Framework.Tools;
99

1010
namespace Jenkins.NET.Publishing
1111
{
12-
public class Publish_Win : IBuildTask
12+
public class Publish_Windows : IBuildTask
1313
{
1414
public IAgentBuildContext Context {get; set;}
1515

@@ -23,8 +23,11 @@ public async Task RunAsync(CancellationToken token)
2323

2424
private async Task BuildSolution(CancellationToken token)
2525
{
26+
var msbuild_exe = Context.AgentVariables["global"]["msbuild_exe"];
27+
2628
var msBuild = new MsBuild(Context) {
27-
Exe = ".\\bin\\msbuild.cmd",
29+
//Exe = ".\\bin\\msbuild.cmd",
30+
Exe = $"\"{msbuild_exe}\"",
2831
Filename = "Jenkins.NET.sln",
2932
Configuration = "Release",
3033
Platform = "Any CPU",

Jenkins.NET/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44

5-
[assembly: AssemblyVersion("0.4.1")]
6-
[assembly: AssemblyFileVersion("0.4.1")]
5+
[assembly: AssemblyVersion("0.4.2")]
6+
[assembly: AssemblyFileVersion("0.4.2")]
77
[assembly: AssemblyTitle("Jenkins.NET")]
88
[assembly: AssemblyDescription("C# .NET wrapper for Jenkins HTTP/REST API.")]
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("Joshua Miller")]
1111
[assembly: AssemblyProduct("Jenkins.NET")]
12-
[assembly: AssemblyCopyright("Copyright © Joshua Miller 2017")]
12+
[assembly: AssemblyCopyright("Copyright © Joshua Miller 2018")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

bin/PreBuildAzure.cmd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"%~dp0nuget.exe" restore "%~dp0..\Jenkins.NET.sln"
2+
if not %errorlevel% == 0 exit %errorlevel%
3+
4+
set msbuild_exe="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe"
5+
%msbuild_exe% "%~dp0..\Jenkins.NET.Publishing\Jenkins.NET.Publishing.csproj" /t:Rebuild /p:Configuration="Debug" /p:Platform="Any CPU" /p:OutputPath="bin\Debug" /v:m
6+
if not %errorlevel% == 0 exit %errorlevel%

0 commit comments

Comments
 (0)