Skip to content

Commit 81d8ee6

Browse files
aelassasaelassas
committed
Fix issue #81 
1 parent e8a9a9e commit 81d8ee6

File tree

11 files changed

+789
-474
lines changed

11 files changed

+789
-474
lines changed

‎Wexflow.sln

+30
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
594594
.editorconfig = .editorconfig
595595
EndProjectSection
596596
EndProject
597+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wexflow.Server.Test", "src\net\Wexflow.Server.Test\Wexflow.Server.Test.csproj", "{D9572452-7118-4570-ACF0-7BCAF6DC92B3}"
598+
EndProject
599+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wexflow.Server.Test", "src\netcore\Wexflow.Server.Test\Wexflow.Server.Test.csproj", "{40F36818-10CA-4EEC-A38F-A8BA43332BB4}"
600+
EndProject
597601
Global
598602
GlobalSection(SolutionConfigurationPlatforms) = preSolution
599603
Debug|Any CPU = Debug|Any CPU
@@ -3796,6 +3800,30 @@ Global
37963800
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E}.Release|x64.Build.0 = Release|x64
37973801
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E}.Release|x86.ActiveCfg = Release|x86
37983802
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E}.Release|x86.Build.0 = Release|x86
3803+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3804+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
3805+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x64.ActiveCfg = Debug|Any CPU
3806+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x64.Build.0 = Debug|Any CPU
3807+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x86.ActiveCfg = Debug|Any CPU
3808+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x86.Build.0 = Debug|Any CPU
3809+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
3810+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|Any CPU.Build.0 = Release|Any CPU
3811+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x64.ActiveCfg = Release|x64
3812+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x64.Build.0 = Release|x64
3813+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x86.ActiveCfg = Release|Any CPU
3814+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x86.Build.0 = Release|Any CPU
3815+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3816+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
3817+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x64.ActiveCfg = Debug|Any CPU
3818+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x64.Build.0 = Debug|Any CPU
3819+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x86.ActiveCfg = Debug|Any CPU
3820+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x86.Build.0 = Debug|Any CPU
3821+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
3822+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|Any CPU.Build.0 = Release|Any CPU
3823+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x64.ActiveCfg = Release|x64
3824+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x64.Build.0 = Release|x64
3825+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x86.ActiveCfg = Release|Any CPU
3826+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x86.Build.0 = Release|Any CPU
37993827
EndGlobalSection
38003828
GlobalSection(SolutionProperties) = preSolution
38013829
HideSolutionNode = FALSE
@@ -4082,6 +4110,8 @@ Global
40824110
{DCA26F4E-4E47-4945-A564-8CECBC864261} = {16281492-0F39-4C01-9FAA-281650F28ADB}
40834111
{2F1EC7CE-A0EC-4F63-976C-83E75CDB725E} = {74678727-8612-4E24-B9FB-47BD5DAD5573}
40844112
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E} = {74678727-8612-4E24-B9FB-47BD5DAD5573}
4113+
{D9572452-7118-4570-ACF0-7BCAF6DC92B3} = {432B6823-FB53-4893-A5B0-FA49E9593275}
4114+
{40F36818-10CA-4EEC-A38F-A8BA43332BB4} = {49D1A283-E9F1-42BD-8A15-8BD1CCB5B775}
40854115
EndGlobalSection
40864116
GlobalSection(ExtensibilityGlobals) = postSolution
40874117
SolutionGuid = {694D69C8-AA13-4F54-BAAA-5B967F1A8F9C}

‎src/net/Wexflow.Core/Workflow.cs

+254-237
Large diffs are not rendered by default.

‎src/net/Wexflow.Server.Test/App.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<appSettings>
4+
<add key="WexflowWebServiceUri" value="http://localhost:8000/api/v1/"/>
5+
<add key="Username" value="admin"/>
6+
<add key="Password" value="wexflow2018"/>
7+
</appSettings>
8+
<startup>
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
10+
</startup>
11+
</configuration>

‎src/net/Wexflow.Server.Test/Program.cs

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Configuration;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading;
7+
using System.Threading.Tasks;
8+
using Wexflow.Core.Service.Client;
9+
10+
namespace Wexflow.Server.Test
11+
{
12+
internal class Program
13+
{
14+
static void Main(string[] args)
15+
{
16+
var client = new WexflowServiceClient(ConfigurationManager.AppSettings["WexflowWebServiceUri"]);
17+
var username = ConfigurationManager.AppSettings["Username"];
18+
var password = ConfigurationManager.AppSettings["Password"];
19+
20+
Action startWorkflow = () =>
21+
{
22+
Thread.CurrentThread.IsBackground = true;
23+
var jobId = client.StartWorkflow(41, username, password);
24+
Console.WriteLine(jobId);
25+
};
26+
27+
new Thread(() =>
28+
{
29+
startWorkflow();
30+
}).Start();
31+
32+
new Thread(() =>
33+
{
34+
startWorkflow();
35+
}).Start();
36+
37+
Console.ReadKey();
38+
}
39+
}
40+
}

