diff --git a/Jenkinsfile b/Jenkinsfile index eb00c738..65b51f52 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=621']) { + withEnv(['NEXT_BUILD_NUMBER=623']) { // env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN' @@ -47,7 +47,7 @@ pipeline { // checkout NuGet in file sorgente!!! fixNuget("${WORKSPACE}\\IOB-WIN.sln") // BUILD! - bat "\"${tool 'MSBuild-14.0'}\" IOB-MAN/IOB-MAN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /m" + bat "\"${tool 'MSBuild-16.0'}\" IOB-MAN/IOB-MAN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /m" } else if (env.BRANCH_NAME == "develop") { // CAMBIO numero versione in file sorgente!!! @@ -79,7 +79,7 @@ pipeline { // checkout NuGet in file sorgente!!! fixNuget("${WORKSPACE}\\IOB-WIN.sln") // BUILD! - bat "\"${tool 'MSBuild-14.0'}\" IOB-MAN/IOB-MAN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /m" + bat "\"${tool 'MSBuild-16.0'}\" IOB-MAN/IOB-MAN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /m" } // procedo solo se NON si tratta di commit in ramo DOCUMentazione... else if (env.BRANCH_NAME != "docum") {