Skip to content

Commit 9487525

Browse files
eXpl0it3reXpl0it3r
authored
Merge pull request #73 from jobbrIO/release/1.6.0
Release 1.6.0
2 parents b5dbf6f + 38089b8 commit 9487525

37 files changed

+1075
-196
lines changed

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ bld/
2121
# Roslyn cache directories
2222
*.ide/
2323

24+
# Visual Studio cache directory
25+
.vs/
26+
27+
# Rider directory
28+
.idea/
29+
2430
# MSTest test Results
2531
[Tt]est[Rr]esult*/
2632
[Bb]uild[Ll]og.*

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,5 @@ This application was built by the following awesome developers:
9090
* Oliver Zürcher
9191
* Peter Gfader
9292
* Mark Odermatt
93+
* [Steven Giesel](https://github.com/linkdotnet)
94+
* David Fiebig

‎appveyor.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,13 @@ build:
3030
project: source/Jobbr.Server.sln
3131

3232
after_build:
33-
- cmd: nuget install ILMerge -ExcludeVersion -Version 2.14.1208
34-
- cmd: mkdir ilmerged
35-
- 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
3633
- cmd: nuget pack source\Jobbr.Server.nuspec -version "%GitVersion_SemVer%" -prop "target=%CONFIGURATION%"
3734
- cmd: appveyor PushArtifact "Jobbr.Server.%GitVersion_SemVer%.nupkg"
3835

3936
deploy:
4037
- provider: NuGet
4138
server: https://nuget.org
4239
api_key:
43-
secure: +AgExDSzPqydFKSbpQBS0j3s8d3rwTli8aRmMbUZ3DVBL29Lj7MNPOxEDLJT7f07
40+
secure: anKLNUxe1pn63rrNVCigoQVfA/fWML9gEpE1UHRLK/LDmQX4SM9WwzDx0kliHKWC
4441
on:
4542
appveyor_repo_tag: true

‎source/Jobbr.Server.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<dependencies>
1515
<dependency id="Jobbr.ComponentModel.ArtefactStorage" version="[1,1.1)" />
1616
<dependency id="Jobbr.ComponentModel.Execution" version="[1,1.1)" />
17-
<dependency id="Jobbr.ComponentModel.JobStorage" version="[1.3,1.4)" />
18-
<dependency id="Jobbr.ComponentModel.Management" version="[1.5,1.6)" />
17+
<dependency id="Jobbr.ComponentModel.JobStorage" version="[1.4,1.5)" />
18+
<dependency id="Jobbr.ComponentModel.Management" version="[1.6,1.7)" />
1919
<dependency id="Jobbr.ComponentModel.Registration" version="[1,1.1)" />
2020
</dependencies>
2121
</metadata>
2222
<files>
23-
<file src="../ilmerged/Jobbr.Server.dll" target="lib\net462"/>
24-
<file src="../ilmerged/Jobbr.Server.pdb" target="lib\net462"/>
23+
<file src="Jobbr.Server\bin\Release\Jobbr.Server.dll" target="lib\net462"/>
24+
<file src="Jobbr.Server\bin\Release\Jobbr.Server.pdb" target="lib\net462"/>
2525
</files>
2626
</package>

‎source/Jobbr.Server.sln.DotSettings‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@
4141
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
4242
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
4343
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
44-
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String></wpf:ResourceDictionary>
44+
<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
45+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Jobbr/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎source/Jobbr.Server/Builder/JobbrBuilder.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public JobbrServer Create(int maxConcurrentJobs = 4)
5353
// Register default implementations if user did not specify any separate
5454
if (this.container.TryGet<IJobScheduler>() == null)
5555
{
56-
// Don't warn because the internel Scheduler is usually in use
56+
// Don't warn because the internal Scheduler is usually in use
5757
this.AddDefaultScheduler();
5858
}
5959

@@ -78,11 +78,9 @@ public void Register<T>(Type type)
7878

7979
public void Add<T>(object instance)
8080
{
81-
var featureConfiguration = instance as IFeatureConfiguration;
82-
83-
if (featureConfiguration != null)
81+
if (instance is IFeatureConfiguration featureConfiguration)
8482
{
85-
this.container.Bind<IFeatureConfiguration>().ToConstant((IFeatureConfiguration)instance);
83+
this.container.Bind<IFeatureConfiguration>().ToConstant(featureConfiguration);
8684
}
8785

8886
this.container.Bind<T>().ToConstant((T)instance);

‎source/Jobbr.Server/ComponentServices/Management/JobQueryService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ public PagedResult<JobRun> GetJobRunsByState(JobRunStates state, int page = 1, i
166166

167167
public PagedResult<JobRun> GetJobRunsByStates(JobRunStates[] states, int page = 1, int pageSize = 50, string jobTypeFilter = null, string jobUniqueNameFilter = null, string query = null, bool showDeleted = false, params string[] sort)
168168
{
169-
var statesCasted = states.Select(s => (ComponentModel.JobStorage.Model.JobRunStates)s).ToArray();
169+
var statesCast = states.Select(s => (ComponentModel.JobStorage.Model.JobRunStates)s).ToArray();
170170

171-
var jobruns = this.repository.GetJobRunsByStates(statesCasted, page, pageSize, jobTypeFilter, jobUniqueNameFilter, query, showDeleted, sort);
171+
var jobruns = this.repository.GetJobRunsByStates(statesCast, page, pageSize, jobTypeFilter, jobUniqueNameFilter, query, showDeleted, sort);
172172

173173
return new PagedResult<JobRun>
174174
{

‎source/Jobbr.Server/Core/Models/JobModel.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ public class JobModel
1919
public DateTime? CreatedDateTimeUtc { get; set; }
2020

2121
public bool Deleted { get; set; }
22+
23+
public int MaxConcurrentJobRuns { get; set; }
2224
}
2325
}

‎source/Jobbr.Server/Core/Models/JobRunStates.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public enum JobRunStates
1313
Scheduled = 1,
1414

1515
/// <summary>
16-
/// The JobStarter has created a enviornment for the Job and copies a related files/data to the working directory
16+
/// The JobStarter has created a environment for the Job and copies a related files/data to the working directory
1717
/// </summary>
1818
Preparing = 2,
1919

@@ -28,12 +28,12 @@ public enum JobRunStates
2828
Started = 4,
2929

3030
/// <summary>
31-
/// The Executable itself has connected to the jobServer
31+
/// The Executable itself has connected to the job server
3232
/// </summary>
3333
Connected = 5,
3434

3535
/// <summary>
36-
/// The Executable is running and connected to the jobserver
36+
/// The Executable is running and connected to the job server
3737
/// </summary>
3838
Initializing = 6,
3939

@@ -53,7 +53,7 @@ public enum JobRunStates
5353
Collecting = 9,
5454

5555
/// <summary>
56-
/// The job as executed sucessfully and the executer has cleaned up and terminated
56+
/// The job as executed successfully and the executor has cleaned up and terminated
5757
/// </summary>
5858
Completed = 10,
5959

@@ -68,7 +68,7 @@ public enum JobRunStates
6868
Deleted = 12,
6969

7070
/// <summary>
71-
/// The JobRun has been omitted. Eg job has been scheduled, Jobserver stopped (before the jobrun is executed) and After PlannedStartDateTime started again -> JobRun won't be started in that case but set to Omitted.
71+
/// The JobRun has been omitted. Eg job has been scheduled, job server stopped (before the jobrun is executed) and After PlannedStartDateTime started again -> JobRun won't be started in that case but set to Omitted.
7272
/// </summary>
7373
Omitted = 13
7474
}

‎source/Jobbr.Server/FodyWeavers.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
3+
<Costura />
4+
</Weavers>

0 commit comments

Comments
 (0)