Skip to content

Commit

Permalink
upd to 20.0.4 (#14)
Browse files Browse the repository at this point in the history
Co-authored-by: IAtsuta <IAtsuta@IATSUTA-NB>
  • Loading branch information
iatsuta and IAtsuta committed Nov 23, 2023
1 parent 6f38808 commit 9542d3c
Show file tree
Hide file tree
Showing 60 changed files with 235 additions and 304 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build+unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Restore dependencies
working-directory: ./src
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Set up SqlServer
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Restore dependencies
working-directory: ./src
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Set up JDK 11
uses: actions/setup-java@v1
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<!-- Package settings -->
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Copyright>Luxoft 2009-2023</Copyright>
<Authors>Luxoft BSS</Authors>
Expand Down
27 changes: 16 additions & 11 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<FrameworkVersion>19.2.1</FrameworkVersion>
<FrameworkVersion>20.0.4</FrameworkVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
Expand All @@ -18,10 +18,10 @@
<PackageVersion Include="Luxoft.Framework.App.Sdk" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.App.ServiceEnvironment" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Authorization.BLL.Core" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Authorization.SecuritySystem" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Authorization.WebApi" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.AutomationCore.ServiceEnvironment" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Cap" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Core" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Configuration.BLL.Core" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Configuration.Core" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Configuration.WebApi" Version="$(FrameworkVersion)" />
Expand All @@ -36,23 +36,28 @@
<PackageVersion Include="Luxoft.Framework.DomainDriven.WebApiGenerator.NetCore" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.DomainDriven.WebApiNetCore" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.DomainDriven.WebApiNetCore.LegacyContext" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.ExpressionParsers" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.NotificationCore" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Persistent.Mapping.Audit" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.Security" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.SecuritySystem.Abstract" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.SecuritySystem" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.SecuritySystem.Bss" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.WebApi.Utils" Version="$(FrameworkVersion)" />
<PackageVersion Include="MediatR" Version="12.1.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.11" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />

<PackageVersion Include="Luxoft.Framework.Core" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.DomainDriven.ProjectionGenerator" Version="$(FrameworkVersion)" />
<PackageVersion Include="Luxoft.Framework.ExpressionParsers" Version="$(FrameworkVersion)" />

<PackageVersion Include="MediatR" Version="12.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.18.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
<PackageVersion Include="nuSpec.NHibernate" Version="1.3.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageVersion Include="Serilog.Sinks.Graylog" Version="3.1.0" />
<PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
<PackageVersion Include="Luxoft.Framework.DomainDriven.ProjectionGenerator" Version="$(FrameworkVersion)" />

<PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
</ItemGroup>
</Project>
23 changes: 23 additions & 0 deletions src/IAD.Framework.WF.sln
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowSampleSystem.Integr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework.Workflow.Environment", "_Workflow\Framework.Workflow.Environment\Framework.Workflow.Environment.csproj", "{494009F7-5F17-4905-B222-363FE26D8BEF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowSampleSystem.Security", "_WorkflowSampleSystem\WorkflowSampleSystem.Security\WorkflowSampleSystem.Security.csproj", "{FBC42407-A4C0-4C3D-962B-3552703A83A5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -630,6 +632,26 @@ Global
{494009F7-5F17-4905-B222-363FE26D8BEF}.Release|x64.Build.0 = Release|Any CPU
{494009F7-5F17-4905-B222-363FE26D8BEF}.Release|x86.ActiveCfg = Release|Any CPU
{494009F7-5F17-4905-B222-363FE26D8BEF}.Release|x86.Build.0 = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|ARM.ActiveCfg = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|ARM.Build.0 = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|x64.ActiveCfg = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|x64.Build.0 = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|x86.ActiveCfg = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Debug|x86.Build.0 = Debug|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|Any CPU.Build.0 = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|ARM.ActiveCfg = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|ARM.Build.0 = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|x64.ActiveCfg = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|x64.Build.0 = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|x86.ActiveCfg = Release|Any CPU
{FBC42407-A4C0-4C3D-962B-3552703A83A5}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -665,6 +687,7 @@ Global
{BA54F37A-09B0-4FC4-A205-2981D224B5DC} = {A3BA7281-6B7A-412B-B2E5-B498ED1BD51F}
{A5B52BF1-94EF-41DE-B33B-9EA58B08CD16} = {A3BA7281-6B7A-412B-B2E5-B498ED1BD51F}
{494009F7-5F17-4905-B222-363FE26D8BEF} = {8CCBC5B8-CD7D-42E5-ACF8-56CB8DD39BD3}
{FBC42407-A4C0-4C3D-962B-3552703A83A5} = {41EA6AC4-948F-44A4-890D-6C6937560666}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {68BB011C-6BAC-4558-903A-BF29D2F8046F}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using Framework.DomainDriven;
using Framework.DomainDriven.BLL.Security;
using Framework.Persistent;
using Framework.Workflow.Domain;
using Framework.Workflow.Domain.Runtime;
using Framework.Workflow.Domain.Runtime;

namespace Framework.Workflow.BLL
{
Expand Down
6 changes: 1 addition & 5 deletions src/_Workflow/Framework.Workflow.BLL/ConditionStateBLL.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using Framework.Exceptions;
using Framework.Workflow.Domain;

namespace Framework.Workflow.BLL
namespace Framework.Workflow.BLL
{
public partial class ConditionStateBLL
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using Framework.Workflow.Domain;
using Framework.Core;
Expand Down
2 changes: 1 addition & 1 deletion src/_Workflow/Framework.Workflow.BLL/EventBLL.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Framework.Core;

using Framework.DomainDriven;
using Framework.Workflow.Domain;
using Framework.Workflow.Domain.Definition;
Expand Down
5 changes: 1 addition & 4 deletions src/_Workflow/Framework.Workflow.BLL/ParallelStateBLL.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using Framework.Workflow.Domain;

namespace Framework.Workflow.BLL
namespace Framework.Workflow.BLL
{
public partial class ParallelStateBLL
{
Expand Down
9 changes: 1 addition & 8 deletions src/_Workflow/Framework.Workflow.BLL/RoleBLL.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
using System;

using Framework.Core;
using Framework.Exceptions;
using Framework.Workflow.Domain.Definition;
using Framework.Workflow.Domain.Runtime;

namespace Framework.Workflow.BLL
namespace Framework.Workflow.BLL
{
public partial class RoleBLL
{
Expand Down
8 changes: 1 addition & 7 deletions src/_Workflow/Framework.Workflow.BLL/StateInstanceBLL.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Framework.Workflow.Domain.Definition;
using Framework.Workflow.Domain.Runtime;

namespace Framework.Workflow.BLL
namespace Framework.Workflow.BLL
{
public partial class StateInstanceBLL
{
Expand Down
7 changes: 1 addition & 6 deletions src/_Workflow/Framework.Workflow.BLL/TaskBLL.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;

using Framework.Core;
using Framework.Workflow.Domain.Definition;

namespace Framework.Workflow.BLL
namespace Framework.Workflow.BLL
{
public partial class TaskBLL
{
Expand Down
4 changes: 1 addition & 3 deletions src/_Workflow/Framework.Workflow.BLL/TransitionActionBLL.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Framework.Exceptions;

namespace Framework.Workflow.BLL
namespace Framework.Workflow.BLL
{
public partial class TransitionActionBLL
{
Expand Down
2 changes: 0 additions & 2 deletions src/_Workflow/Framework.Workflow.BLL/WorkflowInstanceBLL.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

using Framework.Core;
using Framework.Core.Serialization;
using Framework.DomainDriven.BLL;
using Framework.Exceptions;
using Framework.HierarchicalExpand;
using Framework.Persistent;
using Framework.Validation;
using Framework.Workflow.Domain;
using Framework.Workflow.Domain.Definition;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;

namespace Framework.Workflow.Core.Extensions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Linq;

using Framework.Core;

namespace Framework.Workflow.Core.Extensions;

public static class CoreObjectExtensions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Collections.Generic;

using Framework.DomainDriven;
using Framework.DomainDriven.Serialization;
using Framework.Persistent;
using Framework.Projection.Contract;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;

using Framework.Core;
using Framework.DomainDriven;
using Framework.DomainDriven.Serialization;
using Framework.Projection.Contract;
using Framework.Workflow.Domain.Runtime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
using System.Collections.Generic;

using Framework.DomainDriven;
using Framework.DomainDriven.Serialization;
using Framework.Persistent;

using Framework.Projection;
using Framework.Projection.Contract;

using Framework.Workflow.Domain.Definition;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Linq.Expressions;

namespace Framework.Workflow.Domain
namespace Framework.Workflow.Domain
{
public class WorkflowCreateModel : DomainObjectCreateModel<Framework.Workflow.Domain.Definition.Workflow>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

using Framework.Workflow.Domain.Definition;
using Framework.Workflow.Domain.Definition;

namespace Framework.Workflow.Domain
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Linq;

using Framework.Core;
using Framework.DomainDriven.Serialization;

using Framework.Restriction;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;

using Framework.DomainDriven.BLL;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;

using Framework.Core;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.Serialization;
using System.Runtime.Serialization;
using Framework.DomainDriven.ServiceModel.IAD;
using Framework.Graphviz;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;

using Framework.Core;
using Framework.DomainDriven.DTOGenerator;
using Framework.DomainDriven.DTOGenerator.Server;
using Framework.DomainDriven.Generation.Domain;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

namespace Framework.Workflow.TestGenerate
namespace Framework.Workflow.TestGenerate
{
public class ProjectionGeneratorConfiguration : Framework.DomainDriven.ProjectionGenerator.GeneratorConfigurationBase<ServerGenerationEnvironment>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

namespace Framework.Workflow.TestGenerate
namespace Framework.Workflow.TestGenerate
{
public partial class ServerGenerationEnvironment :

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

using Framework.DomainDriven.ServiceModelGenerator;
using Framework.DomainDriven.ServiceModelGenerator;

namespace Framework.Workflow.TestGenerate
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Collections.Generic;

using Framework.Core.Services;
using Framework.DomainDriven;
using Framework.DomainDriven.DBGenerator;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@

using Framework.Workflow.BLL;
using Framework.Workflow.Generated.DTO;
using Framework.DomainDriven.BLL;
using Framework.DomainDriven.ServiceModel.Service;
using Framework.DomainDriven.WebApiNetCore;
using Framework.Exceptions;
using Framework.Graphviz;
using Framework.Graphviz.Dot;
using Framework.WebApi.Utils.SL;
using Framework.Workflow.Environment;



using Microsoft.AspNetCore.Mvc;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using Framework.Workflow.TestGenerate;
using Framework.Workflow.TestGenerate;

namespace Framework.Workflow.WebApiGenerate
{
Expand Down
Loading

0 comments on commit 9542d3c

Please sign in to comment.