diff --git a/Jenkinsfile b/Jenkinsfile index c24eaea4..b99355fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=947']) { + withEnv(['NEXT_BUILD_NUMBER=960']) { // env.versionNumber = VersionNumber(versionNumberString : '6.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.1.${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/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 474b0f45..86be0039 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -20,8 +20,8 @@ true - - + disabled + enabled diff --git a/MP-ADM/Site.Master b/MP-ADM/Site.Master deleted file mode 100644 index d4b9f452..00000000 --- a/MP-ADM/Site.Master +++ /dev/null @@ -1,74 +0,0 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="MP_ADM.SiteMaster" %> - - - - - - - - - <%: Page.Title %> - Applicazione ASP.NET - - - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - - - - - - - -
- - - <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%> - <%--Framework Scripts--%> - - - - - - - - - - - - - <%--Site Scripts--%> - - - -
-
-
- - Nome applicazione -
-
- -
-
-
-
- - -
-
-

© <%: DateTime.Now.Year %> - Applicazione ASP.NET

-
-
- -
- - diff --git a/MP-ADM/Site.Master.cs b/MP-ADM/Site.Master.cs deleted file mode 100644 index 5f313026..00000000 --- a/MP-ADM/Site.Master.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace MP_ADM -{ - public partial class SiteMaster : MasterPage - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/MP-ADM/Site.Master.designer.cs b/MP-ADM/Site.Master.designer.cs deleted file mode 100644 index 74b53215..00000000 --- a/MP-ADM/Site.Master.designer.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. -// -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// -//------------------------------------------------------------------------------ - -namespace MP_ADM { - - - public partial class SiteMaster { - - /// - /// Controllo MainContent. - /// - /// - /// 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.ContentPlaceHolder MainContent; - } -} diff --git a/MP-ADM/WebMasterPages/MoonPro.master b/MP-ADM/WebMasterPages/MoonPro.master index 9ab974d9..4f330eb3 100644 --- a/MP-ADM/WebMasterPages/MoonPro.master +++ b/MP-ADM/WebMasterPages/MoonPro.master @@ -23,13 +23,13 @@ <%-- + --%> <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> - --%>
diff --git a/MP-ADM/WebMasterPages/MoonPro.master.designer.cs b/MP-ADM/WebMasterPages/MoonPro.master.designer.cs index 6855eb83..794bc26c 100644 --- a/MP-ADM/WebMasterPages/MoonPro.master.designer.cs +++ b/MP-ADM/WebMasterPages/MoonPro.master.designer.cs @@ -11,6 +11,33 @@ public partial class MoonPro { + /// + /// Controllo PlaceHolder1. + /// + /// + /// 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.PlaceHolder PlaceHolder1; + + /// + /// Controllo BundleReference2. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// Controllo BundleReference1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + /// /// Controllo form1. ///