Akomashko/move to fw18.6.0 (#10)

* migrated to 18.6.0
Luxoft · May 5, 2023 · 82ece90 · 82ece90
1 parent 74d5a79
commit 82ece90
Show file tree

Hide file tree

Showing 51 changed files with 312 additions and 234 deletions.
diff --git a/.github/workflows/build+unit.yml b/.github/workflows/build+unit.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Restore dependencies
       working-directory: ./src

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Set up SqlServer
       run: |

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Restore dependencies
       working-directory: ./src

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Set up JDK 11
       uses: actions/setup-java@v1

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,9 +1,9 @@
-<Project>
+<Project>
   <!-- Package settings -->
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Copyright>Luxoft 2009-2022</Copyright>
+    <Copyright>Luxoft 2009-2023</Copyright>
     <Authors>Luxoft BSS</Authors>
     <RepositoryUrl>https://github.com/Luxoft/BSSFramework.Workflow</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,54 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
+    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
+    <PackageVersion Include="FluentMigrator" Version="3.3.2" />
+    <PackageVersion Include="FluentMigrator.Runner" Version="3.3.2" />
+    <PackageVersion Include="FluentNHibernate" Version="3.2.0" />
+    <PackageVersion Include="Luxoft.Framework.App.BLL" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.App.BLLCore" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.App.Core" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.App.Dal" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.App.Domain" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.App.Dto" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.App.Sdk" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.App.ServiceEnvironment" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Authorization.BLL.Core" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Authorization.WebApi" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.AutomationCore.ServiceEnvironment" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Cap" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Configuration.Generated.DTO" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Configuration.WebApi" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Core" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Core.AnonymousTypeBuilder" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.BLL" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.BLL.Security" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.DBGenerator" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.NHibernate" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.NHibernate.DALGenerator" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.ProjectionGenerator" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.ServiceModel" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.ServiceModel.IAD" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.ServiceModel.IAD.DTO" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.ServiceModelGenerator" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.WebApiGenerator.NetCore" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.DomainDriven.WebApiNetCore" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.ExpressionParsers" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.NotificationCore" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.Security" Version="18.6.0" />
+    <PackageVersion Include="Luxoft.Framework.WebApi.Utils" Version="18.6.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.13.0" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageVersion Include="nuSpec.NHibernate" Version="1.3.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageVersion Include="Serilog.Sinks.Graylog" Version="2.3.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/Framework.Graphviz/Framework.Graphviz.csproj b/src/Framework.Graphviz/Framework.Graphviz.csproj
@@ -8,8 +8,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common"/>
 
-    <PackageReference Include="Luxoft.Framework.Core" Version="17.5.1" />
+    <PackageReference Include="Luxoft.Framework.Core"/>
   </ItemGroup>
 </Project>
diff --git a/src/IAD.Framework.WF.sln b/src/IAD.Framework.WF.sln
@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__SolutionItems", "__Soluti
 		.editorconfig = .editorconfig
 		__SolutionItems\CommonAssemblyInfo.cs = __SolutionItems\CommonAssemblyInfo.cs
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		Settings.StyleCop = Settings.StyleCop
 	EndProjectSection
 EndProject

diff --git a/src/_Workflow/Framework.Workflow.BLL.Core/Framework.Workflow.BLL.Core.csproj b/src/_Workflow/Framework.Workflow.BLL.Core/Framework.Workflow.BLL.Core.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Luxoft.Framework.Core.AnonymousTypeBuilder" Version="17.5.1" />
-    <PackageReference Include="Luxoft.Framework.Authorization.BLL.Core" Version="17.5.1" />
-    <PackageReference Include="Luxoft.Framework.ExpressionParsers" Version="17.5.1" />
+    <PackageReference Include="Luxoft.Framework.Core.AnonymousTypeBuilder"/>
+    <PackageReference Include="Luxoft.Framework.Authorization.BLL.Core"/>
+    <PackageReference Include="Luxoft.Framework.ExpressionParsers"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/_Workflow/Framework.Workflow.BLL.Core/TargetSystemService/TargetSystemService.cs b/src/_Workflow/Framework.Workflow.BLL.Core/TargetSystemService/TargetSystemService.cs
@@ -10,6 +10,7 @@
 using Framework.Exceptions;
 using Framework.Persistent;
 using Framework.SecuritySystem;
+using Framework.Workflow.Core.Extensions;
 using Framework.Workflow.Domain;
 using Framework.Workflow.Domain.Definition;
 using Framework.Workflow.Domain.Runtime;

diff --git a/src/_Workflow/Framework.Workflow.Core/Extensions/ArrayExtensions.cs b/src/_Workflow/Framework.Workflow.Core/Extensions/ArrayExtensions.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+
+namespace Framework.Workflow.Core.Extensions;
+
+public static class ArrayExtensions
+{
+    public static Type GetElementType(this Array array)
+    {
+        if (array == null) throw new ArgumentNullException(nameof(array));
+
+        return array.GetType().GetElementType();
+    }
+
+    public static MemoryStream ToMemoryStream([NotNull] this byte[] source)
+    {
+        if (source == null) throw new ArgumentNullException(nameof(source));
+
+        return new MemoryStream(source);
+    }
+}
diff --git a/src/_Workflow/Framework.Workflow.Core/Extensions/CoreEnumerableExtensions.cs b/src/_Workflow/Framework.Workflow.Core/Extensions/CoreEnumerableExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Framework.Core;
+
+namespace Framework.Workflow.Core.Extensions;
+
+public static class CoreEnumerableExtensions
+{
+    public static bool HasDuplicates<T>(this IEnumerable<T> source, IEqualityComparer<T> comparer = null)
+    {
+        if (source == null) throw new ArgumentNullException(nameof(source));
+
+        return source.GetDuplicates(comparer).Any();
+    }
+}
diff --git a/src/_Workflow/Framework.Workflow.Core/Extensions/CoreObjectExtensions.cs b/src/_Workflow/Framework.Workflow.Core/Extensions/CoreObjectExtensions.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Framework.Core;
+
+namespace Framework.Workflow.Core.Extensions;
+
+public static class CoreObjectExtensions
+{
+    public static Dictionary<string, object> ToPropertyDictionary(
+            this object source,
+            Func<string, string> propertyNameSelector = null)
+    {
+        if (source == null) throw new ArgumentNullException(nameof(source));
+
+        var request = from property in source.GetType().GetProperties()
+                      where !property.GetIndexParameters().Any()
+                      let name = propertyNameSelector == null ? property.Name : propertyNameSelector(property.Name)
+                      select name.ToKeyValuePair(property.GetValue(source, Array.Empty<object>()));
+
+        return request.ToDictionary();
+    }
+
+    public static KeyValuePair<TKey, TValue> ToKeyValuePair<TKey, TValue>(this TKey key, TValue value)
+    {
+        return new KeyValuePair<TKey, TValue>(key, value);
+    }
+}
diff --git a/src/_Workflow/Framework.Workflow.Core/Framework.Workflow.Core.csproj b/src/_Workflow/Framework.Workflow.Core/Framework.Workflow.Core.csproj
@@ -7,7 +7,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Luxoft.Framework.Security" Version="17.5.1" />
+    <PackageReference Include="Luxoft.Framework.Security" />
   </ItemGroup>
 
 </Project>
diff --git a/src/_Workflow/Framework.Workflow.Core/INamedCollection.cs b/src/_Workflow/Framework.Workflow.Core/INamedCollection.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Framework.Workflow.Core;
+
+public interface INamedCollection<out T> : IEnumerable<T>
+{
+    T this[string name] { get; }
+}
diff --git a/src/_Workflow/Framework.Workflow.Core/NamedCollection.cs b/src/_Workflow/Framework.Workflow.Core/NamedCollection.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+using Framework.Core;
+
+namespace Framework.Workflow.Core;
+
+public class NamedCollection<T> : ReadOnlyCollection<T>, INamedCollection<T>
+{
+    private readonly Func<T, string> _getName;
+
+    public NamedCollection(IEnumerable<T> list, Func<T, string> getName)
+            : base(list.ToList())
+    {
+        if (getName == null) throw new ArgumentNullException(nameof(getName));
+
+        this._getName = getName;
+    }
+
+
+    protected virtual IEqualityComparer<string> NameComparer
+    {
+        get { return StringComparer.CurrentCultureIgnoreCase; }
+    }
+
+
+    public T this[string name]
+    {
+        get
+        {
+            return this.Where(item => this.NameComparer.Equals(this._getName(item), name))
+                       .Single(() => new Exception($"{typeof(T).Name} with name \"{name}\" not found"),
+                               () => new Exception($"To many {typeof(T).Name} elements with name \"{name}\""));
+        }
+    }
+}
diff --git a/src/_Workflow/Framework.Workflow.Core/_Restricted/IRestrictedStateInstance.cs b/src/_Workflow/Framework.Workflow.Core/_Restricted/IRestrictedStateInstance.cs
@@ -1,4 +1,4 @@
-using Framework.Core;
+using Framework.Workflow.Core;
 
 namespace Framework.Workflow
 {
@@ -18,4 +18,4 @@ public interface IRestrictedWofkflowInstanceCollection<out TRestrictedWofkflowIn
 
         bool AnyAborted { get; }
     }
-}
+}
diff --git a/src/_Workflow/Framework.Workflow.Core/_Restricted/IRestrictedWofkflowInstance.cs b/src/_Workflow/Framework.Workflow.Core/_Restricted/IRestrictedWofkflowInstance.cs
@@ -1,4 +1,4 @@
-using Framework.Core;
+using Framework.Workflow.Core;
 
 namespace Framework.Workflow
 {
@@ -15,4 +15,4 @@ public interface IRestrictedWofkflowInstance
 
         INamedCollection<string> Parameters { get; }
     }
