From 10c3e2c932be718b76f8dbbd9b2d920b58a2f6c8 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 10 Oct 2019 14:52:14 +0200
Subject: [PATCH] altra sintassi x beta?

---
 Jenkinsfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b55cff7..5904c32 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,6 +13,7 @@ pipeline {
         withEnv(['NEXT_BUILD_NUMBER=668']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+          env.versionNumberBeta = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'SteamWareLib'
         }
       }				
@@ -52,16 +53,16 @@ pipeline {
           // calcolo il config...
           if (env.BRANCH_NAME == "develop") {
             env.config = "Debug"
-            env.classifier = "-beta"
+            env.currVers=env.versionNumberBeta
           }
           else if (env.BRANCH_NAME == "master") {
             env.config = "Release"
-            env.classifier = ""
+            env.currVers=env.versionNumber
           }
           // procedo solo se NON si tratta di commit in ramo UnitTesting...
           if (env.BRANCH_NAME != "UnitTesting") {
             // CAMBIO numero versione + checkout NuGet in file sorgente!!!
-            bat "e:\\fart.exe SteamWareLib\\SteamWare.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
+            bat "e:\\fart.exe SteamWareLib\\SteamWare.cs 1.0.0.0 ${env.currVers} || EXIT /B 0"
             bat "e:\\nuget.exe restore ${WORKSPACE}\\SteamWare.sln"
             // elimino vecchie build...
             bat "del /f /q *.nupkg"
@@ -81,15 +82,13 @@ pipeline {
             // lancio upload con nuget!
             echo 'Start upload with nuget push'
             bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted"
-            // copio come beta...
-            bat "cp SteamWare.${env.versionNumber}.nupkg SteamWare.${env.versionNumber}${env.classifier}.nupkg"
-            bat "e:\\nuget.exe  push SteamWare.${env.versionNumber}-beta.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
+            bat "e:\\nuget.exe  push SteamWare.${env.currVers}-beta.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
           }
           else if (env.BRANCH_NAME == "master") {
             // lancio upload con nuget!
             echo 'Start upload with nuget push'
             bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted"
-            bat "e:\\nuget.exe  push SteamWare.${env.versionNumber}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
+            bat "e:\\nuget.exe  push SteamWare.${env.currVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
           }
         }
       }