diff --git a/Jenkinsfile b/Jenkinsfile
index 2825f83..c63aa56 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=668']) {
+ withEnv(['NEXT_BUILD_NUMBER=669']) {
// 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}')
@@ -53,11 +53,11 @@ pipeline {
// calcolo il config...
if (env.BRANCH_NAME == "develop") {
env.config = "Debug"
- env.packVers=env.versionNumberBeta
+ env.packVers = env.versionNumberBeta
}
else if (env.BRANCH_NAME == "master") {
env.config = "Release"
- env.packVers=env.versionNumber
+ env.packVers = env.versionNumber
}
// procedo solo se NON si tratta di commit in ramo UnitTesting...
if (env.BRANCH_NAME != "UnitTesting") {
@@ -69,8 +69,8 @@ pipeline {
bat "del /f /q *.nupkg"
// BUILD!
bat "\"${tool 'MSBuild-16.0'}\" SteamWareLib\\SteamWare.csproj -target:Build /p:Configuration=${env.config} /p:Platform=\"Any CPU\" /p:OutputPath=bin/${env.config} /m"
- // creo package NuGet...
- bat "e:\\nuget.exe pack ${WORKSPACE}\\SteamWareLib\\SteamWare.csproj -properties Configuration=${env.config}"
+ // creo package NuGet... con version in modo da fare ANCHE le beta
+ bat "e:\\nuget.exe pack ${WORKSPACE}\\SteamWareLib\\SteamWare.csproj -properties Configuration=${env.config} -Version ${env.packVers}"
}
else
{
@@ -79,20 +79,12 @@ pipeline {
}
// ora mi occupo delle operazioni di invio a NEXUS...
script {
- if (env.BRANCH_NAME == "develop") {
- // // sposto file...
- // bat "move SteamWare.${env.versionNumber}.nupkg SteamWare.${env.versionNumberBeta}.nupkg"
+ if (env.BRANCH_NAME != "UnitTesting") {
// 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.versionNumber}.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.currVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
+ bat "e:\\nuget.exe push SteamWare.${env.packVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
}
}
}
diff --git a/SteamWareLib/SteamWare.cs b/SteamWareLib/SteamWare.cs
index 9156449..342accd 100644
--- a/SteamWareLib/SteamWare.cs
+++ b/SteamWareLib/SteamWare.cs
@@ -7,5 +7,5 @@ using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyCopyright("Steamware © 2006-2018")]
+[assembly: AssemblyCopyright("Steamware © 2006-2019")]
[assembly: AssemblyCompany("Steamware")]
\ No newline at end of file
diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj
index 9571bd0..b7e12ed 100644
--- a/SteamWareLib/SteamWare.csproj
+++ b/SteamWareLib/SteamWare.csproj
@@ -32,7 +32,6 @@
1.0.0.%2a
false
true
- 1.0.0.0