Merge remote-tracking branch 'origin/dev'

VERSION

@@ -1 +1 @@
-8.1.0
+8.2.0

src/Moryx.ControlSystem/Cells/Session.cs

@@ -16,7 +16,7 @@ public abstract class Session
         /// <summary>
         /// Empty array of constraints
         /// </summary>
-        protected static readonly IConstraint[] EmptyConstraints = new IConstraint[0];
+        protected static readonly IConstraint[] EmptyConstraints = Array.Empty<IConstraint>();
 
         /// <summary>
         /// Initialize a new resource request for a certain resource

src/Moryx.ControlSystem/Jobs/Job.cs

@@ -56,14 +56,20 @@ public Job(IRecipe recipe, int amount)
         /// Classification of the job
         /// </summary>
         public JobClassification Classification { get; set; }
-
+
+        /// <summary>
+        /// Detailed display name of the state
+        /// TODO: Remove this property in next major and replace with reworked JobClassification
+        /// </summary>
+        public virtual string StateDisplayName { get; protected set; }
+
         private IReadOnlyList<IProcess> _runningProcesses;
         /// <summary>
         /// Currently running processes of the job
         /// </summary>
         public IReadOnlyList<IProcess> RunningProcesses
         {
-            get => _runningProcesses ?? new IProcess[0];
+            get => _runningProcesses ?? Array.Empty<IProcess>();
             protected set => _runningProcesses = value;
         }
 
@@ -73,7 +79,7 @@ public IReadOnlyList<IProcess> RunningProcesses
         /// </summary>
         public IReadOnlyList<IProcess> AllProcesses
         {
-            get => _allProcesses ?? new IProcess[0];
+            get => _allProcesses ?? Array.Empty<IProcess>();
             protected set => _allProcesses = value;
         }
     }

src/Moryx.ControlSystem/Jobs/JobSchedulerBase.cs

@@ -24,7 +24,7 @@ public abstract class JobSchedulerBase<T> : IJobScheduler
         /// <summary>
         /// Empty array for jobs without dependencies
         /// </summary>
-        private readonly Job[] EmptyDependencies = new Job[0];
+        private readonly Job[] EmptyDependencies = Array.Empty<Job>();
 
         /// <summary>
         /// Dependency map that can be helpful for job scheduling

src/Moryx.ControlSystem/VisualInstructions/ActiveInstruction.cs

@@ -35,7 +35,7 @@ public class ActiveInstruction
         /// Results of the instruction
         /// </summary>
         [Obsolete("Use the result objects in 'Results' property instead!")]
-        public IReadOnlyList<string> PossibleResults { get; set; } = new string[0];
+        public IReadOnlyList<string> PossibleResults { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Possible results of the instruction

src/Moryx.Orders/Assignment/Recipes/RecipeAssignmentBase.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2021, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -55,7 +56,7 @@ public virtual Task<IReadOnlyList<IProductRecipe>> PossibleRecipes(ProductIdenti
         {
             var product = ProductManagement.LoadType(identity);
             if (product == null)
-                return Task.FromResult<IReadOnlyList<IProductRecipe>>(new IProductRecipe[0]);
+                return Task.FromResult<IReadOnlyList<IProductRecipe>>(Array.Empty<IProductRecipe>());
 
             var recipes = ProductManagement.GetRecipes(product, RecipeClassification.Default | RecipeClassification.Alternative);
             return Task.FromResult(recipes);