diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index 034fb975..940cd817 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -466,7 +466,15 @@ namespace IOB_WIN curVendor = fIni.ReadString("MACHINE", "VENDOR", "ACME"); curModel = fIni.ReadString("MACHINE", "MODEL", "NONE"); // verifico tipo adapter - tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO")); + try + { + tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO")); + } + catch(Exception exc) + { + lg.Error(exc, "Eccezione in conversione tipo adapter: richiesto un tipo non codificato..."); + tipoScelto = tipoAdapter.ND; + } // carivo vettore parametri opzionai Dictionary optParRead = new Dictionary(); string[] optParRows = fIni.ReadSection("OPTPAR"); diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config index b4f7e04d..38d6e2de 100644 --- a/IOB-WIN/App.config +++ b/IOB-WIN/App.config @@ -43,8 +43,7 @@ - - + diff --git a/Jenkinsfile b/Jenkinsfile index 310aa997..a3df0cde 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=434']) { + withEnv(['NEXT_BUILD_NUMBER=435']) { // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'