From 9af9b67bc73948eaa1c8a16d9ffbd48e1d81161f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 20 Nov 2020 17:50:33 +0100 Subject: [PATCH] update nuget vari --- SteamWare.IO/SteamWare.IO.csproj | 52 ++++++------- SteamWare.IO/packages.config | 20 ++--- SteamWareLib/SteamWare.csproj | 43 +++++------ SteamWareLib/app.config | 2 +- SteamWareLib/packages.config | 13 ++-- TestBench/MainFOrm.Designer.cs | 121 +++++++++++++++++-------------- TestBench/MainFOrm.cs | 7 +- TestBench/packages.config | 12 +-- 8 files changed, 145 insertions(+), 125 deletions(-) diff --git a/SteamWare.IO/SteamWare.IO.csproj b/SteamWare.IO/SteamWare.IO.csproj index 81ef707..b4c8e12 100644 --- a/SteamWare.IO/SteamWare.IO.csproj +++ b/SteamWare.IO/SteamWare.IO.csproj @@ -40,20 +40,20 @@ ..\packages\DnsClient.1.3.2\lib\net45\DnsClient.dll - - ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\MongoDB.Bson.2.11.2\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.11.4\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.11.2\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.11.4\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.11.2\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.11.4\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll @@ -65,7 +65,7 @@ ..\packages\NLog.4.7.5\lib\net45\NLog.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.2.0\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.26.0\lib\net46\SharpCompress.dll @@ -74,7 +74,7 @@ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll @@ -82,16 +82,16 @@ - - ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.5.0.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.IO.Pipelines.5.0.0\lib\net461\System.IO.Pipelines.dll + - - ..\packages\System.IO.Pipelines.4.7.2\lib\net461\System.IO.Pipelines.dll - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll @@ -132,8 +132,8 @@ True - - ..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -206,17 +206,17 @@ Settings.Designer.cs - - - - - {97a9f482-c173-4f0f-9f8f-7bb41c59cdd6} SteamWare.Logger + + + + + @@ -224,7 +224,7 @@ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. - + - + \ No newline at end of file diff --git a/SteamWare.IO/packages.config b/SteamWare.IO/packages.config index d193e9e..2eccf02 100644 --- a/SteamWare.IO/packages.config +++ b/SteamWare.IO/packages.config @@ -2,22 +2,22 @@ - - - - + + + + - + - + - + - + - + @@ -27,6 +27,6 @@ - + \ No newline at end of file diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index cec30d5..79355ee 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -61,14 +61,15 @@ AnyCPU - App_Readme\SteamWare_demo\example-favicon.ico + + true - - ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll + + ..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll @@ -79,22 +80,22 @@ ..\packages\DnsClient.1.3.2\lib\net45\DnsClient.dll - - ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\MongoDB.Bson.2.11.2\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.11.4\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.11.2\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.11.4\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.11.2\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.11.4\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll @@ -123,8 +124,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.0.2011.746\lib\net462\SteamWare.Logger.dll c:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll @@ -170,6 +171,7 @@ ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll --> + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll True @@ -180,6 +182,9 @@ True True + + ..\packages\System.Security.Cryptography.Pkcs.4.5.2\lib\net461\System.Security.Cryptography.Pkcs.dll + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll True @@ -304,16 +309,12 @@ + - - Always - + Always - - Always - Designer @@ -458,8 +459,8 @@ - + - + \ No newline at end of file diff --git a/SteamWareLib/app.config b/SteamWareLib/app.config index 4c2d8da..e013f9e 100644 --- a/SteamWareLib/app.config +++ b/SteamWareLib/app.config @@ -101,7 +101,7 @@ - + diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config index 18f14a7..230904d 100644 --- a/SteamWareLib/packages.config +++ b/SteamWareLib/packages.config @@ -1,14 +1,14 @@  - + - - - + + + @@ -16,10 +16,10 @@ - + - + @@ -31,6 +31,7 @@ + diff --git a/TestBench/MainFOrm.Designer.cs b/TestBench/MainFOrm.Designer.cs index abec1dc..76651c1 100644 --- a/TestBench/MainFOrm.Designer.cs +++ b/TestBench/MainFOrm.Designer.cs @@ -49,6 +49,8 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage(); + this.lblTestLogger = new System.Windows.Forms.Label(); + this.chkTestLogger = new System.Windows.Forms.CheckBox(); this.btnResetCdv = new System.Windows.Forms.Button(); this.lblRedCDV = new System.Windows.Forms.Label(); this.btnShowCdv = new System.Windows.Forms.Button(); @@ -78,9 +80,8 @@ this.groupBox2 = new System.Windows.Forms.GroupBox(); this.lblQueueRead = new System.Windows.Forms.Label(); this.clockTimer = new System.Windows.Forms.Timer(this.components); - this.chkTestLogger = new System.Windows.Forms.CheckBox(); - this.lblTestLogger = new System.Windows.Forms.Label(); this.LogTimer = new System.Windows.Forms.Timer(this.components); + this.btnResetAppConf = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -108,9 +109,9 @@ this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.txtSourceDir); this.groupBox1.Location = new System.Drawing.Point(5, 5); - this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Margin = new System.Windows.Forms.Padding(2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Padding = new System.Windows.Forms.Padding(2); this.groupBox1.Size = new System.Drawing.Size(740, 84); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; @@ -130,7 +131,7 @@ // this.chkRecursive.AutoSize = true; this.chkRecursive.Location = new System.Drawing.Point(400, 17); - this.chkRecursive.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chkRecursive.Margin = new System.Windows.Forms.Padding(2); this.chkRecursive.Name = "chkRecursive"; this.chkRecursive.Size = new System.Drawing.Size(69, 17); this.chkRecursive.TabIndex = 6; @@ -140,7 +141,7 @@ // btnCopyAll // this.btnCopyAll.Location = new System.Drawing.Point(521, 15); - this.btnCopyAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCopyAll.Margin = new System.Windows.Forms.Padding(2); this.btnCopyAll.Name = "btnCopyAll"; this.btnCopyAll.Size = new System.Drawing.Size(56, 19); this.btnCopyAll.TabIndex = 5; @@ -161,7 +162,7 @@ // txtDestDir // this.txtDestDir.Location = new System.Drawing.Point(278, 17); - this.txtDestDir.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtDestDir.Margin = new System.Windows.Forms.Padding(2); this.txtDestDir.Name = "txtDestDir"; this.txtDestDir.Size = new System.Drawing.Size(118, 20); this.txtDestDir.TabIndex = 3; @@ -179,7 +180,7 @@ // txtSourceDir // this.txtSourceDir.Location = new System.Drawing.Point(77, 17); - this.txtSourceDir.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtSourceDir.Margin = new System.Windows.Forms.Padding(2); this.txtSourceDir.Name = "txtSourceDir"; this.txtSourceDir.Size = new System.Drawing.Size(118, 20); this.txtSourceDir.TabIndex = 1; @@ -277,8 +278,8 @@ this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); - this.tabPage1.Size = new System.Drawing.Size(768, 305); + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(768, 353); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "File IO test"; this.tabPage1.UseVisualStyleBackColor = true; @@ -290,14 +291,15 @@ this.tabPage2.Controls.Add(this.button1); this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); - this.tabPage2.Size = new System.Drawing.Size(768, 305); + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(768, 353); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "PDF test"; this.tabPage2.UseVisualStyleBackColor = true; // // tabPage3 // + this.tabPage3.Controls.Add(this.btnResetAppConf); this.tabPage3.Controls.Add(this.lblTestLogger); this.tabPage3.Controls.Add(this.chkTestLogger); this.tabPage3.Controls.Add(this.btnResetCdv); @@ -312,6 +314,26 @@ this.tabPage3.Text = "Redis test"; this.tabPage3.UseVisualStyleBackColor = true; // + // lblTestLogger + // + this.lblTestLogger.AutoSize = true; + this.lblTestLogger.Location = new System.Drawing.Point(229, 300); + this.lblTestLogger.Name = "lblTestLogger"; + this.lblTestLogger.Size = new System.Drawing.Size(16, 13); + this.lblTestLogger.TabIndex = 15; + this.lblTestLogger.Text = "..."; + // + // chkTestLogger + // + this.chkTestLogger.AutoSize = true; + this.chkTestLogger.Location = new System.Drawing.Point(11, 300); + this.chkTestLogger.Name = "chkTestLogger"; + this.chkTestLogger.Size = new System.Drawing.Size(123, 17); + this.chkTestLogger.TabIndex = 14; + this.chkTestLogger.Text = "Test Redis Log Veto"; + this.chkTestLogger.UseVisualStyleBackColor = true; + this.chkTestLogger.CheckedChanged += new System.EventHandler(this.chkTestLogger_CheckedChanged); + // // btnResetCdv // this.btnResetCdv.Location = new System.Drawing.Point(495, 13); @@ -349,7 +371,7 @@ this.tabPage4.Controls.Add(this.lblHwSwData); this.tabPage4.Location = new System.Drawing.Point(4, 22); this.tabPage4.Name = "tabPage4"; - this.tabPage4.Size = new System.Drawing.Size(768, 305); + this.tabPage4.Size = new System.Drawing.Size(768, 353); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "Hw Sw pages"; this.tabPage4.UseVisualStyleBackColor = true; @@ -368,10 +390,10 @@ this.tabPage5.Controls.Add(this.txtOre); this.tabPage5.Controls.Add(this.btnStartSched); this.tabPage5.Location = new System.Drawing.Point(4, 22); - this.tabPage5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabPage5.Margin = new System.Windows.Forms.Padding(2); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.tabPage5.Size = new System.Drawing.Size(768, 305); + this.tabPage5.Padding = new System.Windows.Forms.Padding(2); + this.tabPage5.Size = new System.Drawing.Size(768, 353); this.tabPage5.TabIndex = 4; this.tabPage5.Text = "Scheduler"; this.tabPage5.UseVisualStyleBackColor = true; @@ -429,7 +451,7 @@ // txtSec // this.txtSec.Location = new System.Drawing.Point(242, 19); - this.txtSec.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtSec.Margin = new System.Windows.Forms.Padding(2); this.txtSec.Name = "txtSec"; this.txtSec.Size = new System.Drawing.Size(35, 20); this.txtSec.TabIndex = 5; @@ -448,7 +470,7 @@ // txtMin // this.txtMin.Location = new System.Drawing.Point(182, 19); - this.txtMin.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtMin.Margin = new System.Windows.Forms.Padding(2); this.txtMin.Name = "txtMin"; this.txtMin.Size = new System.Drawing.Size(30, 20); this.txtMin.TabIndex = 3; @@ -467,7 +489,7 @@ // txtOre // this.txtOre.Location = new System.Drawing.Point(122, 19); - this.txtOre.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtOre.Margin = new System.Windows.Forms.Padding(2); this.txtOre.Name = "txtOre"; this.txtOre.Size = new System.Drawing.Size(30, 20); this.txtOre.TabIndex = 1; @@ -476,7 +498,7 @@ // btnStartSched // this.btnStartSched.Location = new System.Drawing.Point(16, 19); - this.btnStartSched.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnStartSched.Margin = new System.Windows.Forms.Padding(2); this.btnStartSched.Name = "btnStartSched"; this.btnStartSched.Size = new System.Drawing.Size(56, 19); this.btnStartSched.TabIndex = 0; @@ -491,9 +513,9 @@ this.tabPage6.Controls.Add(this.grpPublisher); this.tabPage6.Controls.Add(this.groupBox2); this.tabPage6.Location = new System.Drawing.Point(4, 22); - this.tabPage6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabPage6.Margin = new System.Windows.Forms.Padding(2); this.tabPage6.Name = "tabPage6"; - this.tabPage6.Size = new System.Drawing.Size(768, 305); + this.tabPage6.Size = new System.Drawing.Size(768, 353); this.tabPage6.TabIndex = 5; this.tabPage6.Text = "MessageQueue"; this.tabPage6.UseVisualStyleBackColor = true; @@ -504,9 +526,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.groupBox4.Controls.Add(this.lblChannelReceive); this.groupBox4.Location = new System.Drawing.Point(232, 93); - this.groupBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox4.Margin = new System.Windows.Forms.Padding(2); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox4.Padding = new System.Windows.Forms.Padding(2); this.groupBox4.Size = new System.Drawing.Size(155, 214); this.groupBox4.TabIndex = 2; this.groupBox4.TabStop = false; @@ -528,9 +550,9 @@ this.groupBox3.Controls.Add(this.label8); this.groupBox3.Controls.Add(this.txtChannelSend); this.groupBox3.Location = new System.Drawing.Point(232, 2); - this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox3.Margin = new System.Windows.Forms.Padding(2); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox3.Padding = new System.Windows.Forms.Padding(2); this.groupBox3.Size = new System.Drawing.Size(155, 84); this.groupBox3.TabIndex = 4; this.groupBox3.TabStop = false; @@ -549,7 +571,7 @@ // txtChannelSend // this.txtChannelSend.Location = new System.Drawing.Point(7, 31); - this.txtChannelSend.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtChannelSend.Margin = new System.Windows.Forms.Padding(2); this.txtChannelSend.Multiline = true; this.txtChannelSend.Name = "txtChannelSend"; this.txtChannelSend.Size = new System.Drawing.Size(140, 49); @@ -562,9 +584,9 @@ this.grpPublisher.Controls.Add(this.label7); this.grpPublisher.Controls.Add(this.txtQueueMessage); this.grpPublisher.Location = new System.Drawing.Point(6, 2); - this.grpPublisher.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.grpPublisher.Margin = new System.Windows.Forms.Padding(2); this.grpPublisher.Name = "grpPublisher"; - this.grpPublisher.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.grpPublisher.Padding = new System.Windows.Forms.Padding(2); this.grpPublisher.Size = new System.Drawing.Size(154, 84); this.grpPublisher.TabIndex = 1; this.grpPublisher.TabStop = false; @@ -573,7 +595,7 @@ // btnSend // this.btnSend.Location = new System.Drawing.Point(7, 54); - this.btnSend.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnSend.Margin = new System.Windows.Forms.Padding(2); this.btnSend.Name = "btnSend"; this.btnSend.Size = new System.Drawing.Size(139, 19); this.btnSend.TabIndex = 3; @@ -594,7 +616,7 @@ // txtQueueMessage // this.txtQueueMessage.Location = new System.Drawing.Point(7, 31); - this.txtQueueMessage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtQueueMessage.Margin = new System.Windows.Forms.Padding(2); this.txtQueueMessage.Name = "txtQueueMessage"; this.txtQueueMessage.Size = new System.Drawing.Size(140, 20); this.txtQueueMessage.TabIndex = 2; @@ -605,9 +627,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.groupBox2.Controls.Add(this.lblQueueRead); this.groupBox2.Location = new System.Drawing.Point(6, 91); - this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox2.Margin = new System.Windows.Forms.Padding(2); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox2.Padding = new System.Windows.Forms.Padding(2); this.groupBox2.Size = new System.Drawing.Size(154, 214); this.groupBox2.TabIndex = 0; this.groupBox2.TabStop = false; @@ -629,38 +651,28 @@ this.clockTimer.Interval = 50; this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); // - // chkTestLogger - // - this.chkTestLogger.AutoSize = true; - this.chkTestLogger.Location = new System.Drawing.Point(11, 300); - this.chkTestLogger.Name = "chkTestLogger"; - this.chkTestLogger.Size = new System.Drawing.Size(123, 17); - this.chkTestLogger.TabIndex = 14; - this.chkTestLogger.Text = "Test Redis Log Veto"; - this.chkTestLogger.UseVisualStyleBackColor = true; - this.chkTestLogger.CheckedChanged += new System.EventHandler(this.chkTestLogger_CheckedChanged); - // - // lblTestLogger - // - this.lblTestLogger.AutoSize = true; - this.lblTestLogger.Location = new System.Drawing.Point(229, 300); - this.lblTestLogger.Name = "lblTestLogger"; - this.lblTestLogger.Size = new System.Drawing.Size(16, 13); - this.lblTestLogger.TabIndex = 15; - this.lblTestLogger.Text = "..."; - // // LogTimer // this.LogTimer.Interval = 10; this.LogTimer.Tick += new System.EventHandler(this.LogTimer_Tick); // + // btnResetAppConf + // + this.btnResetAppConf.Location = new System.Drawing.Point(576, 13); + this.btnResetAppConf.Name = "btnResetAppConf"; + this.btnResetAppConf.Size = new System.Drawing.Size(114, 23); + this.btnResetAppConf.TabIndex = 16; + this.btnResetAppConf.Text = "ResetAppConf"; + this.btnResetAppConf.UseVisualStyleBackColor = true; + this.btnResetAppConf.Click += new System.EventHandler(this.btnResetAppConf_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(776, 379); this.Controls.Add(this.tabControl1); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "MainForm"; this.Text = "WinForm library POC"; this.groupBox1.ResumeLayout(false); @@ -744,6 +756,7 @@ private System.Windows.Forms.Label lblTestLogger; private System.Windows.Forms.CheckBox chkTestLogger; private System.Windows.Forms.Timer LogTimer; + private System.Windows.Forms.Button btnResetAppConf; } } diff --git a/TestBench/MainFOrm.cs b/TestBench/MainFOrm.cs index 3ca56c1..d230b58 100644 --- a/TestBench/MainFOrm.cs +++ b/TestBench/MainFOrm.cs @@ -61,6 +61,11 @@ namespace TestBench } } + private void btnResetAppConf_Click(object sender, EventArgs e) + { + memLayer.ML.resetAppConf(); + } + private void btnResetCdv_Click(object sender, EventArgs e) { memLayer.ML.resetAppConf(); @@ -245,7 +250,7 @@ namespace TestBench private void txtChannelSend_KeyPress(object sender, KeyPressEventArgs e) { // cerco Enter - if (e.KeyChar == (char)13) + if (e.KeyChar == (char)13) { // invio subscriber.Publish("TestChannel", $"{DateTime.Now} | {txtChannelSend.Text}"); diff --git a/TestBench/packages.config b/TestBench/packages.config index de04b8f..edddaa8 100644 --- a/TestBench/packages.config +++ b/TestBench/packages.config @@ -1,15 +1,15 @@  - - - + + + - + - + - + \ No newline at end of file