Skip to content

Commit

Permalink
Fix issue #81
Browse files Browse the repository at this point in the history
  • Loading branch information
aelassas committed Aug 17, 2024
1 parent e8a9a9e commit 81d8ee6
Show file tree
Hide file tree
Showing 11 changed files with 789 additions and 474 deletions.
30 changes: 30 additions & 0 deletions Wexflow.sln
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wexflow.Server.Test", "src\net\Wexflow.Server.Test\Wexflow.Server.Test.csproj", "{D9572452-7118-4570-ACF0-7BCAF6DC92B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wexflow.Server.Test", "src\netcore\Wexflow.Server.Test\Wexflow.Server.Test.csproj", "{40F36818-10CA-4EEC-A38F-A8BA43332BB4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -3796,6 +3800,30 @@ Global
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E}.Release|x64.Build.0 = Release|x64
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E}.Release|x86.ActiveCfg = Release|x86
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E}.Release|x86.Build.0 = Release|x86
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x64.ActiveCfg = Debug|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x64.Build.0 = Debug|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Debug|x86.Build.0 = Debug|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|Any CPU.Build.0 = Release|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x64.ActiveCfg = Release|x64
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x64.Build.0 = Release|x64
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x86.ActiveCfg = Release|Any CPU
{D9572452-7118-4570-ACF0-7BCAF6DC92B3}.Release|x86.Build.0 = Release|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x64.ActiveCfg = Debug|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x64.Build.0 = Debug|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x86.ActiveCfg = Debug|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Debug|x86.Build.0 = Debug|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|Any CPU.Build.0 = Release|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x64.ActiveCfg = Release|x64
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x64.Build.0 = Release|x64
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x86.ActiveCfg = Release|Any CPU
{40F36818-10CA-4EEC-A38F-A8BA43332BB4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -4082,6 +4110,8 @@ Global
{DCA26F4E-4E47-4945-A564-8CECBC864261} = {16281492-0F39-4C01-9FAA-281650F28ADB}
{2F1EC7CE-A0EC-4F63-976C-83E75CDB725E} = {74678727-8612-4E24-B9FB-47BD5DAD5573}
{857EFFEA-7E97-48C9-8FA6-6FDFA46FF93E} = {74678727-8612-4E24-B9FB-47BD5DAD5573}
{D9572452-7118-4570-ACF0-7BCAF6DC92B3} = {432B6823-FB53-4893-A5B0-FA49E9593275}
{40F36818-10CA-4EEC-A38F-A8BA43332BB4} = {49D1A283-E9F1-42BD-8A15-8BD1CCB5B775}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {694D69C8-AA13-4F54-BAAA-5B967F1A8F9C}
Expand Down
491 changes: 254 additions & 237 deletions src/net/Wexflow.Core/Workflow.cs

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions src/net/Wexflow.Server.Test/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="WexflowWebServiceUri" value="http://localhost:8000/api/v1/"/>
<add key="Username" value="admin"/>
<add key="Password" value="wexflow2018"/>
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
40 changes: 40 additions & 0 deletions src/net/Wexflow.Server.Test/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Wexflow.Core.Service.Client;

namespace Wexflow.Server.Test
{
internal class Program
{
static void Main(string[] args)
{
var client = new WexflowServiceClient(ConfigurationManager.AppSettings["WexflowWebServiceUri"]);
var username = ConfigurationManager.AppSettings["Username"];
var password = ConfigurationManager.AppSettings["Password"];

Action startWorkflow = () =>
{
Thread.CurrentThread.IsBackground = true;
var jobId = client.StartWorkflow(41, username, password);
Console.WriteLine(jobId);
};

new Thread(() =>
{
startWorkflow();
}).Start();

new Thread(() =>
{
startWorkflow();
}).Start();

Console.ReadKey();
}
}
}
36 changes: 36 additions & 0 deletions src/net/Wexflow.Server.Test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// Les informations générales relatives à un assembly dépendent de
// l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
// associées à un assembly.
[assembly: AssemblyTitle("Wexflow.Server.Test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Wexflow.Server.Test")]
[assembly: AssemblyCopyright("Copyright © 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly
// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de
// COM, affectez la valeur true à l'attribut ComVisible sur ce type.
[assembly: ComVisible(false)]

// Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM
[assembly: Guid("d9572452-7118-4570-acf0-7bcaf6dc92b3")]

// Les informations de version pour un assembly se composent des quatre valeurs suivantes :
//
// Version principale
// Version secondaire
// Numéro de build
// Révision
//
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
// en utilisant '*', comme indiqué ci-dessous :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
100 changes: 100 additions & 0 deletions src/net/Wexflow.Server.Test/Wexflow.Server.Test.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D9572452-7118-4570-ACF0-7BCAF6DC92B3}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Wexflow.Server.Test</RootNamespace>
<AssemblyName>Wexflow.Server.Test</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Wexflow.Core.Service.Client\Wexflow.Core.Service.Client.csproj">
<Project>{3cfa5f19-d8e1-4af8-9b6a-dcb959c035db}</Project>
<Name>Wexflow.Core.Service.Client</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
1 change: 1 addition & 0 deletions src/net/Wexflow.Tasks.SevenZip/SevenZip.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Xml.Linq;
using Wexflow.Core;
Expand Down
Loading

0 comments on commit 81d8ee6

Please sign in to comment.