diff --git a/Jenkinsfile b/Jenkinsfile index 862dad39..d0203079 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=680']) { + withEnv(['NEXT_BUILD_NUMBER=681']) { // env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '4.9.${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-Tablet/WebUserControls/mod_footer.ascx b/MP-Tablet/WebUserControls/mod_footer.ascx index 25d0b72d..7187ba4c 100644 --- a/MP-Tablet/WebUserControls/mod_footer.ascx +++ b/MP-Tablet/WebUserControls/mod_footer.ascx @@ -1,14 +1,12 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %> diff --git a/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs index 19580bf9..62ae223e 100644 --- a/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs @@ -11,14 +11,5 @@ namespace MoonProTablet.WebUserControls { public partial class mod_footer { - - /// - /// Controllo lblDT. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblDT; } } diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index d4526f35..f978f3e9 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -1,13 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %> -