diff --git a/Jenkinsfile b/Jenkinsfile index 0faa64a2..87fad777 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,11 +6,11 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=2646']) { + withEnv(['NEXT_BUILD_NUMBER=2647']) { // impiego numero di build del SINGOLO RAMO - // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + // env.versionNumber = VersionNumber(versionNumberString : '3.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) // forzo numero di build x tutti rami uguali - 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 : '3.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'GMW' } } @@ -29,7 +29,7 @@ pipeline { agent any steps { // CAMBIO numero versione in file sorgente + recupero packages - bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\GMW.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\GMW.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW.sln" // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Data.sln" // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Terminus.sln" @@ -76,7 +76,7 @@ pipeline { agent any steps { // CAMBIO numero versione in file sorgente + recupero packages - bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\GMW.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\GMW.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW.sln" // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Data.sln" // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Terminus.sln" diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index d0598275..3102349c 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("3.8.000.000")] -[assembly: AssemblyFileVersion("3.8.000.000")] -[assembly: AssemblyCopyright("Steamware © 2007-2017")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyCopyright("Steamware © 2007-2018")] [assembly: AssemblyCompany("Steamware")] \ No newline at end of file diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index 08e12186..2b371bb7 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,7 +6,7 @@ using System.Reflection; -[assembly: AssemblyVersion("3.8.000.000")] -[assembly: AssemblyFileVersion("3.8.000.000")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] \ No newline at end of file