From 1dad4467db95e4caea3c3e1d404bacf9eeb1ee51 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 5 Feb 2018 09:49:38 +0100 Subject: [PATCH] update versione e fine fix grafico (con correzione path typescrypt x compilazione) --- Jenkinsfile | 2 +- ScheMe-SP.sln | 2 +- ScheMe-SP/WebUserControls/mod_bottom.ascx | 14 +++++++------- ScheMe-SP/WebUserControls/mod_top.ascx | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae2e918..0d5d058 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1120']) { + withEnv(['NEXT_BUILD_NUMBER=1130']) { // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'ScheMe-SP' diff --git a/ScheMe-SP.sln b/ScheMe-SP.sln index 62a5cf5..07bf7c5 100644 --- a/ScheMe-SP.sln +++ b/ScheMe-SP.sln @@ -94,4 +94,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4EAEC3CE-9EF3-460C-91B3-EA78B3521821} EndGlobalSection -EndGlobal \ No newline at end of file +EndGlobal diff --git a/ScheMe-SP/WebUserControls/mod_bottom.ascx b/ScheMe-SP/WebUserControls/mod_bottom.ascx index 84a85b2..322697e 100644 --- a/ScheMe-SP/WebUserControls/mod_bottom.ascx +++ b/ScheMe-SP/WebUserControls/mod_bottom.ascx @@ -1,15 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_bottom.ascx.cs" Inherits="ScheMe.WebUserControls.mod_bottom" %>