Update gestione branch del sw da utilizzare (si usa conf da IOB.ini)

IOB-WIN/DATA/CONF/IOB.ini

@@ -43,4 +43,7 @@ PZCOUNT_MODE=BIT
 PZ_CAD_MADDR=1602
 PZ_REQ_MADDR=1603
 PZ_DONE_MADDR=1604
-PZ_GTOT_MADDR=1605
+PZ_GTOT_MADDR=1605
+
+[BRANCH]
+NAME=develop

IOB-WIN/MainForm.cs

@@ -72,13 +72,18 @@ namespace IOB_WIN
     /// </summary>
     public tipoAdapter tipoScelto = tipoAdapter.DEMO;
     /// <summary>
+    /// Ramo applicazione (x update)
+    /// </summary>
+    protected string branchName = "";
+    /// <summary>
     /// URL stringa di UPDATE...
     /// </summary>
     protected string updateUrl
     {
       get
       {
-        return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/IOB-WIN/{0}/manifest.xml", utils.CRS("appVers"));
+        string branchName = utils.CRS("appVers");
+        return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/IOB-WIN/{0}/manifest.xml", branchName);
       }
     }
 
@@ -144,12 +149,6 @@ namespace IOB_WIN
     /// </summary>
     public MainForm()
     {
-      // se NON sono in DEBUG faccio check update...
-#if !(DEBUG)
-      // avvio autoupdater...
-      AutoUpdater.Start(updateUrl);
-#endif
-
       // continuo avvio...
       InitializeComponent();
       lblStatus.Text = "Loading";
@@ -568,6 +567,14 @@ namespace IOB_WIN
       displayTaskAndLog(string.Format("Loading iniConfFile: {0}", iniConfFile));
 
       IniFile fIni = new IniFile(iniConfFile);
+      // salvo branchName...
+      branchName = fIni.ReadString("BRANCH", "NAME", "develop");
+      // se NON sono in DEBUG faccio check update...
+#if !(DEBUG)
+      // avvio autoupdater...
+      AutoUpdater.Start(updateUrl);
+#endif
+
       // verifico tipo adapter
       tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO"));
       // carivo vettore parametri opzionai

Jenkinsfile

@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=189']) {
+        withEnv(['NEXT_BUILD_NUMBER=190']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.16.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.16.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'