Skip to content

Commit 2e7aef2

Browse files
optimajetoptimajet
committed
WFE 20.0.4 (autocommit)
1 parent ad32167 commit 2e7aef2

File tree

49 files changed

+194
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+194
-202
lines changed

‎Designer/workflowdesigner.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<!-- Version -->
33
<PropertyGroup>
4-
<Version>20.0.3</Version>
4+
<Version>20.0.4</Version>
55
<AssemblyVersion>20.0.0</AssemblyVersion>
66
<FileVersion>20.0.0</FileVersion>
77
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<PackageVersion Include="Microsoft.Identity.Client" Version="4.72.1" />
2121
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.10.0" />
2222
<PackageVersion Include="Azure.Identity" Version="1.14.0" />
23-
<PackageVersion Include="WorkflowEngine.NETCore-Core" Version="20.0.3" />
24-
<PackageVersion Include="WorkflowEngine.NETCore-Migrator" Version="20.0.3" />
23+
<PackageVersion Include="WorkflowEngine.NETCore-Core" Version="20.0.4" />
24+
<PackageVersion Include="WorkflowEngine.NETCore-Migrator" Version="20.0.4" />
2525
</ItemGroup>
2626
<!-- Plugins -->
2727
<ItemGroup>
@@ -78,6 +78,11 @@
7878
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.40" />
7979
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
8080
</ItemGroup>
81+
<!-- Benchmark -->
82+
<ItemGroup>
83+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
84+
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
85+
</ItemGroup>
8186
<!-- Tests -->
8287
<ItemGroup>
8388
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

