diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 1f31b23a..5de317a9 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -1134,7 +1134,7 @@ namespace IOB_WIN // salvo! lastPrgName = currPrgName; displayOtherData(currPrgName); - lg.Info(string.Format("PrgName: {0}", currPrgName)); + lg.Info(string.Format("{0}", currPrgName)); // !!!FARE!!! deve inviare!!! } } @@ -1158,7 +1158,7 @@ namespace IOB_WIN // salvo! lastSysInfo = currSysInfo; displayOtherData(currSysInfo); - lg.Info(string.Format("SysInfo: {0}", currSysInfo)); + lg.Info(string.Format("{0}", currSysInfo)); // !!!FARE!!! deve inviare!!! } } diff --git a/Jenkinsfile b/Jenkinsfile index e4736359..0dcecf9c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,9 +11,9 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=67']) { - env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - // env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + withEnv(['NEXT_BUILD_NUMBER=83']) { + // env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN' } }