diff --git a/Jenkinsfile b/Jenkinsfile index 3e45b203..8f4cb728 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=774']) { + withEnv(['NEXT_BUILD_NUMBER=775']) { // env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.3.${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-Site/MappaStatoSeq.aspx b/MP-Site/MappaStatoSeq.aspx index 9c7f5e40..9c7b32b2 100644 --- a/MP-Site/MappaStatoSeq.aspx +++ b/MP-Site/MappaStatoSeq.aspx @@ -3,7 +3,7 @@ <%@ Register Src="~/WebUserControls/mod_sequencerStati.ascx" TagPrefix="uc1" TagName="mod_sequencerStati" %> <%@ Register Src="~/WebUserControls/mod_sequencerStatiJS.ascx" TagPrefix="uc1" TagName="mod_sequencerStatiJS" %> <%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %> -<%@ Register Src="~/WebUserControls/mod_realtimeClock.ascx" TagPrefix="uc1" TagName="mod_realtimeClock" %> +<%--<%@ Register Src="~/WebUserControls/mod_realtimeClock.ascx" TagPrefix="uc1" TagName="mod_realtimeClock" %>--%> @@ -21,7 +21,7 @@ - + <%----%> <%----%> diff --git a/MP-Site/MappaStatoSeq.aspx.designer.cs b/MP-Site/MappaStatoSeq.aspx.designer.cs index 6f58210d..92ee994d 100644 --- a/MP-Site/MappaStatoSeq.aspx.designer.cs +++ b/MP-Site/MappaStatoSeq.aspx.designer.cs @@ -48,15 +48,6 @@ namespace MoonPro { /// protected global::MoonPro.WebUserControls.mod_mainMap mod_mainMap; - /// - /// Controllo mod_realtimeClock. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::MoonPro.WebUserControls.mod_realtimeClock mod_realtimeClock; - /// /// Controllo mod_sequencerStatiJS2. ///