diff --git a/Jenkinsfile b/Jenkinsfile index 47b632f0..18690f6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { // CAMBIO numero versione in file sorgente!!! bat "e:\\fart.exe VersGen\\VersGen.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" // checkout NuGet in file sorgente!!! - // fixNuget("${WORKSPACE}\\IOB-WIN.sln") + fixNuget("${WORKSPACE}\\IOB-WIN.sln") fixNuget("${WORKSPACE}\\IOB-WIN-NEXT.sln") } script { @@ -41,7 +41,7 @@ pipeline { parallel ( IOB_WIN: { // BUILD! - // bat "\"${tool 'MSBuild-16.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /verbosity:minimal /m" + bat "\"${tool 'MSBuild-16.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /verbosity:minimal /m" bat "\"${tool 'MSBuild-16.0'}\" IOB-WIN-NEXT/IOB-WIN-NEXT.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /verbosity:minimal /m" }, IOB_MAN: { @@ -70,7 +70,7 @@ pipeline { // CAMBIO numero versione in file sorgente!!! bat "e:\\fart.exe VersGen\\VersGen.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" // checkout NuGet in file sorgente!!! - // fixNuget("${WORKSPACE}\\IOB-WIN.sln") + fixNuget("${WORKSPACE}\\IOB-WIN.sln") fixNuget("${WORKSPACE}\\IOB-WIN-NEXT.sln") } // a seconda del branch decido cosa e come compilare e caricare... @@ -82,7 +82,7 @@ pipeline { // procedo solo se NON si tratta di commit in ramo DOCUMentazione... else if (env.BRANCH_NAME == "develop" || env.BRANCH_NAME.contains("master") ) { // BUILD! - // bat "\"${tool 'MSBuild-16.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /verbosity:minimal /m" + bat "\"${tool 'MSBuild-16.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /verbosity:minimal /m" bat "\"${tool 'MSBuild-16.0'}\" IOB-WIN-NEXT/IOB-WIN-NEXT.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /verbosity:minimal /m" } else @@ -119,13 +119,13 @@ pipeline { } // procedo solo se NON si tratta di commit in ramo DOCUMentazione... else if (env.BRANCH_NAME == "develop" || env.BRANCH_NAME.contains("master") || env.BRANCH_NAME.contains("feature") ) { - // fixResources("IOB-WIN") + fixResources("IOB-WIN") fixResources("IOB-WIN-NEXT") // elimino vecchio zip... bat "RD /S /Q Releases\\${env.BRANCH_NAME}\\ || EXIT /B 0" - // compressZip("IOB-WIN") + compressZip("IOB-WIN") compressZip("IOB-WIN-NEXT") // fix classificazione x develop/master... @@ -150,11 +150,11 @@ pipeline { repository: 'utility', credentialsId: 'bc9d8e92-4302-3266-817f-7b58501d12d5', artifacts: [ - // [artifactId: 'IOB-WIN', - // classifier: "", - // // classifier: "${env.classifier}", - // file: "Releases\\${env.BRANCH_NAME}\\MAPO-IOB-WIN.zip", - // type: 'zip'], + [artifactId: 'IOB-WIN', + classifier: "", + // classifier: "${env.classifier}", + file: "Releases\\${env.BRANCH_NAME}\\MAPO-IOB-WIN.zip", + type: 'zip'], [artifactId: 'IOB-WIN-NEXT', classifier: "", // classifier: "${env.classifier}",