Skip to content

Commit 61dfa09

Browse files
author
JoshuaMiller
committed
include lib version
1 parent 5427885 commit 61dfa09

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

Jenkins.Net.Publishing/Scripts/Package.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
using Jenkins.NET.Publishing.Tools;
22
using Photon.Framework.Agent;
3+
using Photon.Framework.Extensions;
34
using Photon.Framework.Packages;
45
using Photon.Framework.Process;
56
using Photon.Framework.Tasks;
7+
using Photon.Framework.Tools;
68
using System;
79
using System.IO;
810
using System.Threading;
911
using System.Threading.Tasks;
10-
using Photon.Framework.Extensions;
1112

1213
namespace Jenkins.NET.Publishing.Scripts
1314
{
@@ -18,14 +19,16 @@ public class Package : IBuildTask
1819

1920
public async Task RunAsync(CancellationToken token)
2021
{
21-
//var packageDir = Path.Combine(Context.ContentDirectory, "PublishPackages");
22-
2322
await BuildTools.BuildSolution(Context, token);
2423
await TestTools.UnitTest(Context, token);
2524

25+
var assemblyFile = Path.Combine(Context.ContentDirectory, "Jenkins.Net", "bin", "Release", "Jenkins.Net.dll");
26+
var assemblyVersion = AssemblyTools.GetVersion(assemblyFile);
27+
var projectPackageVersion = $"{Context.BuildNumber}.{assemblyVersion}";
28+
2629
await CreateNugetPackage(token);
2730

28-
await CreateProjectPackage(token);
31+
await CreateProjectPackage(projectPackageVersion, token);
2932
}
3033

3134
private async Task CreateNugetPackage(CancellationToken token)
@@ -52,7 +55,7 @@ private async Task CreateNugetPackage(CancellationToken token)
5255
if (result.ExitCode != 0) throw new ApplicationException($"Build Failed! [{result.ExitCode}]");
5356
}
5457

55-
private async Task CreateProjectPackage(CancellationToken token)
58+
private async Task CreateProjectPackage(string version, CancellationToken token)
5659
{
5760
var projectPath = Path.Combine(Context.ContentDirectory, "Jenkins.Net.Publishing");
5861
var packageDefFile = Path.Combine(projectPath, "Jenkins.Net.Publishing.json");
@@ -61,7 +64,6 @@ private async Task CreateProjectPackage(CancellationToken token)
6164
try {
6265
Context.WriteTagLine("Creating project package...", ConsoleColor.White);
6366

64-
var version = Context.BuildNumber.ToString();
6567
var packageDef = ProjectPackageTools.LoadDefinition(packageDefFile);
6668

6769
await ProjectPackageTools.CreatePackage(

0 commit comments

Comments
 (0)