package on ci build; publish using deploy

Author: JoshuaMiller

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

@@ -96,9 +96,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Scripts\Publish.cs" />
-    <Compile Include="Scripts\Build.cs" />
+    <Compile Include="Scripts\Package.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Scripts\Publish.cs" />
     <Compile Include="Tools\BuildTools.cs" />
     <Compile Include="Tools\TestTools.cs" />
   </ItemGroup>

Jenkins.Net.Publishing/Scripts/Build.cs

@@ -0,0 +1,81 @@
+using Jenkins.NET.Publishing.Tools;
+using Photon.Framework.Agent;
+using Photon.Framework.Packages;
+using Photon.Framework.Process;
+using Photon.Framework.Tasks;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Jenkins.NET.Publishing.Scripts
+{
+    public class Package : IBuildTask
+    {
+        public IAgentBuildContext Context {get; set;}
+
+        
+        public async Task RunAsync(CancellationToken token)
+        {
+            var packageDir = Path.Combine(Context.WorkDirectory, "Packages");
+
+            await BuildTools.BuildSolution(Context, token);
+            await TestTools.UnitTest(Context, token);
+
+            await CreateNugetPackage(packageDir, token);
+
+            await CreateProjectPackage(packageDir, token);
+        }
+
+        private async Task CreateProjectPackage(string packageDir, CancellationToken token)
+        {
+            var def = new ProjectPackageDefinition {
+                Id = "jenkinsnet",
+                Name = "Jenkins.NET",
+                Description = "Publishes a pre-compiled and pre-tested NuGet Package for Jenkins.NET.",
+                Project = "jenkins.net",
+                Assembly = "Jenkins.Net.Publishing.dll",
+                Script = "Publish",
+                Files = {
+                    new PackageFileDefinition {
+                        Path = packageDir,
+                        Destination = "",
+                    }
+                }
+            };
+
+            var version = Context.BuildNumber.ToString();
+            var output = Path.Combine(Context.BinDirectory, "Jenkins.Net.zip");
+
+            await ProjectPackageTools.CreatePackage(
+                definition: def,
+                rootPath: Context.ContentDirectory,
+                version: version,
+                outputFilename: output);
+
+            await Context.Packages.PushProjectPackageAsync(output, token);
+        }
+
+        private async Task CreateNugetPackage(string packageDir, CancellationToken token)
+        {
+            var args = new[] {
+                "pack",
+                "\"Jenkins.Net\\Jenkins.Net.csproj\"",
+                "--configuration Release",
+                "--no-build",
+                $"--output \"{packageDir}\"",
+            };
+
+            var info = new ProcessRunInfo {
+                Filename = "dotnet",
+                Arguments = string.Join(" ", args),
+                WorkingDirectory = Context.ContentDirectory,
+            };
+
+            var runner = new ProcessRunner(Context);
+            var result = await runner.RunAsync(info, token);
+
+            if (result.ExitCode != 0) throw new ApplicationException($"Build Failed! [{result.ExitCode}]");
+        }
+    }
+}

Jenkins.Net.Publishing/Scripts/Package.cs

@@ -1,7 +1,4 @@
-using Jenkins.NET.Publishing.Tools;
-using Photon.Framework.Agent;
-using Photon.Framework.Process;
-using Photon.Framework.Tasks;
+using Photon.Framework.Server;
 using Photon.NuGet.CorePlugin;
 using System;
 using System.IO;
@@ -11,11 +8,11 @@
 
 namespace Jenkins.NET.Publishing.Scripts
 {
-    public class Publish : IBuildTask
+    internal class Publish : IDeployScript
     {
         private NuGetCore nugetCore;
 
-        public IAgentBuildContext Context {get; set;}
+        public IServerDeployContext Context {get; set;}
 
 
         public async Task RunAsync(CancellationToken token)
@@ -25,48 +22,14 @@ public async Task RunAsync(CancellationToken token)
             };
             nugetCore.Initialize();
 
-            await BuildTools.BuildSolution(Context, token);
-            await TestTools.UnitTest(Context, token);
-
-            await PublishPackage(token);
-        }
-
-        private async Task PublishPackage(CancellationToken token)
-        {
-            var packageDir = Path.Combine(Context.WorkDirectory, "Packages");
-
-            await Pack(packageDir, token);
-
             var packageFilename = Directory
-                .GetFiles(packageDir, "jenkinsnet.*.nupkg")
+                .GetFiles(Context.ContentDirectory, "jenkinsnet.*.nupkg")
                 .FirstOrDefault();
 
             if (string.IsNullOrEmpty(packageFilename))
                 throw new ApplicationException("No package found matching package ID 'jenkinsnet'!");
 
             await nugetCore.PushAsync(packageFilename, token);
         }
-
-        private async Task Pack(string packageDir, CancellationToken token)
-        {
-            var args = new[] {
-                "pack",
-                "\"Jenkins.Net\\Jenkins.Net.csproj\"",
-                "--configuration Release",
-                "--no-build",
-                $"--output \"{packageDir}\"",
-            };
-
-            var info = new ProcessRunInfo {
-                Filename = "dotnet",
-                Arguments = string.Join(" ", args),
-                WorkingDirectory = Context.ContentDirectory,
-            };
-
-            var runner = new ProcessRunner(Context);
-            var result = await runner.RunAsync(info, token);
-
-            if (result.ExitCode != 0) throw new ApplicationException($"Build Failed! [{result.ExitCode}]");
-        }
     }
 }