-}
+}
diff --git a/...low/Framework.Workflow.Domain.Models/Requests/ExecuteCommand/MassExecuteCommandRequest.cs b/...low/Framework.Workflow.Domain.Models/Requests/ExecuteCommand/MassExecuteCommandRequest.cs
@@ -6,6 +6,7 @@
 
 using Framework.Restriction;
 using Framework.Validation;
+using Framework.Workflow.Core.Extensions;
 
 namespace Framework.Workflow.Domain
 {
@@ -38,4 +39,4 @@ public IEnumerable<ExecuteCommandRequest> Split()
                    select request;
         }
     }
-}
+}
diff --git a/src/_Workflow/Framework.Workflow.Domain/Framework.Workflow.Domain.csproj b/src/_Workflow/Framework.Workflow.Domain/Framework.Workflow.Domain.csproj
@@ -29,8 +29,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Luxoft.Framework.DomainDriven.BLL.Security" Version="17.5.1" />
-    <PackageReference Include="Luxoft.Framework.DomainDriven.BLL" Version="17.5.1" />
+    <PackageReference Include="Luxoft.Framework.DomainDriven.BLL.Security" />
+    <PackageReference Include="Luxoft.Framework.DomainDriven.BLL" />
   </ItemGroup>
 
 </Project>
