From f8bc3b2b59f88fa545dc4bdea816f66f643e9937 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 25 Mar 2019 16:25:49 +0100 Subject: [PATCH] Update x visualizz scarti + grande e reset --- Jenkinsfile | 2 +- MP-ADM/Web.config | 445 +++++++++--------- MP-TAB/WebUserControls/mod_regScarti.ascx | 21 +- MP-TAB/WebUserControls/mod_regScarti.ascx.cs | 5 + .../mod_regScarti.ascx.designer.cs | 9 + 5 files changed, 253 insertions(+), 229 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f972e72..fa3b99ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1173']) { + withEnv(['NEXT_BUILD_NUMBER=1174']) { // env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-ADM/Web.config b/MP-ADM/Web.config index d5d68e79..93f0da59 100644 --- a/MP-ADM/Web.config +++ b/MP-ADM/Web.config @@ -25,19 +25,18 @@ - - - - - - + + + + + + - - - - - + + + +