Merge branch 'release/fixConcurrent_resetAppConf'

Inserito download da nexus authenticated

Jenkinsfile

@@ -7,7 +7,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=758']) {
+        withEnv(['NEXT_BUILD_NUMBER=759']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')

SteamWareLib/UpdateMan.cs

@@ -118,7 +118,7 @@ namespace SteamWare
                 if (updateData.IsUpdateAvailable)
                 {
                     string DownloadURL = updateData.DownloadURL;
-                    localFile = string.Format(@"{0}\{2}_Build_{1}.zip", localRepo, updateData.CurrentVersion, packName);
+                    localFile = string.Format(@"{0}\{1}_Build_{2}.zip", localRepo, packName, updateData.CurrentVersion);
                     localLast = string.Format(@"{0}\{1}.zip", localRepo, packName);
                     // scarica file e salva in directory locale...
                     var client = new WebClient();
@@ -185,31 +185,38 @@ namespace SteamWare
                     // lettura
                     var data = http.GetAsync(remoteUrl).Result;
                     var myReader = data.Content.ReadAsStreamAsync();
-                    recXml.Load(myReader.Result);
-
-                    XmlNodeList recData = recXml.SelectNodes("item");
-                    if (recData != null)
+                    if (data.StatusCode != HttpStatusCode.OK)
                     {
-                        foreach (XmlNode item in recData)
+                        logger.lg.scriviLog($"Errore in chiamata getUpdateInfo per URL {remoteUrl}: status code: {data.StatusCode}", tipoLog.INFO);
+                    }
+                    else
+                    {
+                        recXml.Load(myReader.Result);
+
+                        XmlNodeList recData = recXml.SelectNodes("item");
+                        if (recData != null)
                         {
-                            XmlNode appCastVersion = item.SelectSingleNode("version");
-                            Version.TryParse(appCastVersion?.InnerText, out CurrentVersion);
-                            args.CurrentVersion = CurrentVersion;
-                            XmlNode appCastChangeLog = item.SelectSingleNode("changelog");
-                            args.ChangelogURL = appCastChangeLog?.InnerText;
-                            XmlNode appCastUrl = item.SelectSingleNode("url");
-                            args.DownloadURL = appCastUrl?.InnerText;
-                            XmlNode mandatory = item.SelectSingleNode("mandatory");
-                            Boolean.TryParse(mandatory?.InnerText, out Mandatory);
-                            args.Mandatory = Mandatory;
-                            args.IsUpdateAvailable = true;
+                            foreach (XmlNode item in recData)
+                            {
+                                XmlNode appCastVersion = item.SelectSingleNode("version");
+                                Version.TryParse(appCastVersion?.InnerText, out CurrentVersion);
+                                args.CurrentVersion = CurrentVersion;
+                                XmlNode appCastChangeLog = item.SelectSingleNode("changelog");
+                                args.ChangelogURL = appCastChangeLog?.InnerText;
+                                XmlNode appCastUrl = item.SelectSingleNode("url");
+                                args.DownloadURL = appCastUrl?.InnerText;
+                                XmlNode mandatory = item.SelectSingleNode("mandatory");
+                                Boolean.TryParse(mandatory?.InnerText, out Mandatory);
+                                args.Mandatory = Mandatory;
+                                args.IsUpdateAvailable = true;
+                            }
                         }
                     }
                 }
             }
             catch (Exception exc)
             {
-                Console.WriteLine($"Eccezione in getUpdateInfo:{Environment.NewLine}{exc}");
+                logger.lg.scriviLog($"Eccezione in getUpdateInfo:{Environment.NewLine}{exc}");
                 // metto versione = 0 + errore...
                 args.IsUpdateAvailable = false;
                 args.CurrentVersion = new Version("0.0.0.0");

SteamWareLib/logger.cs

@@ -629,7 +629,7 @@ namespace SteamWare
         protected void newLogfileName()
         {
             DateTime CurrentDateTime = DateTime.Now;
-            _logfileName = _logBaseDir + String.Format("{0}.log", CurrentDateTime.ToString("yyyyMMdd"));
+            _logfileName = _logBaseDir + String.Format("{0}.log", CurrentDateTime.ToString("yyyy-MM-dd"));
         }
 
         /// <summary>

TestBench/MainFOrm.Designer.cs

@@ -80,18 +80,18 @@
             this.txtQueueMessage = new System.Windows.Forms.TextBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.lblQueueRead = new System.Windows.Forms.Label();
-            this.clockTimer = new System.Windows.Forms.Timer(this.components);
-            this.LogTimer = new System.Windows.Forms.Timer(this.components);
             this.tabPage7 = new System.Windows.Forms.TabPage();
-            this.label9 = new System.Windows.Forms.Label();
-            this.txtUser = new System.Windows.Forms.TextBox();
-            this.txtPass = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
+            this.btnDownload = new System.Windows.Forms.Button();
+            this.lblOutUpdMan = new System.Windows.Forms.Label();
+            this.btnReadUpdMan = new System.Windows.Forms.Button();
             this.txtRemoteUrl = new System.Windows.Forms.TextBox();
             this.label11 = new System.Windows.Forms.Label();
-            this.btnReadUpdMan = new System.Windows.Forms.Button();
-            this.lblOutUpdMan = new System.Windows.Forms.Label();
-            this.btnDownload = new System.Windows.Forms.Button();
+            this.txtPass = new System.Windows.Forms.TextBox();
+            this.label10 = new System.Windows.Forms.Label();
+            this.txtUser = new System.Windows.Forms.TextBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.clockTimer = new System.Windows.Forms.Timer(this.components);
+            this.LogTimer = new System.Windows.Forms.Timer(this.components);
             this.groupBox1.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
@@ -668,16 +668,6 @@
             this.lblQueueRead.TabIndex = 1;
             this.lblQueueRead.Text = "...";
             // 
-            // clockTimer
-            // 
-            this.clockTimer.Interval = 50;
-            this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick);
-            // 
-            // LogTimer
-            // 
-            this.LogTimer.Interval = 10;
-            this.LogTimer.Tick += new System.EventHandler(this.LogTimer_Tick);
-            // 
             // tabPage7
             // 
             this.tabPage7.Controls.Add(this.btnDownload);
