diff --git a/.vs/ScheMe-SP/v15/sqlite3/storage.ide b/.vs/ScheMe-SP/v15/sqlite3/storage.ide index 8e0819b..1bde439 100644 Binary files a/.vs/ScheMe-SP/v15/sqlite3/storage.ide and b/.vs/ScheMe-SP/v15/sqlite3/storage.ide differ diff --git a/Jenkinsfile b/Jenkinsfile index c642ab9..a901619 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,9 +11,9 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=291']) { - 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}') + withEnv(['NEXT_BUILD_NUMBER=1113']) { + // 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' } } diff --git a/VersGen/VersGen.cs b/VersGen/VersGen.cs index d789763..42a3969 100644 --- a/VersGen/VersGen.cs +++ b/VersGen/VersGen.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.1.1708.1112")] -[assembly: AssemblyFileVersion("2.1.1708.1112")] +[assembly: AssemblyVersion("2.2.1708.891")] +[assembly: AssemblyFileVersion("2.2.1708.891")] [assembly: AssemblyCopyright("Steamware © 2007-2017")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/VersGen.tt b/VersGen/VersGen.tt index a104432..725141f 100644 --- a/VersGen/VersGen.tt +++ b/VersGen/VersGen.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.1.<#= this.Build #>.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.1.<#= this.Build #>.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.2.<#= this.Build #>.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.2.<#= this.Build #>.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+