diff --git a/Jenkinsfile b/Jenkinsfile index 1008f769..ea79db16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,8 +15,8 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { withEnv(['NEXT_BUILD_NUMBER=633']) { - // 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.versionNumber = VersionNumber(versionNumberString : '4.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '4.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' } } @@ -30,7 +30,7 @@ pipeline { } } /* CAMBIO numero versione in file sorgente!!! */ - bat "fart.exe VersGen\\MoonPro.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" } } stage('Build') { @@ -40,7 +40,7 @@ pipeline { /* compilo installers in base al BRANCH del cliente... */ if (env.BRANCH_NAME == "develop") { /* CAMBIO numero versione in file sorgente!!! */ - bat "fart.exe VersGen\\MoonPro.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" parallel ( LANDING: { sleep 5 @@ -86,7 +86,7 @@ pipeline { /* DEPLOY condizionale: develop / master / demo_ovh */ if (env.BRANCH_NAME == "master") { /* CAMBIO numero versione in file sorgente!!! */ - bat "fart.exe VersGen\\MoonPro.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" parallel ( LANDING: { sleep 0 @@ -129,7 +129,7 @@ pipeline { } if (env.BRANCH_NAME == "OVH-DEMO") { /* CAMBIO numero versione in file sorgente!!! */ - bat "fart.exe VersGen\\MoonPro.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" parallel ( // LANDING: { // sleep 5 @@ -182,7 +182,7 @@ pipeline { /* compilo installers in base al BRANCH del cliente... */ if (env.BRANCH_NAME == "Donati") { /* CAMBIO numero versione in file sorgente!!! */ - bat "fart.exe VersGen\\MoonPro.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" parallel ( LANDING: { sleep 5 @@ -230,7 +230,7 @@ pipeline { // in primis compilo a seconda del branch... TUTTO tranne develop... script { // CAMBIO numero versione in file sorgente!!! - bat "fart.exe VersGen\\MoonPro.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" // // restore nuget packages // bat "e:\\nuget.exe restore ${WORKSPACE}\\MAPO.sln" } diff --git a/VersGen/MoonPro.cs b/VersGen/MoonPro.cs index 32a6a08a..e2a902b6 100644 --- a/VersGen/MoonPro.cs +++ b/VersGen/MoonPro.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("4.7.000.000")] -[assembly: AssemblyFileVersion("4.7.000.000")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyCopyright("Steamware © 2006-2017")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/MoonPro.tt b/VersGen/MoonPro.tt index 96f1f39b..bf153637 100644 --- a/VersGen/MoonPro.tt +++ b/VersGen/MoonPro.tt @@ -6,11 +6,7 @@ using System.Reflection; -[assembly: AssemblyVersion("4.7.000.000")] -[assembly: AssemblyFileVersion("4.7.000.000")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] -<#+ -// Major.Minor.Build.RevisionNumber - int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2007,1,1)).TotalDays/7; -#> \ No newline at end of file