diff --git a/src/_Workflow/Framework.Workflow.Domain/Runtime/State/StateInstance.cs b/src/_Workflow/Framework.Workflow.Domain/Runtime/State/StateInstance.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Framework.Core;
 using Framework.DomainDriven;
 using Framework.DomainDriven.BLL;
 using Framework.DomainDriven.Serialization;
 using Framework.Persistent;
 using Framework.Restriction;
+using Framework.Workflow.Core;
 
 namespace Framework.Workflow.Domain.Runtime
 {
@@ -188,4 +188,4 @@ public bool AnyStates(string stateName)
         //    get { return this.Tasks.SelectMany(task => task.Assignees).Distinct(v => v.Login); }
         //}
     }
-}
+}
diff --git a/src/_Workflow/Framework.Workflow.Domain/Runtime/Workflow/WorkflowInstance.cs b/src/_Workflow/Framework.Workflow.Domain/Runtime/Workflow/WorkflowInstance.cs
@@ -8,6 +8,7 @@
 using Framework.Exceptions;
 using Framework.Persistent;
 using Framework.Restriction;
+using Framework.Workflow.Core;
 
 namespace Framework.Workflow.Domain.Runtime
 {
@@ -368,4 +369,4 @@ bool IRestrictedWofkflowInstance.IsFinished
             get { return this.Watchers; }
         }
     }
-}
+}
diff --git a/src/_Workflow/Framework.Workflow.Environment/Framework.Workflow.Environment.csproj b/src/_Workflow/Framework.Workflow.Environment/Framework.Workflow.Environment.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Luxoft.Framework.DomainDriven.ServiceModel" Version="17.5.1" />
-    <PackageReference Include="Luxoft.Framework.DomainDriven.ServiceModel.IAD" Version="17.5.1" />
-    <PackageReference Include="Luxoft.Framework.DomainDriven.WebApiNetCore" Version="17.5.1" />
+    <PackageReference Include="Luxoft.Framework.DomainDriven.ServiceModel" />
+    <PackageReference Include="Luxoft.Framework.DomainDriven.ServiceModel.IAD" />
+    <PackageReference Include="Luxoft.Framework.DomainDriven.WebApiNetCore" />
   </ItemGroup>
 
 </Project>
diff --git a/...work.Workflow.Generated.DAL.NHibernate/Framework.Workflow.Generated.DAL.NHibernate.csproj b/...work.Workflow.Generated.DAL.NHibernate/Framework.Workflow.Generated.DAL.NHibernate.csproj
@@ -16,6 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Luxoft.Framework.DomainDriven.NHibernate" Version="17.5.1" />
+    <PackageReference Include="Luxoft.Framework.DomainDriven.NHibernate" />
   </ItemGroup>
 </Project>
diff --git a/src/_Workflow/Framework.Workflow.Generated.DTO/Framework.Workflow.Generated.DTO.csproj b/src/_Workflow/Framework.Workflow.Generated.DTO/Framework.Workflow.Generated.DTO.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Luxoft.Framework.DomainDriven.ServiceModel.IAD.DTO" Version="17.5.1" />
+    <PackageReference Include="Luxoft.Framework.DomainDriven.ServiceModel.IAD.DTO" />
   </ItemGroup>
 
 </Project>