Skip to content

Commit 2526e4c

Browse files
optimajetoptimajet
committed
WFE 12.4.0 (autocommit)
1 parent 9afb978 commit 2526e4c

File tree

104 files changed

+411
-330
lines changed

Some content is hidden

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

104 files changed

+411
-330
lines changed

‎Designer/localization/en_default.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
"Restrict": "Restrict",
178178
"ConditionsListShouldNotBeEmpty": "Conditions list should not be empty",
179179
"AlwaysConditionShouldBeSingle": "Always condition should be single",
180+
"AlwaysConditionIsIllegal": "Always condition is illegal",
180181
"OtherwiseConditionShouldBeSingle": "Otherwise condition should be single",
181182
"ConditionalLabel": "Conditional",
182183
"AlwaysLabel": "Always",

‎Designer/templates/decisiontable.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@ <h4 class="WorkflowDesignerTitleWithCreate Underline SettingsHeader" style="marg
8383
style="width: 100%;">
8484
</el-input>
8585
</td>
86+
<td v-if="transition.condition.Type == 'Always'" colspan="2"></td>
8687
<template v-if="expertMode">
8788
<td>
8889
<el-select
8990
v-model="transition.condition.ResultOnPreExecution"
9091
:disabled="readonly"
9192
filterable
9293
placeholder=""
94+
clearable
9395
style="width: 100%;">
9496
<el-option key="True" :value="true" label="True"></el-option>
9597
<el-option key="False" :value="false" label="False"></el-option>
@@ -394,10 +396,8 @@ <h4 v-if="itemHasComment" style="padding-bottom: 1px;border-bottom: 1px solid rg
394396
if (name == 'Type') {
395397
var conditions = me.VueConfig.data.FormData.Conditions;
396398
var labels = me.VueConfig.data.labels;
397-
if (item.Type == 'Always' && conditions.filter(function (c) {
398-
return c.Type == item.Type
399-
}).length > 1) {
400-
return labels.AlwaysConditionShouldBeSingle;
399+
if (item.Type == 'Always') {
400+
return labels.AlwaysConditionIsIllegal;
401401
}
402402

403403
if (item.Type == 'Otherwise' && conditions.filter(function (c) {

‎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.

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MSSQL/12.3.0": {
10+
"OptimaJet.Workflow.MSSQL/12.4.0": {
1111
"dependencies": {
1212
"Microsoft.Data.SqlClient": "2.1.7",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "12.3.0",
15-
"OptimaJet.Workflow.Core": "12.3.0.0"
14+
"WorkflowEngine.NETCore-Core": "12.4.0",
15+
"OptimaJet.Workflow.Core": "12.4.0.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MSSQL.dll": {}
@@ -1454,7 +1454,7 @@
14541454
}
14551455
}
14561456
},
1457-
"WorkflowEngine.NETCore-Core/12.3.0": {
1457+
"WorkflowEngine.NETCore-Core/12.4.0": {
14581458
"dependencies": {
14591459
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
14601460
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1469,18 +1469,18 @@
14691469
"OptimaJet.Workflow.Core.dll": {}
14701470
}
14711471
},
1472-
"OptimaJet.Workflow.Core/12.3.0.0": {
1472+
"OptimaJet.Workflow.Core/12.4.0.0": {
14731473
"runtime": {
14741474
"OptimaJet.Workflow.Core.dll": {
1475-
"assemblyVersion": "12.3.0.0",
1476-
"fileVersion": "12.3.0.0"
1475+
"assemblyVersion": "12.4.0.0",
1476+
"fileVersion": "12.4.0.0"
14771477
}
14781478
}
14791479
}
14801480
}
14811481
},
14821482
"libraries": {
1483-
"OptimaJet.Workflow.MSSQL/12.3.0": {
1483+
"OptimaJet.Workflow.MSSQL/12.4.0": {
14841484
"type": "project",
14851485
"serviceable": false,
14861486
"sha512": ""
@@ -2276,12 +2276,12 @@
22762276
"path": "thomaslevesque.weakevent/4.1.0",
22772277
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
22782278
},
2279-
"WorkflowEngine.NETCore-Core/12.3.0": {
2279+
"WorkflowEngine.NETCore-Core/12.4.0": {
22802280
"type": "project",
22812281
"serviceable": false,
22822282
"sha512": ""
22832283
},
2284-
"OptimaJet.Workflow.Core/12.3.0.0": {
2284+
"OptimaJet.Workflow.Core/12.4.0.0": {
22852285
"type": "reference",
22862286
"serviceable": false,
22872287
"sha512": ""

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

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.DbPersistence/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
4-
Version: 12.3
4+
Version: 12.4
55
File: CreatePersistenceObjects.sql
66
77
*/

‎Providers/OptimaJet.Workflow.DbPersistence/SQL/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL
4-
Version: 12.3
4+
Version: 12.4
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.DbPersistence/Source/OptimaJet.Workflow.MSSQL.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
<RootNamespace>OptimaJet.Workflow.MSSQL</RootNamespace>
66
<AssemblyName>OptimaJet.Workflow.MSSQL</AssemblyName>
77
<SignAssembly>True</SignAssembly>
8-
<AssemblyOriginatorKeyFile>Workflow.snk</AssemblyOriginatorKeyFile>
9-
<AssemblyVersion>12.3.0</AssemblyVersion>
10-
<FileVersion>12.3.0</FileVersion>
11-
<Version>12.3.0</Version>
8+
<AssemblyVersion>12.4.0</AssemblyVersion>
9+
<FileVersion>12.4.0</FileVersion>
10+
<Version>12.4.0</Version>
1211
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1312
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
1413
<Authors>Optimajet Limited</Authors>
@@ -49,7 +48,7 @@
4948
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" />
5049
</ItemGroup>
5150
<ItemGroup>
52-
<ProjectReference Include="..\OptimaJet.Workflow.Core\OptimaJet.Workflow.Core.csproj" />
51+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="12.4.0" />
5352
</ItemGroup>
5453
<ItemGroup>
5554
<InternalsVisibleTo Include="OptimaJet.Workflow.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010065d40ec9673e8069ae5e05ccba45efe141a95751a82e90dd8c6db1a29e8c87884bb1d2c2672b7fe8ca6ce5091ddc3301f6092f7a1f36f88de1531613924a35f2c8213aa9c261f071db2f537c7109659ac6b46b5a4b28611c4de18c37f0fbcc7844a739a07386248558b54bf41bc616a988fabfdab6ea0f9a710a3fd55b3495bf" />

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
4-
Version: 12.3
4+
Version: 12.4
55
File: CreatePersistenceObjects.sql
66
77
*/

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL
4-
Version: 12.3
4+
Version: 12.4
55
File: DropPersistenceObjects.sql
66
*/
77

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MongoDB/12.3.0": {
10+
"OptimaJet.Workflow.MongoDB/12.4.0": {
1111
"dependencies": {
1212
"MongoDB.Driver.signed": "2.19.0",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "12.3.0",
15-
"OptimaJet.Workflow.Core": "12.3.0.0"
14+
"WorkflowEngine.NETCore-Core": "12.4.0",
15+
"OptimaJet.Workflow.Core": "12.4.0.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MongoDB.dll": {}
@@ -1113,7 +1113,7 @@
11131113
}
11141114
}
11151115
},
1116-
"WorkflowEngine.NETCore-Core/12.3.0": {
1116+
"WorkflowEngine.NETCore-Core/12.4.0": {
11171117
"dependencies": {
11181118
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
11191119
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1128,18 +1128,18 @@
11281128
"OptimaJet.Workflow.Core.dll": {}
11291129
}
11301130
},
1131-
"OptimaJet.Workflow.Core/12.3.0.0": {
1131+
"OptimaJet.Workflow.Core/12.4.0.0": {
11321132
"runtime": {
11331133
"OptimaJet.Workflow.Core.dll": {
1134-
"assemblyVersion": "12.3.0.0",
1135-
"fileVersion": "12.3.0.0"
1134+
"assemblyVersion": "12.4.0.0",
1135+
"fileVersion": "12.4.0.0"
11361136
}
11371137
}
11381138
}
11391139
}
11401140
},
11411141
"libraries": {
1142-
"OptimaJet.Workflow.MongoDB/12.3.0": {
1142+
"OptimaJet.Workflow.MongoDB/12.4.0": {
11431143
"type": "project",
11441144
"serviceable": false,
11451145
"sha512": ""
@@ -1781,12 +1781,12 @@
17811781
"path": "zstdsharp.port/0.6.2",
17821782
"hashPath": "zstdsharp.port.0.6.2.nupkg.sha512"
17831783
},
1784-
"WorkflowEngine.NETCore-Core/12.3.0": {
1784+
"WorkflowEngine.NETCore-Core/12.4.0": {
17851785
"type": "project",
17861786
"serviceable": false,
17871787
"sha512": ""
17881788
},
1789-
"OptimaJet.Workflow.Core/12.3.0.0": {
1789+
"OptimaJet.Workflow.Core/12.4.0.0": {
17901790
"type": "reference",
17911791
"serviceable": false,
17921792
"sha512": ""

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

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.MongoDB/Source/OptimaJet.Workflow.MongoDB.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<LangVersion>10</LangVersion>
55
<SignAssembly>true</SignAssembly>
6-
<AssemblyOriginatorKeyFile>Workflow.snk</AssemblyOriginatorKeyFile>
76
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
87
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
98
<PackageId>WorkflowEngine.NETCore-ProviderForMongoDB</PackageId>
10-
<Version>12.3.0</Version>
11-
<AssemblyVersion>12.3.0</AssemblyVersion>
12-
<FileVersion>12.3.0</FileVersion>
9+
<Version>12.4.0</Version>
10+
<AssemblyVersion>12.4.0</AssemblyVersion>
11+
<FileVersion>12.4.0</FileVersion>
1312
<Authors>Optimajet Limited</Authors>
1413
<Product>Workflow Engine</Product>
1514
<Description>
@@ -42,7 +41,7 @@
4241
<PackageReference Include="MongoDB.Driver.signed" Version="2.19.0" />
4342
</ItemGroup>
4443
<ItemGroup>
45-
<ProjectReference Include="..\OptimaJet.Workflow.Core\OptimaJet.Workflow.Core.csproj" />
44+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="12.4.0" />
4645
</ItemGroup>
4746
<ItemGroup>
4847
<InternalsVisibleTo Include="OptimaJet.Workflow.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010065d40ec9673e8069ae5e05ccba45efe141a95751a82e90dd8c6db1a29e8c87884bb1d2c2672b7fe8ca6ce5091ddc3301f6092f7a1f36f88de1531613924a35f2c8213aa9c261f071db2f537c7109659ac6b46b5a4b28611c4de18c37f0fbcc7844a739a07386248558b54bf41bc616a988fabfdab6ea0f9a710a3fd55b3495bf" />

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MySQL/12.3.0": {
10+
"OptimaJet.Workflow.MySQL/12.4.0": {
1111
"dependencies": {
1212
"MySql.Data": "8.0.30",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "12.3.0",
15-
"OptimaJet.Workflow.Core": "12.3.0.0"
14+
"WorkflowEngine.NETCore-Core": "12.4.0",
15+
"OptimaJet.Workflow.Core": "12.4.0.0"
1616
},
1717
"runtime": {
1818
"OptimaJet.Workflow.MySQL.dll": {}
@@ -1067,7 +1067,7 @@
10671067
}
10681068
}
10691069
},
1070-
"WorkflowEngine.NETCore-Core/12.3.0": {
1070+
"WorkflowEngine.NETCore-Core/12.4.0": {
10711071
"dependencies": {
10721072
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
10731073
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
@@ -1082,18 +1082,18 @@
10821082
"OptimaJet.Workflow.Core.dll": {}
10831083
}
10841084
},
1085-
"OptimaJet.Workflow.Core/12.3.0.0": {
1085+
"OptimaJet.Workflow.Core/12.4.0.0": {
10861086
"runtime": {
10871087
"OptimaJet.Workflow.Core.dll": {
1088-
"assemblyVersion": "12.3.0.0",
1089-
"fileVersion": "12.3.0.0"
1088+
"assemblyVersion": "12.4.0.0",
1089+
"fileVersion": "12.4.0.0"
10901090
}
10911091
}
10921092
}
10931093
}
10941094
},
10951095
"libraries": {
1096-
"OptimaJet.Workflow.MySQL/12.3.0": {
1096+
"OptimaJet.Workflow.MySQL/12.4.0": {
10971097
"type": "project",
10981098
"serviceable": false,
10991099
"sha512": ""
@@ -1707,12 +1707,12 @@
17071707
"path": "thomaslevesque.weakevent/4.1.0",
17081708
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
17091709
},
1710-
"WorkflowEngine.NETCore-Core/12.3.0": {
1710+
"WorkflowEngine.NETCore-Core/12.4.0": {
17111711
"type": "project",
17121712
"serviceable": false,
17131713
"sha512": ""
17141714
},
1715-
"OptimaJet.Workflow.Core/12.3.0.0": {
1715+
"OptimaJet.Workflow.Core/12.4.0.0": {
17161716
"type": "reference",
17171717
"serviceable": false,
17181718
"sha512": ""

‎Providers/OptimaJet.Workflow.MySql/OptimaJet.Workflow.MySql.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.MySql/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Company: OptimaJet
55
Project: WorkflowEngine.NET Provider for MySQL
6-
Version: 12.3
6+
Version: 12.4
77
File: CreatePersistenceObjects.sql
88
*/
99

‎Providers/OptimaJet.Workflow.MySql/SQL/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MySQL
4-
Version: 12.3
4+
Version: 12.4
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.MySql/Source/OptimaJet.Workflow.MySQL.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<LangVersion>10</LangVersion>
55
<PackageId>WorkflowEngine.NETCore-ProviderForMySQL</PackageId>
6-
<Version>12.3.0</Version>
7-
<AssemblyVersion>12.3.0</AssemblyVersion>
8-
<FileVersion>12.3.0</FileVersion>
6+
<Version>12.4.0</Version>
7+
<AssemblyVersion>12.4.0</AssemblyVersion>
8+
<FileVersion>12.4.0</FileVersion>
99
<Authors>Optimajet Limited</Authors>
1010
<Product>Workflow Engine</Product>
1111
<Description>
@@ -25,7 +25,6 @@
2525
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2626
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2727
<SignAssembly>true</SignAssembly>
28-
<AssemblyOriginatorKeyFile>Workflow.snk</AssemblyOriginatorKeyFile>
2928
<RootNamespace>OptimaJet.Workflow.MySQL</RootNamespace>
3029
<AssemblyName>OptimaJet.Workflow.MySQL</AssemblyName>
3130
</PropertyGroup>
@@ -47,7 +46,7 @@
4746
<PackageReference Include="MySql.Data" Version="8.0.30" />
4847
</ItemGroup>
4948
<ItemGroup>
50-
<ProjectReference Include="..\OptimaJet.Workflow.Core\OptimaJet.Workflow.Core.csproj" />
49+
<PackageReference Include="WorkflowEngine.NETCore-Core" Version="12.4.0" />
5150
</ItemGroup>
5251
<ItemGroup>
5352
<InternalsVisibleTo Include="OptimaJet.Workflow.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010065d40ec9673e8069ae5e05ccba45efe141a95751a82e90dd8c6db1a29e8c87884bb1d2c2672b7fe8ca6ce5091ddc3301f6092f7a1f36f88de1531613924a35f2c8213aa9c261f071db2f537c7109659ac6b46b5a4b28611c4de18c37f0fbcc7844a739a07386248558b54bf41bc616a988fabfdab6ea0f9a710a3fd55b3495bf" />

‎Providers/OptimaJet.Workflow.MySql/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Company: OptimaJet
55
Project: WorkflowEngine.NET Provider for MySQL
6-
Version: 12.3
6+
Version: 12.4
77
File: CreatePersistenceObjects.sql
88
*/
99

‎Providers/OptimaJet.Workflow.MySql/Source/Scripts/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MySQL
4-
Version: 12.3
4+
Version: 12.4
55
File: DropPersistenceObjects.sql
66
*/
77

0 commit comments

Comments
 (0)