From a8ff23792126e1a757165e9cfec73cf5de956c29 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 10 Oct 2019 15:07:41 +0200
Subject: [PATCH] provo a specificare packageversion...

---
 Jenkinsfile                   | 10 +++++++---
 SteamWareLib/SteamWare.csproj |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 85f0bbd..2825f83 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,14 +53,17 @@ pipeline {
           // calcolo il config...
           if (env.BRANCH_NAME == "develop") {
             env.config = "Debug"
+            env.packVers=env.versionNumberBeta
           }
           else if (env.BRANCH_NAME == "master") {
             env.config = "Release"
+            env.packVers=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.csproj 1.0.0.0 ${env.packVers} || EXIT /B 0"
             bat "e:\\nuget.exe restore ${WORKSPACE}\\SteamWare.sln"
             // elimino vecchie build...
             bat "del /f /q *.nupkg"
@@ -77,12 +80,13 @@ pipeline {
         // ora mi occupo delle operazioni di invio a NEXUS...
         script {
           if (env.BRANCH_NAME == "develop") {
-            // sposto file...
-            bat "cp SteamWare.${env.versionNumber}.nupkg SteamWare.${env.versionNumberBeta}.nupkg"
+            // // sposto file...
+            // bat "move SteamWare.${env.versionNumber}.nupkg SteamWare.${env.versionNumberBeta}.nupkg"
             // 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.versionNumberBeta}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
+            // bat "e:\\nuget.exe  push SteamWare.${env.versionNumberBeta}.nupkg -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"
           }
           else if (env.BRANCH_NAME == "master") {
             // lancio upload con nuget!
diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj
index b7e12ed..9571bd0 100644
--- a/SteamWareLib/SteamWare.csproj
+++ b/SteamWareLib/SteamWare.csproj
@@ -32,6 +32,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <PackageVersion>1.0.0.0</PackageVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">