diff --git a/Jenkinsfile b/Jenkinsfile index f6c77b8..e3df6be 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=243']) { + withEnv(['NEXT_BUILD_NUMBER=257']) { // env.versionNumber = VersionNumber(versionNumberString : '1.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC' diff --git a/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx b/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx index 53560b5..a48cb64 100644 --- a/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx +++ b/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx @@ -2,8 +2,6 @@ CodeBehind="mod_dettaglioGiornaliero.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="~/WebUserControls/mod_noteItem.ascx" TagPrefix="uc1" TagName="mod_noteItem" %> - -