@@ -697,22 +687,51 @@
             this.tabPage7.Text = "Update Man";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
-            // label9
+            // btnDownload
             // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(19, 20);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(29, 13);
-            this.label9.TabIndex = 0;
-            this.label9.Text = "User";
+            this.btnDownload.Location = new System.Drawing.Point(496, 15);
+            this.btnDownload.Name = "btnDownload";
+            this.btnDownload.Size = new System.Drawing.Size(175, 23);
+            this.btnDownload.TabIndex = 8;
+            this.btnDownload.Text = "Download latest";
+            this.btnDownload.UseVisualStyleBackColor = true;
+            this.btnDownload.Click += new System.EventHandler(this.btnDownload_Click);
             // 
-            // txtUser
+            // lblOutUpdMan
             // 
-            this.txtUser.Location = new System.Drawing.Point(60, 17);
-            this.txtUser.Name = "txtUser";
-            this.txtUser.Size = new System.Drawing.Size(100, 20);
-            this.txtUser.TabIndex = 1;
-            this.txtUser.Text = "SWDownloader";
+            this.lblOutUpdMan.AutoSize = true;
+            this.lblOutUpdMan.Location = new System.Drawing.Point(19, 76);
+            this.lblOutUpdMan.Name = "lblOutUpdMan";
+            this.lblOutUpdMan.Size = new System.Drawing.Size(16, 13);
+            this.lblOutUpdMan.TabIndex = 7;
+            this.lblOutUpdMan.Text = "---";
+            // 
+            // btnReadUpdMan
+            // 
+            this.btnReadUpdMan.Location = new System.Drawing.Point(315, 15);
+            this.btnReadUpdMan.Name = "btnReadUpdMan";
+            this.btnReadUpdMan.Size = new System.Drawing.Size(175, 23);
+            this.btnReadUpdMan.TabIndex = 6;
+            this.btnReadUpdMan.Text = "Retrieve Info";
+            this.btnReadUpdMan.UseVisualStyleBackColor = true;
+            this.btnReadUpdMan.Click += new System.EventHandler(this.btnReadUpdMan_Click);
+            // 
+            // txtRemoteUrl
+            // 
+            this.txtRemoteUrl.Location = new System.Drawing.Point(60, 43);
+            this.txtRemoteUrl.Name = "txtRemoteUrl";
+            this.txtRemoteUrl.Size = new System.Drawing.Size(611, 20);
+            this.txtRemoteUrl.TabIndex = 5;
+            this.txtRemoteUrl.Text = "http://nexus.steamware.net/repository/SWS/ZCode/master/LAST/manifest.xml";
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Location = new System.Drawing.Point(19, 46);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(20, 13);
+            this.label11.TabIndex = 4;
+            this.label11.Text = "Url";
             // 
             // txtPass
             // 