‎Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.deps.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MSSQL/20.0.3": {
10+
"OptimaJet.Workflow.MSSQL/20.0.4": {
1111
"dependencies": {
1212
"Azure.Identity": "1.14.0",
1313
"Microsoft.Data.SqlClient": "5.2.0",
@@ -16,8 +16,8 @@
1616
"NETStandard.Library": "2.0.3",
1717
"System.IdentityModel.Tokens.Jwt": "8.10.0",
1818
"System.Runtime.Caching": "8.0.1",
19-
"WorkflowEngine.NETCore-Core": "20.0.3",
20-
"WorkflowEngine.NETCore-Migrator": "20.0.3",
19+
"WorkflowEngine.NETCore-Core": "20.0.4",
20+
"WorkflowEngine.NETCore-Migrator": "20.0.4",
2121
"OptimaJet.Workflow.Core": "20.0.0.0",
2222
"OptimaJet.Workflow.Migrator": "20.0.0.0"
2323
},
@@ -1698,7 +1698,7 @@
16981698
}
16991699
}
17001700
},
1701-
"WorkflowEngine.NETCore-Core/20.0.3": {
1701+
"WorkflowEngine.NETCore-Core/20.0.4": {
17021702
"dependencies": {
17031703
"Microsoft.Bcl.AsyncInterfaces": "9.0.5",
17041704
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
@@ -1714,12 +1714,12 @@
17141714
},
17151715
"runtime": {
17161716
"OptimaJet.Workflow.Core.dll": {
1717-
"assemblyVersion": "20.0.3",
1717+
"assemblyVersion": "20.0.4",
17181718
"fileVersion": "20.0.0"
17191719
}
17201720
}
17211721
},
1722-
"WorkflowEngine.NETCore-Migrator/20.0.3": {
1722+
"WorkflowEngine.NETCore-Migrator/20.0.4": {
17231723
"dependencies": {
17241724
"Azure.Identity": "1.14.0",
17251725
"FluentMigrator": "5.2.0",
@@ -1729,11 +1729,11 @@
17291729
"Microsoft.IdentityModel.JsonWebTokens": "8.10.0",
17301730
"System.IdentityModel.Tokens.Jwt": "8.10.0",
17311731
"System.Runtime.Caching": "8.0.1",
1732-
"WorkflowEngine.NETCore-Core": "20.0.3"
1732+
"WorkflowEngine.NETCore-Core": "20.0.4"
17331733
},
17341734
"runtime": {
17351735
"OptimaJet.Workflow.Migrator.dll": {
1736-
"assemblyVersion": "20.0.3",
1736+
"assemblyVersion": "20.0.4",
17371737
"fileVersion": "20.0.0"
17381738
}
17391739
}
@@ -1757,7 +1757,7 @@
17571757
}
17581758
},
17591759
"libraries": {
1760-
"OptimaJet.Workflow.MSSQL/20.0.3": {
1760+
"OptimaJet.Workflow.MSSQL/20.0.4": {
17611761
"type": "project",
17621762
"serviceable": false,
17631763
"sha512": ""
@@ -2707,12 +2707,12 @@
27072707
"path": "thomaslevesque.weakevent/4.1.0",
27082708
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
27092709
},
2710-
"WorkflowEngine.NETCore-Core/20.0.3": {
2710+
"WorkflowEngine.NETCore-Core/20.0.4": {
27112711
"type": "project",
27122712
"serviceable": false,
27132713
"sha512": ""
27142714
},
2715-
"WorkflowEngine.NETCore-Migrator/20.0.3": {
2715+
"WorkflowEngine.NETCore-Migrator/20.0.4": {
27162716
"type": "project",
27172717
"serviceable": false,
27182718
"sha512": ""

‎Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.dll‎

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.DbPersistence/Source/MSSQLProvider.cs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using FluentMigrator.Runner.VersionTableInfo;
1515
using Microsoft.Extensions.DependencyInjection;
1616
using Microsoft.Extensions.Options;
17-
using Newtonsoft.Json;
1817
using OptimaJet.Workflow.Core;
1918
using OptimaJet.Workflow.Core.Fault;
2019
using OptimaJet.Workflow.Core.Model;
@@ -158,8 +157,8 @@ public async Task CreateAssignmentAsync(Guid processId, AssignmentCreationForm f
158157
IsActive = form.IsActive,
159158
DeadlineToComplete = form.DeadlineToComplete,
160159
DeadlineToStart = form.DeadlineToStart,
161-
Observers = JsonConvert.SerializeObject(form.Observers),
162-
Tags = JsonConvert.SerializeObject(form.Tags),
160+
Observers = Newtonsoft.Json.JsonConvert.SerializeObject(form.Observers),
161+
Tags = Newtonsoft.Json.JsonConvert.SerializeObject(form.Tags),
163162
DateCreation = _runtime.RuntimeDateTimeNow
164163
};
165164

@@ -192,8 +191,8 @@ public async Task UpdateAssignmentAsync(Assignment a)
192191
assignment.IsDeleted = a.IsDeleted;
193192
assignment.DeadlineToComplete = a.DeadlineToComplete;
194193
assignment.DeadlineToStart = a.DeadlineToStart;
195-
assignment.Observers = JsonConvert.SerializeObject(a.Observers ?? new List<string>());
196-
assignment.Tags = JsonConvert.SerializeObject(a.Tags ?? new List<string>());
194+
assignment.Observers = Newtonsoft.Json.JsonConvert.SerializeObject(a.Observers ?? new List<string>());
195+
assignment.Tags = Newtonsoft.Json.JsonConvert.SerializeObject(a.Tags ?? new List<string>());
197196

198197
await WorkflowProcessAssignment.UpdateAsync(connection, assignment).ConfigureAwait(false);
199198
}
@@ -943,14 +942,14 @@ public virtual async Task SaveGlobalParameterAsync<T>(string type, string name,
943942
Id = Guid.NewGuid(),
944943
Type = type,
945944
Name = name,
946-
Value = JsonConvert.SerializeObject(value)
945+
Value = Newtonsoft.Json.JsonConvert.SerializeObject(value)
947946
};
948947

949948
await WorkflowGlobalParameter.InsertAsync(connection, globalParameter).ConfigureAwait(false);
950949
}
951950
else
952951
{
953-
globalParameter.Value = JsonConvert.SerializeObject(value);
952+
globalParameter.Value = Newtonsoft.Json.JsonConvert.SerializeObject(value);
954953

955954
await WorkflowGlobalParameter.UpdateAsync(connection, globalParameter).ConfigureAwait(false);
956955
}
@@ -965,7 +964,7 @@ public virtual async Task<T> LoadGlobalParameterAsync<T>(string type, string nam
965964

966965
return globalParameter == null
967966
? default
968-
: JsonConvert.DeserializeObject<T>(globalParameter.Value);
967+
: Newtonsoft.Json.JsonConvert.DeserializeObject<T>(globalParameter.Value);
969968
}
970969

971970
public async Task<Dictionary<string, T>> LoadGlobalParametersWithNamesAsync<T>(string type, Sorting sort = null)
@@ -977,7 +976,7 @@ public async Task<Dictionary<string, T>> LoadGlobalParametersWithNamesAsync<T>(s
977976
var dict = new Dictionary<string, T>();
978977
foreach (var parameter in parameters)
979978
{
980-
dict[parameter.Name] = JsonConvert.DeserializeObject<T>(parameter.Value);
979+
dict[parameter.Name] = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(parameter.Value);
981980
}
982981

983982
return dict;
@@ -989,7 +988,7 @@ public virtual async Task<List<T>> LoadGlobalParametersAsync<T>(string type, Sor
989988

990989
var parameters = await WorkflowGlobalParameter.SelectByTypeAndNameAsync(connection, type, null, sort).ConfigureAwait(false);
991990

992-
return parameters.Select(p => JsonConvert.DeserializeObject<T>(p.Value)).ToList();
991+
return parameters.Select(p => Newtonsoft.Json.JsonConvert.DeserializeObject<T>(p.Value)).ToList();
993992
}
994993

995994
public virtual async Task<PagedResponse<T>> LoadGlobalParametersWithPagingAsync<T>(string type, Paging paging, string name = null, Sorting sort = null)
@@ -1002,7 +1001,7 @@ public virtual async Task<PagedResponse<T>> LoadGlobalParametersWithPagingAsync<
10021001
.ConfigureAwait(false);
10031002
return new PagedResponse<T>()
10041003
{
1005-
Data = parameters.Select(p => JsonConvert.DeserializeObject<T>(p.Value)).ToList(),
1004+
Data = parameters.Select(p => Newtonsoft.Json.JsonConvert.DeserializeObject<T>(p.Value)).ToList(),
10061005
Count = count
10071006
};
10081007
}
@@ -1382,7 +1381,7 @@ public virtual async Task<SchemeDefinition<XElement>> SaveSchemeAsync(SchemeDefi
13821381
SchemeCode = scheme.SchemeCode,
13831382
RootSchemeCode = scheme.RootSchemeCode,
13841383
RootSchemeId = scheme.RootSchemeId,
1385-
AllowedActivities = JsonConvert.SerializeObject(scheme.AllowedActivities),
1384+
AllowedActivities = Newtonsoft.Json.JsonConvert.SerializeObject(scheme.AllowedActivities),
13861385
StartingTransition = scheme.StartingTransition,
13871386
IsObsolete = scheme.IsObsolete
13881387
};
@@ -1406,7 +1405,7 @@ public virtual async Task UpsertSchemeAsync(SchemeDefinition<XElement> scheme)
14061405
SchemeCode = scheme.SchemeCode,
14071406
RootSchemeCode = scheme.RootSchemeCode,
14081407
RootSchemeId = scheme.RootSchemeId,
1409-
AllowedActivities = JsonConvert.SerializeObject(scheme.AllowedActivities),
1408+
AllowedActivities = Newtonsoft.Json.JsonConvert.SerializeObject(scheme.AllowedActivities),
14101409
StartingTransition = scheme.StartingTransition,
14111410
IsObsolete = scheme.IsObsolete
14121411
};
@@ -1427,7 +1426,7 @@ public virtual async Task SaveSchemeAsync(string schemaCode, bool canBeInlined,
14271426
Scheme = scheme,
14281427
CanBeInlined = canBeInlined,
14291428
InlinedSchemes = inlinedSchemes.Any()
1430-
? JsonConvert.SerializeObject(inlinedSchemes)
1429+
? Newtonsoft.Json.JsonConvert.SerializeObject(inlinedSchemes)
14311430
: null,
14321431
Tags = TagHelper.ToTagStringForDatabase(tags)
14331432
};
@@ -1531,7 +1530,7 @@ private SchemeDefinition<XElement> ConvertToSchemeDefinition(ProcessSchemeEntity
15311530
XElement.Parse(workflowProcessScheme.Scheme),
15321531
workflowProcessScheme.IsObsolete,
15331532
false,
1534-
JsonConvert.DeserializeObject<List<string>>(workflowProcessScheme.AllowedActivities ?? "null"),
1533+
Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(workflowProcessScheme.AllowedActivities ?? "null"),
15351534
workflowProcessScheme.StartingTransition,
15361535
workflowProcessScheme.DefiningParameters);
15371536
}

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Models/WorkflowProcessAssignment.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Microsoft.Data.SqlClient;
66
using System.Linq;
77
using System.Threading.Tasks;
8-
using Newtonsoft.Json;
98
using OptimaJet.Workflow.Core.Fault;
109
using OptimaJet.Workflow.Core.Helpers;
1110
using OptimaJet.Workflow.Core.Model;
@@ -64,8 +63,8 @@ public Assignment ConvertToAssignment(ProcessAssignmentEntity assigment)
6463
DeadlineToComplete = assigment.DeadlineToComplete,
6564
Description = assigment.Description,
6665
Executor = assigment.Executor,
67-
Tags = JsonConvert.DeserializeObject<List<string>>(assigment.Tags),
68-
Observers = JsonConvert.DeserializeObject<List<string>>(assigment.Observers)
66+
Tags = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(assigment.Tags),
67+
Observers = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(assigment.Observers)
6968
};
7069
}
7170

