From 54028302181e49e415a48a9812fa0c0bf169a47e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 26 Apr 2019 19:04:16 +0200 Subject: [PATCH] Fix comportamento reset --- IOB-WIN/IobGeneric.cs | 9 ++++++--- Jenkinsfile | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 9240c8cd..05b3a0d1 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -2209,9 +2209,12 @@ namespace IOB_WIN { answ = item > answ ? item : answ; } - // ora resetto... - TSVC_Data[VCName].dataArray = new List(); - TSVC_Data[VCName].DTStart = DateTime.Now; + // ora resetto... SE richiesto.. + if (doReset) + { + TSVC_Data[VCName].dataArray = new List(); + TSVC_Data[VCName].DTStart = DateTime.Now; + } } return answ; } diff --git a/Jenkinsfile b/Jenkinsfile index 69f382ba..ec60663b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=398']) { + withEnv(['NEXT_BUILD_NUMBER=399']) { // 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'