@@ -731,51 +750,32 @@
             this.label10.TabIndex = 2;
             this.label10.Text = "Pass";
             // 
-            // txtRemoteUrl
+            // txtUser
             // 
-            this.txtRemoteUrl.Location = new System.Drawing.Point(60, 43);
-            this.txtRemoteUrl.Name = "txtRemoteUrl";
-            this.txtRemoteUrl.Size = new System.Drawing.Size(611, 20);
-            this.txtRemoteUrl.TabIndex = 5;
-            this.txtRemoteUrl.Text = "http://nexus.steamware.net/repository/SWS/MP-STATS/unstable/0/manifest.xml";
+            this.txtUser.Location = new System.Drawing.Point(60, 17);
+            this.txtUser.Name = "txtUser";
+            this.txtUser.Size = new System.Drawing.Size(100, 20);
+            this.txtUser.TabIndex = 1;
+            this.txtUser.Text = "SWDownloader";
             // 
-            // label11
+            // label9
             // 
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(19, 46);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(20, 13);
-            this.label11.TabIndex = 4;
-            this.label11.Text = "Url";
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(19, 20);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(29, 13);
+            this.label9.TabIndex = 0;
+            this.label9.Text = "User";
             // 
-            // btnReadUpdMan
+            // clockTimer
             // 
-            this.btnReadUpdMan.Location = new System.Drawing.Point(315, 15);
-            this.btnReadUpdMan.Name = "btnReadUpdMan";
-            this.btnReadUpdMan.Size = new System.Drawing.Size(175, 23);
-            this.btnReadUpdMan.TabIndex = 6;
-            this.btnReadUpdMan.Text = "Retrieve Info";
-            this.btnReadUpdMan.UseVisualStyleBackColor = true;
-            this.btnReadUpdMan.Click += new System.EventHandler(this.btnReadUpdMan_Click);
+            this.clockTimer.Interval = 50;
+            this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick);
             // 
-            // lblOutUpdMan
+            // LogTimer
             // 
-            this.lblOutUpdMan.AutoSize = true;
-            this.lblOutUpdMan.Location = new System.Drawing.Point(19, 76);
-            this.lblOutUpdMan.Name = "lblOutUpdMan";
-            this.lblOutUpdMan.Size = new System.Drawing.Size(16, 13);
-            this.lblOutUpdMan.TabIndex = 7;
-            this.lblOutUpdMan.Text = "---";
-            // 
-            // btnDownload
-            // 
-            this.btnDownload.Location = new System.Drawing.Point(496, 15);
-            this.btnDownload.Name = "btnDownload";
-            this.btnDownload.Size = new System.Drawing.Size(175, 23);
-            this.btnDownload.TabIndex = 8;
-            this.btnDownload.Text = "Download latest";
-            this.btnDownload.UseVisualStyleBackColor = true;
-            this.btnDownload.Click += new System.EventHandler(this.btnDownload_Click);
+            this.LogTimer.Interval = 10;
+            this.LogTimer.Tick += new System.EventHandler(this.LogTimer_Tick);
             // 
             // MainForm
             //