‎Providers/OptimaJet.Workflow.MongoDB/OptimaJet.Workflow.MongoDB.deps.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MongoDB/20.0.3": {
10+
"OptimaJet.Workflow.MongoDB/20.0.4": {
1111
"dependencies": {
1212
"MongoDB.Driver": "2.30.0",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "20.0.3",
14+
"WorkflowEngine.NETCore-Core": "20.0.4",
1515
"OptimaJet.Workflow.Core": "20.0.0.0"
1616
},
1717
"runtime": {
@@ -1143,7 +1143,7 @@
11431143
}
11441144
}
11451145
},
1146-
"WorkflowEngine.NETCore-Core/20.0.3": {
1146+
"WorkflowEngine.NETCore-Core/20.0.4": {
11471147
"dependencies": {
11481148
"Microsoft.Bcl.AsyncInterfaces": "9.0.5",
11491149
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
@@ -1159,7 +1159,7 @@
11591159
},
11601160
"runtime": {
11611161
"OptimaJet.Workflow.Core.dll": {
1162-
"assemblyVersion": "20.0.3",
1162+
"assemblyVersion": "20.0.4",
11631163
"fileVersion": "20.0.0"
11641164
}
11651165
}
@@ -1175,7 +1175,7 @@
11751175
}
11761176
},
11771177
"libraries": {
1178-
"OptimaJet.Workflow.MongoDB/20.0.3": {
1178+
"OptimaJet.Workflow.MongoDB/20.0.4": {
11791179
"type": "project",
11801180
"serviceable": false,
11811181
"sha512": ""
@@ -1831,7 +1831,7 @@
18311831
"path": "zstdsharp.port/0.7.3",
18321832
"hashPath": "zstdsharp.port.0.7.3.nupkg.sha512"
18331833
},
1834-
"WorkflowEngine.NETCore-Core/20.0.3": {
1834+
"WorkflowEngine.NETCore-Core/20.0.4": {
18351835
"type": "project",
18361836
"serviceable": false,
18371837
"sha512": ""

‎Providers/OptimaJet.Workflow.MongoDB/OptimaJet.Workflow.MongoDB.dll‎

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.MongoDB/Source/MongoDBProvider.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using MongoDB.Bson;
1111
using MongoDB.Driver;
1212
using MongoDB.Driver.Linq;
13-
using Newtonsoft.Json;
1413
using OptimaJet.Workflow.Core;
1514
using OptimaJet.Workflow.Core.Entities;
1615
using OptimaJet.Workflow.Core.Fault;
@@ -1147,14 +1146,14 @@ public virtual async Task SaveGlobalParameterAsync<T>(string type, string name,
11471146
Id = Guid.NewGuid(),
11481147
Name = name,
11491148
Type = type,
1150-
Value = JsonConvert.SerializeObject(value)
1149+
Value = Newtonsoft.Json.JsonConvert.SerializeObject(value)
11511150
};
11521151

11531152
await dbcoll.InsertOneAsync(parameter).ConfigureAwait(false);
11541153
}
11551154
else
11561155
{
1157-
parameter.Value = JsonConvert.SerializeObject(value);
1156+
parameter.Value = Newtonsoft.Json.JsonConvert.SerializeObject(value);
11581157
await SaveAsync(dbcoll, parameter, doc => doc.Id == parameter.Id).ConfigureAwait(false);
11591158
}
11601159
}
@@ -1167,7 +1166,7 @@ public virtual async Task<T> LoadGlobalParameterAsync<T>(string type, string nam
11671166

11681167
if (parameter != null)
11691168
{
1170-
return JsonConvert.DeserializeObject<T>(parameter.Value);
1169+
return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(parameter.Value);
11711170
}
11721171

11731172
return default;
@@ -1188,7 +1187,7 @@ public async Task<Dictionary<string, T>> LoadGlobalParametersWithNamesAsync<T>(s
11881187
var dict = new Dictionary<string, T>();
11891188
foreach (var parameter in parameters)
11901189
{
1191-
dict[parameter.Name] = JsonConvert.DeserializeObject<T>(parameter.Value);
1190+
dict[parameter.Name] = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(parameter.Value);
11921191
}
11931192

11941193
return dict;
@@ -1207,7 +1206,7 @@ public virtual async Task<List<T>> LoadGlobalParametersAsync<T>(string type, Sor
12071206
var asyncCursor = await findAsync.ConfigureAwait(false);
12081207
var parameters = await asyncCursor.ToListAsync().ConfigureAwait(false);
12091208

1210-
return parameters.Select(gp => JsonConvert.DeserializeObject<T>(gp.Value)).ToList();
1209+
return parameters.Select(gp => Newtonsoft.Json.JsonConvert.DeserializeObject<T>(gp.Value)).ToList();
12111210
}
12121211

12131212
public virtual async Task<PagedResponse<T>> LoadGlobalParametersWithPagingAsync<T>(string type, Paging paging, string name = null,
@@ -1232,7 +1231,7 @@ public virtual async Task<PagedResponse<T>> LoadGlobalParametersWithPagingAsync<
12321231

12331232
return new PagedResponse<T>()
12341233
{
1235-
Data = parameters.Select(c => JsonConvert.DeserializeObject<T>(c.Value)).ToList(),
1234+
Data = parameters.Select(c => Newtonsoft.Json.JsonConvert.DeserializeObject<T>(c.Value)).ToList(),
12361235
Count = count
12371236
};
12381237
}

0 commit comments

Comments
 (0)