Update to Jobbr Server 1.6.0

- Update Dashboard to 1.2.0 - Fix some typos
jobbrIO · Nov 2, 2022 · f779a14 · f779a14
1 parent 1924453
commit f779a14
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/Demo.Client/Properties/AssemblyInfo.cs b/Demo.Client/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Zuehlke Technology Group")]
 [assembly: AssemblyProduct("Demo.Client")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Demo.JobRunner/Properties/AssemblyInfo.cs b/Demo.JobRunner/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Zuehlke Technology Group")]
 [assembly: AssemblyProduct("Demo.JobRunner")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Demo.JobServer/Demo.JobServer.csproj b/Demo.JobServer/Demo.JobServer.csproj
@@ -66,15 +66,18 @@
     <PackageReference Include="Jobbr.ArtefactStorage.FileSystem" Version="1.0.1" />
     <PackageReference Include="Jobbr.ComponentModel.ArtefactStorage" Version="1.0.1" />
     <PackageReference Include="Jobbr.ComponentModel.Execution" Version="1.0.1" />
-    <PackageReference Include="Jobbr.ComponentModel.JobStorage" Version="1.3.0" />
-    <PackageReference Include="Jobbr.ComponentModel.Management" Version="1.5.0" />
+    <PackageReference Include="Jobbr.ComponentModel.JobStorage" Version="1.4.0" />
+    <PackageReference Include="Jobbr.ComponentModel.Management" Version="1.6.0" />
     <PackageReference Include="Jobbr.ComponentModel.Registration" Version="1.0.1" />
     <PackageReference Include="Jobbr.Dashboard" Version="1.2.0" />
     <PackageReference Include="Jobbr.Execution.Forked" Version="1.1.1" />
-    <PackageReference Include="Jobbr.Server" Version="1.4.2" />
+    <PackageReference Include="Jobbr.Server" Version="1.6.0" />
     <PackageReference Include="Jobbr.Server.WebAPI" Version="1.6.1" />
-    <PackageReference Include="Jobbr.Storage.MsSql" Version="2.2.1" />
+    <PackageReference Include="Jobbr.Storage.MsSql" Version="3.0.0-rc.1" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.1.0" />
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.1</Version>
+    </PackageReference>
     <PackageReference Include="ServiceStack.Common" Version="5.2.0" />
     <PackageReference Include="ServiceStack.Interfaces" Version="5.2.0" />
     <PackageReference Include="ServiceStack.OrmLite" Version="5.2.0" />

diff --git a/Demo.JobServer/MyExtension.cs b/Demo.JobServer/MyExtension.cs
@@ -7,22 +7,21 @@ public class MyExtension : IJobbrComponent
     {
         public static MyExtension Instance;
 
-        private readonly IJobbrServiceProvider serviceProvider;
-        private readonly IJobManagementService jobManagementService;
-        private readonly IQueryService queryService;
+        private readonly IJobbrServiceProvider _serviceProvider;
+        private readonly IJobManagementService _jobManagementService;
+        private readonly IQueryService _queryService;
 
-
-        public IJobManagementService JobManagementService => jobManagementService;
+        public IJobManagementService JobManagementService => _jobManagementService;
 
         public MyExtension(IJobbrServiceProvider serviceProvider, IJobManagementService jobManagementService, IQueryService queryService)
         {
             Instance = this;
 
             // you can request basically anything that is available in the JobbrDI. The list of available types are 
             // defined in the corresponding component models available on http://github.com/jobbrIO
-            this.serviceProvider = serviceProvider;
-            this.jobManagementService = jobManagementService;
-            this.queryService = queryService;
+            this._serviceProvider = serviceProvider;
+            this._jobManagementService = jobManagementService;
+            this._queryService = queryService;
         }
 
         public void Dispose() { }

diff --git a/Demo.JobServer/Properties/AssemblyInfo.cs b/Demo.JobServer/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Zuehlke Technology Group")]
 [assembly: AssemblyProduct("Demo.JobServer")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Demo.MyJobs/Demo.MyJobs.csproj b/Demo.MyJobs/Demo.MyJobs.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="JobWithArtefacts.cs" />
-    <Compile Include="ParameterizedlJob.cs" />
+    <Compile Include="ParameterizedJob.cs" />
     <Compile Include="ProgressJob.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/Demo.MyJobs/ParameterizedlJob.cs → Demo.MyJobs/ParameterizedJob.cs b/Demo.MyJobs/ParameterizedlJob.cs → Demo.MyJobs/ParameterizedJob.cs
@@ -2,7 +2,7 @@
 
 namespace Demo.MyJobs
 {
-    public class ParameterizedlJob
+    public class ParameterizedJob
     {
         public void Run(object jobParameters, RunParameter runParameters)
         {

diff --git a/Demo.MyJobs/Properties/AssemblyInfo.cs b/Demo.MyJobs/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Zuehlke Technology Group")]
 [assembly: AssemblyProduct("Demo.MyJobs")]
-[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2015")]
+[assembly: AssemblyCopyright("Copyright © Zuehlke Technology Group 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Demo.sln.DotSettings b/Demo.sln.DotSettings
@@ -40,4 +40,6 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Artefact/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jobbr/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This repository contains a sample setup of Jobbr to get you started.
 # Quick Start
 
 - Clone this repo
-- Create the necessary database tables with the [CreateTables.sql](https://github.com/jobbrIO/jobbr-storage-mssql/blob/master/source/Jobbr.Storage.MsSql/CreateTables.sql) script
+- Create the database JobbrDemo
 - Double check the SQL Server connection is set correctly
 - Build & run Demo.JobServer