diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config index 741edc91..7d715e14 100644 --- a/IOB-MAN/App.config +++ b/IOB-MAN/App.config @@ -6,9 +6,9 @@ - - - + + + @@ -60,8 +60,7 @@ - + \ No newline at end of file diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj index 27c23c0f..2d4e7aa6 100644 --- a/IOB-MAN/IOB-MAN.csproj +++ b/IOB-MAN/IOB-MAN.csproj @@ -1,5 +1,10 @@  + + + + + Debug @@ -206,7 +211,17 @@ - + + + + + + + + + + + @@ -214,6 +229,11 @@ + + + + + diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index d3419aae..a9257b22 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -8,6 +8,7 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading; +using System.Threading.Tasks; using System.Windows.Forms; namespace IOB_MAN @@ -351,7 +352,7 @@ namespace IOB_MAN private void MainTimer_Tick(object sender, EventArgs e) { updateProgBar(); - chekProcessStatus(); + chekProcessStatusAsync(); checkWatchdog(); } /// @@ -413,13 +414,13 @@ namespace IOB_MAN /// /// Controllo periodico dei processi attivi /// - private void chekProcessStatus() + private async Task chekProcessStatusAsync() { chekMult--; if (chekMult < 0) { chekMult = utils.CRI("chekMult"); - checkRunningchild(); + await Task.Run(() => checkRunningchild()); } } diff --git a/IOB-MAN/packages.config b/IOB-MAN/packages.config index 226f091b..732315f3 100644 --- a/IOB-MAN/packages.config +++ b/IOB-MAN/packages.config @@ -5,7 +5,12 @@ + + + + + @@ -22,7 +27,7 @@ - + diff --git a/Jenkinsfile b/Jenkinsfile index 364352c0..9ef12a56 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=657']) { + withEnv(['NEXT_BUILD_NUMBER=658']) { // env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'