diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 00e21cc6..97bb5dd9 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -80,6 +80,12 @@
Always
+
+ Always
+
+
+ Always
+
Always
diff --git a/Jenkinsfile b/Jenkinsfile
index 9749b672..d3fef5f6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,18 +58,29 @@ pipeline {
stage('Deploy') {
agent any
steps {
+ // in primis compilo a seconda del branch... TUTTO tranne develop...
script {
- /* DEPLOY condizionale: develop / master / demo_ovh */
- if (env.BRANCH_NAME == "develop") {
- echo 'Nothing to deploy...'
- }
- else {
- // CAMBIO numero versione in file sorgente!!!
+ if (env.BRANCH_NAME != "develop") {
+ // CAMBIO numero versione in file sorgente!!!
bat "fart.exe VersGen\\VersGen.cs 000.000 ${env.versionNumber} || EXIT /B 0"
// restore nuget packages
bat "e:\\nuget.exe restore ${WORKSPACE}\\IOB-WIN.sln"
// BUILD!
- bat "\"${tool 'MSBuild-14.0'}\" IOB-WIN/IOB-WIN.csproj /T:Package /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/${env.versionNumber}/MAPO-IOB-WIN.zip /p:PackageAsSingleFile=True /m"
+ bat "\"${tool 'MSBuild-14.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
+ }
+ else {
+ echo 'Nothing to Build...'
+ }
+ }
+ // ora mi occupo delle operazioni di compressione e copia...
+ script {
+ /* DEPLOY condizionale: develop / master / demo_ovh */
+ if (env.BRANCH_NAME != "develop") {
+ // // elimino files di conf personalizzata per ogni install...
+ // bat "RD /S /Q IOB-WIN\\bin\\Release\\DATA"
+
+ // Compressione in .zip dell'installer...
+ // powershell -ExecutionPolicy Unrestricted -File file.ps1
// COPIO in area IIS x autoupdate... sovrascrivendo zip
@@ -88,6 +99,9 @@ pipeline {
//bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\MP\\ReleaseClienti\\Donati\" \"E:\\Staging\\byProd\\MP\\Donati\\MP-LAND\" "
// dropbox configName: 'Donati', remoteDirectory: 'installers/MP-LAND', removePrefix: 'ReleaseClienti/Donati', sourceFiles: 'ReleaseClienti/Donati/**'
}
+ else {
+ echo 'Nothing to Copy...'
+ }
}
}
}