diff --git a/CVCncLib/testSam.XmlSerializers.dll b/CVCncLib/testSam.XmlSerializers.dll index 6c2d02c8..eb63a095 100644 Binary files a/CVCncLib/testSam.XmlSerializers.dll and b/CVCncLib/testSam.XmlSerializers.dll differ diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index f38baf24..2da48d19 100644 Binary files a/CVCncLib/testSam.dll and b/CVCncLib/testSam.dll differ diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config index 09e8d6ea..ae4bebf0 100644 --- a/IOB-MAN/App.config +++ b/IOB-MAN/App.config @@ -7,8 +7,8 @@ - - + + diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index ee8a2c96..70712375 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -60,6 +60,10 @@ namespace IOB_MAN /// protected string TargetExe = ""; /// + /// Name dell'exe da chiamare + /// + protected string TargetName = ""; + /// /// Contatore autockeck nativo /// protected int tOutAutocheck = 100; @@ -101,6 +105,7 @@ namespace IOB_MAN { ArgsList.Clear(); TargetExe = utils.CRS("targetExe"); + TargetName = utils.CRS("appNameExt"); if (string.IsNullOrEmpty(TargetExe)) { TargetExe = string.Format(@"{0}\Resources\Test.bat", Application.StartupPath); @@ -435,7 +440,9 @@ namespace IOB_MAN numProcRunning = numProcAvviati; // leggo 1 sola volta TUTTO elenco processi... - Process[] processList = Process.GetProcesses(); + Process[] processList = Process.GetProcessesByName(TargetName); + // 2020.02.01 passato chiamata specifica + //Process[] processList = Process.GetProcesses(); foreach (iobAdapt item in ElencoIOB.List) { diff --git a/Jenkinsfile b/Jenkinsfile index 60102065..18b6f071 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=652']) { + withEnv(['NEXT_BUILD_NUMBER=653']) { // 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'