diff --git a/Jenkinsfile b/Jenkinsfile index 02e324c..2606dec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=282']) { + withEnv(['NEXT_BUILD_NUMBER=283']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/site/KitRequestImporter.aspx b/NKC_WF/site/KitRequestImporter.aspx index 7e0d566..d891812 100644 --- a/NKC_WF/site/KitRequestImporter.aspx +++ b/NKC_WF/site/KitRequestImporter.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="KitRequestImporter.aspx.cs" Inherits="NKC_WF.KitRequestImporter" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="KitRequestImporter.aspx.cs" Inherits="NKC_WF.KitRequestImporter" %> <%@ Register Src="~/WebUserControls/cmp_fileUpload.ascx" TagPrefix="uc1" TagName="cmp_fileUpload" %> <%@ Register Src="~/WebUserControls/cmp_kitList.ascx" TagPrefix="uc1" TagName="cmp_kitList" %> <%@ Register Src="~/WebUserControls/cmp_kitImpCheck.ascx" TagPrefix="uc1" TagName="cmp_kitImpCheck" %>