‎src/net/Wexflow.Server.Test/Properties/AssemblyInfo.cs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// Les informations générales relatives à un assembly dépendent de
6+
// l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
7+
// associées à un assembly.
8+
[assembly: AssemblyTitle("Wexflow.Server.Test")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("Wexflow.Server.Test")]
13+
[assembly: AssemblyCopyright("Copyright © 2024")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly
18+
// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de
19+
// COM, affectez la valeur true à l'attribut ComVisible sur ce type.
20+
[assembly: ComVisible(false)]
21+
22+
// Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM
23+
[assembly: Guid("d9572452-7118-4570-acf0-7bcaf6dc92b3")]
24+
25+
// Les informations de version pour un assembly se composent des quatre valeurs suivantes :
26+
//
27+
// Version principale
28+
// Version secondaire
29+
// Numéro de build
30+
// Révision
31+
//
32+
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
33+
// en utilisant '*', comme indiqué ci-dessous :
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎src/net/Wexflow.Server.Test/Wexflow.Server.Test.csproj

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{D9572452-7118-4570-ACF0-7BCAF6DC92B3}</ProjectGuid>
8+
<OutputType>Exe</OutputType>
9+
<RootNamespace>Wexflow.Server.Test</RootNamespace>
10+
<AssemblyName>Wexflow.Server.Test</AssemblyName>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
12+
<FileAlignment>512</FileAlignment>
13+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<PlatformTarget>AnyCPU</PlatformTarget>
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<PlatformTarget>AnyCPU</PlatformTarget>
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<OutputPath>bin\Release\</OutputPath>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
36+
<DebugSymbols>true</DebugSymbols>
37+
<OutputPath>bin\x64\Debug\</OutputPath>
38+
<DefineConstants>DEBUG;TRACE</DefineConstants>
39+
<DebugType>full</DebugType>
40+
<PlatformTarget>x64</PlatformTarget>
41+
<LangVersion>7.3</LangVersion>
42+
<ErrorReport>prompt</ErrorReport>
43+
<Prefer32Bit>true</Prefer32Bit>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
46+
<OutputPath>bin\x64\Release\</OutputPath>
47+
<DefineConstants>TRACE</DefineConstants>
48+
<Optimize>true</Optimize>
49+
<DebugType>pdbonly</DebugType>
50+
<PlatformTarget>x64</PlatformTarget>
51+
<LangVersion>7.3</LangVersion>
52+
<ErrorReport>prompt</ErrorReport>
53+
<Prefer32Bit>true</Prefer32Bit>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
56+
<DebugSymbols>true</DebugSymbols>
57+
<OutputPath>bin\x86\Debug\</OutputPath>
58+
<DefineConstants>DEBUG;TRACE</DefineConstants>
59+
<DebugType>full</DebugType>
60+
<PlatformTarget>x86</PlatformTarget>
61+
<LangVersion>7.3</LangVersion>
62+
<ErrorReport>prompt</ErrorReport>
63+
<Prefer32Bit>true</Prefer32Bit>
64+
</PropertyGroup>
65+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
66+
<OutputPath>bin\x86\Release\</OutputPath>
67+
<DefineConstants>TRACE</DefineConstants>
68+
<Optimize>true</Optimize>
69+
<DebugType>pdbonly</DebugType>
70+
<PlatformTarget>x86</PlatformTarget>
71+
<LangVersion>7.3</LangVersion>
72+
<ErrorReport>prompt</ErrorReport>
73+
<Prefer32Bit>true</Prefer32Bit>
74+
</PropertyGroup>
75+
<ItemGroup>
76+
<Reference Include="System" />
77+
<Reference Include="System.Configuration" />
78+
<Reference Include="System.Core" />
79+
<Reference Include="System.Xml.Linq" />
80+
<Reference Include="System.Data.DataSetExtensions" />
81+
<Reference Include="Microsoft.CSharp" />
82+
<Reference Include="System.Data" />
83+
<Reference Include="System.Net.Http" />
84+
<Reference Include="System.Xml" />
85+
</ItemGroup>
86+
<ItemGroup>
87+
<Compile Include="Program.cs" />
88+
<Compile Include="Properties\AssemblyInfo.cs" />
89+
</ItemGroup>
90+
<ItemGroup>
91+
<ProjectReference Include="..\Wexflow.Core.Service.Client\Wexflow.Core.Service.Client.csproj">
92+
<Project>{3cfa5f19-d8e1-4af8-9b6a-dcb959c035db}</Project>
93+
<Name>Wexflow.Core.Service.Client</Name>
94+
</ProjectReference>
95+
</ItemGroup>
96+
<ItemGroup>
97+
<None Include="App.config" />
98+
</ItemGroup>
99+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100+
</Project>

‎src/net/Wexflow.Tasks.SevenZip/SevenZip.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System;
33
using System.IO;
44
using System.Linq;
5+
using System.Reflection;
56
using System.Threading;
67
using System.Xml.Linq;
78
using Wexflow.Core;

0 commit comments

Comments
 (0)