From 6ef40c19fac3b4b876c671cc52adc21aecb94e4b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 8 Apr 2019 14:08:04 +0200 Subject: [PATCH] Update x saltare controllo update all'avvio (fatto SOLO SU richiesta esplicita) --- CVCncLib/testSam.dll | Bin 967680 -> 967680 bytes IOB-WIN/MainForm.cs | 14 -------------- Jenkinsfile | 6 +++--- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index e90f9b12fb579d963ee4a8cd0bbc0830d8fc94b5..d97607da8008a5dec4924ad91811dcfa91383c8e 100644 GIT binary patch delta 152 zcmV;J0B8Szh&zCYJCKM2S~;tMi-n5;g^L1(ivxv=1ci$Qg^LD-iwA{^2!)FYg^LP> ziwm`j3^Ab)PJ=Mh@F|W>rpMWViS3-Ehs>c2hs>c3x6Gjq{0;+IIjfh;unrk3kHQFU z0f~}Fs~G-bL=m=X0RR91Lpoelb7gXKTytSV;qVb z1Pf`}u!MhPWME)$wu%WYPAw{qDNf8SP0dN2&cBgQjf CEIai8 diff --git a/IOB-WIN/MainForm.cs b/IOB-WIN/MainForm.cs index 41fa481b..55e6c097 100644 --- a/IOB-WIN/MainForm.cs +++ b/IOB-WIN/MainForm.cs @@ -389,20 +389,6 @@ namespace IOB_WIN IOB2START.Add(item); } } - // se NON sono in DEBUG faccio check update... -#if !(DEBUG) - try - { - // avvio autoupdater... - AutoUpdater.RunUpdateAsAdmin = utils.CRB("AUpdAsAdm"); - AutoUpdater.Start(updateUrl); - } - catch(Exception exc) - { - lgError(string.Format("MainForm - AutoUpdater EXCEPTION in fase di chiamata URL di controllo versione:{0}{1}{2}", updateUrl, Environment.NewLine, exc)); - - } -#endif } #endregion diff --git a/Jenkinsfile b/Jenkinsfile index 92edfc18..cf1ff4a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,9 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=369']) { - // env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + withEnv(['NEXT_BUILD_NUMBER=371']) { + // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN' } }