From 654ae4156ec1c7dbedaca060a1e62a9671242ca9 Mon Sep 17 00:00:00 2001
From: Harald Wolff <haraldwolff@pc-harald.waldrennach.l--n.de>
Date: Wed, 9 Dec 2020 10:33:13 +0100
Subject: [PATCH] Fixed double call to CIService.Initialize()

---
 ln.build.server/Program.cs          | 5 ++---
 ln.build/pipeline/DotNetCommands.cs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ln.build.server/Program.cs b/ln.build.server/Program.cs
index 480e821..9baecb3 100644
--- a/ln.build.server/Program.cs
+++ b/ln.build.server/Program.cs
@@ -61,7 +61,6 @@ namespace ln.build.server
             switch (RunMode)
             {
                 case RunMode.serv:
-                    CIService.Initialize();
                     CIService.AddWebHookHandler("gitea", GiteaRepository.WebHookHandler);
                     CIService.Start();
                     break;
@@ -84,14 +83,14 @@ namespace ln.build.server
 
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
+/*        public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .UseSystemd()
                 .ConfigureServices((hostContext, services) =>
                 {
                     services.AddHostedService<ServiceWorker>();
                 });
-
+*/
 
     }
 }
diff --git a/ln.build/pipeline/DotNetCommands.cs b/ln.build/pipeline/DotNetCommands.cs
index 39ee81f..6ad77d6 100644
--- a/ln.build/pipeline/DotNetCommands.cs
+++ b/ln.build/pipeline/DotNetCommands.cs
@@ -141,7 +141,7 @@ namespace ln.build.commands
                             if (!ext.Equals(".exe"))
                                 ext = "";
 
-                            string finalName = string.Format(".build/{0}-{1}{2}",csProject.GetName(), rid, ext);
+                            string finalName = string.Format(".build/{0}-{3}-{1}{2}",csProject.GetName(), rid, ext, csProject.GetVersion());
                             File.Move(artefact, finalName);
                             artefacts.Add(finalName);