updated to cm-management 1.5 & fixed ilmerge issue which exists since…

… new ilmerge has been released on nuget
jobbrIO · Oct 19, 2018 · 4cf9cb5 · 4cf9cb5
1 parent ff514c8
commit 4cf9cb5
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -30,7 +30,7 @@ build:
   project: source/Jobbr.Server.sln
 
 after_build:
-  - cmd: nuget install ILMerge -ExcludeVersion
+  - cmd: nuget install ILMerge -ExcludeVersion -Version 2.14.1208
   - cmd: mkdir ilmerged
   - cmd: ILMerge\tools\ILMerge.exe /out:ilmerged/Jobbr.Server.dll source/Jobbr.Server/bin/Release/Jobbr.Server.dll source/Jobbr.Server/bin/Release/AutoMapper.dll source/Jobbr.Server/bin/Release/NCrontab.dll source/Jobbr.Server/bin/Release/Newtonsoft.Json.dll source/Jobbr.Server/bin/Release/Ninject.dll /target:library /targetplatform:v4,C:\Windows\Microsoft.NET\Framework64\v4.0.30319 /wildcards /internalize:internalize_exclude.txt /allowDup:HttpRequestMessageExtensions /allowDup:MediaTypeFormatterExtensions
   - cmd: nuget pack source\Jobbr.Server.nuspec -version "%GitVersion_SemVer%" -prop "target=%CONFIGURATION%"

diff --git a/source/Jobbr.Server.nuspec b/source/Jobbr.Server.nuspec
@@ -15,7 +15,7 @@
       <dependency id="Jobbr.ComponentModel.ArtefactStorage" version="[1,1.1)" />
       <dependency id="Jobbr.ComponentModel.Execution" version="[1,1.1)" />
       <dependency id="Jobbr.ComponentModel.JobStorage" version="[1.3,1.4)" />
-      <dependency id="Jobbr.ComponentModel.Management" version="[1.4,1.5)" />
+      <dependency id="Jobbr.ComponentModel.Management" version="[1.5,1.6)" />
       <dependency id="Jobbr.ComponentModel.Registration" version="[1,1.1)" />
     </dependencies>
   </metadata>

diff --git a/source/Jobbr.Server/ComponentServices/Management/JobManagementService.cs b/source/Jobbr.Server/ComponentServices/Management/JobManagementService.cs
@@ -120,6 +120,11 @@ public void UpdateTriggerStartTime(long jobId, long triggerId, DateTime startDat
             this.triggerService.Update(jobId, triggerId, startDateTimeUtc);
         }
 
+        public void DeleteJobRun(long jobRunId)
+        {
+            this.jobRunService.Delete(jobRunId);
+        }
+
         public List<JobArtefact> GetArtefactForJob(long jobRunId)
         {
             var artefacts = this.jobRunService.GetArtefactsByJobRunId(jobRunId);

diff --git a/source/Jobbr.Server/Core/JobRunService.cs b/source/Jobbr.Server/Core/JobRunService.cs
@@ -98,5 +98,14 @@ public void UpdatePid(long jobRunId, string host, int pid)
 
             this.repository.Update(jobRun);
         }
+
+        public void Delete(long jobRunId)
+        {
+            var jobRun = this.repository.GetJobRunById(jobRunId);
+
+            jobRun.Deleted = true;
+
+            this.repository.Update(jobRun);
+        }
     }
 }
diff --git a/source/Jobbr.Server/Jobbr.Server.csproj b/source/Jobbr.Server/Jobbr.Server.csproj
@@ -48,8 +48,8 @@
     <Reference Include="Jobbr.ComponentModel.JobStorage, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Jobbr.ComponentModel.JobStorage.1.3.0\lib\net462\Jobbr.ComponentModel.JobStorage.dll</HintPath>
     </Reference>
-    <Reference Include="Jobbr.ComponentModel.Management, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Jobbr.ComponentModel.Management.1.4.0\lib\net462\Jobbr.ComponentModel.Management.dll</HintPath>
+    <Reference Include="Jobbr.ComponentModel.Management, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Jobbr.ComponentModel.Management.1.5.0\lib\net462\Jobbr.ComponentModel.Management.dll</HintPath>
     </Reference>
     <Reference Include="Jobbr.ComponentModel.Registration, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Jobbr.ComponentModel.Registration.1.0.1\lib\net462\Jobbr.ComponentModel.Registration.dll</HintPath>

diff --git a/source/Jobbr.Server/packages.config b/source/Jobbr.Server/packages.config
@@ -5,7 +5,7 @@
   <package id="Jobbr.ComponentModel.ArtefactStorage" version="1.0.1" targetFramework="net462" />
   <package id="Jobbr.ComponentModel.Execution" version="1.0.1" targetFramework="net462" />
   <package id="Jobbr.ComponentModel.JobStorage" version="1.3.0" targetFramework="net462" />
-  <package id="Jobbr.ComponentModel.Management" version="1.4.0" targetFramework="net462" />
+  <package id="Jobbr.ComponentModel.Management" version="1.5.0" targetFramework="net462" />
   <package id="Jobbr.ComponentModel.Registration" version="1.0.1" targetFramework="net462" />
   <package id="LibLog" version="3.1.0" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.AnalyzerPowerPack" version="1.1.0" targetFramework="net462" />

diff --git a/source/Jobbr.Tests/Jobbr.Tests.csproj b/source/Jobbr.Tests/Jobbr.Tests.csproj
@@ -53,8 +53,8 @@
     <Reference Include="Jobbr.ComponentModel.JobStorage, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Jobbr.ComponentModel.JobStorage.1.3.0\lib\net462\Jobbr.ComponentModel.JobStorage.dll</HintPath>
     </Reference>
-    <Reference Include="Jobbr.ComponentModel.Management, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Jobbr.ComponentModel.Management.1.4.0\lib\net462\Jobbr.ComponentModel.Management.dll</HintPath>
+    <Reference Include="Jobbr.ComponentModel.Management, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Jobbr.ComponentModel.Management.1.5.0\lib\net462\Jobbr.ComponentModel.Management.dll</HintPath>
     </Reference>
     <Reference Include="Jobbr.ComponentModel.Registration, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Jobbr.ComponentModel.Registration.1.0.1\lib\net462\Jobbr.ComponentModel.Registration.dll</HintPath>

diff --git a/source/Jobbr.Tests/packages.config b/source/Jobbr.Tests/packages.config
@@ -5,7 +5,7 @@
   <package id="Jobbr.ComponentModel.ArtefactStorage" version="1.0.1" targetFramework="net462" />
   <package id="Jobbr.ComponentModel.Execution" version="1.0.1" targetFramework="net462" />
   <package id="Jobbr.ComponentModel.JobStorage" version="1.3.0" targetFramework="net462" />
-  <package id="Jobbr.ComponentModel.Management" version="1.4.0" targetFramework="net462" />
+  <package id="Jobbr.ComponentModel.Management" version="1.5.0" targetFramework="net462" />
   <package id="Jobbr.ComponentModel.Registration" version="1.0.1" targetFramework="net462" />
   <package id="Moq" version="4.7.99" targetFramework="net462" />
 </packages>