diff --git a/Jenkinsfile b/Jenkinsfile index b6c78f38..874674a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1151']) { + withEnv(['NEXT_BUILD_NUMBER=1155']) { // 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-Site/Web.config b/MP-Site/Web.config index 9a2a0c13..91ec290a 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -28,7 +28,7 @@ - + @@ -74,218 +74,218 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP-Site/WebUserControls/mod_sequencerStati.ascx b/MP-Site/WebUserControls/mod_sequencerStati.ascx index 3218a67a..ffd97fc6 100644 --- a/MP-Site/WebUserControls/mod_sequencerStati.ascx +++ b/MP-Site/WebUserControls/mod_sequencerStati.ascx @@ -1,8 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="MP_SITE.WebUserControls.mod_sequencerStati" CodeBehind="mod_sequencerStati.ascx.cs" %> <%@ Register Assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Namespace="System.Web.UI.DataVisualization.Charting" TagPrefix="asp" %> - + diff --git a/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx b/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx index 065ebaf2..6272d4f0 100644 --- a/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx +++ b/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx @@ -4,7 +4,7 @@ Namespace="System.Web.UI.DataVisualization.Charting" TagPrefix="asp" %> diff --git a/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.designer.cs b/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.designer.cs index 12855c6d..e4b4f7fb 100644 --- a/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.designer.cs @@ -1,24 +1,23 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MP_SITE.WebUserControls -{ - - +namespace MP_SITE.WebUserControls { + + public partial class mod_sequencerTempiCiclo { /// - /// Chart1 control. + /// Controllo Chart1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.DataVisualization.Charting.Chart Chart1; }