diff --git a/SteamWareLib/README.txt b/SteamWareLib/App_Readme/README_SteamWare.txt similarity index 100% rename from SteamWareLib/README.txt rename to SteamWareLib/App_Readme/README_SteamWare.txt diff --git a/SteamWareLib/example-NLog.config b/SteamWareLib/App_Readme/SteamWare_demo/example-NLog.config similarity index 100% rename from SteamWareLib/example-NLog.config rename to SteamWareLib/App_Readme/SteamWare_demo/example-NLog.config diff --git a/SteamWareLib/example-app.config b/SteamWareLib/App_Readme/SteamWare_demo/example-app.config similarity index 100% rename from SteamWareLib/example-app.config rename to SteamWareLib/App_Readme/SteamWare_demo/example-app.config diff --git a/SteamWareLib/example-config-table.txt b/SteamWareLib/App_Readme/SteamWare_demo/example-config-table.txt similarity index 100% rename from SteamWareLib/example-config-table.txt rename to SteamWareLib/App_Readme/SteamWare_demo/example-config-table.txt diff --git a/SteamWareLib/example-favicon.ico b/SteamWareLib/App_Readme/SteamWare_demo/example-favicon.ico similarity index 100% rename from SteamWareLib/example-favicon.ico rename to SteamWareLib/App_Readme/SteamWare_demo/example-favicon.ico diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index f12936d..abb822c 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -61,7 +61,7 @@ AnyCPU - example-favicon.ico + App_Readme\SteamWare_demo\example-favicon.ico true @@ -106,7 +106,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.0.25\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -115,7 +115,7 @@ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.0.593\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll c:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll @@ -135,8 +135,8 @@ - - ..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll @@ -266,17 +266,17 @@ - - + + Always - + Always - + Always - + Designer diff --git a/SteamWareLib/app.config b/SteamWareLib/app.config index 0e19425..320d82d 100644 --- a/SteamWareLib/app.config +++ b/SteamWareLib/app.config @@ -72,16 +72,16 @@ - - + + - - + + @@ -93,7 +93,7 @@ - + diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config index 8941c0e..96a01e3 100644 --- a/SteamWareLib/packages.config +++ b/SteamWareLib/packages.config @@ -12,14 +12,14 @@ - + - + - + diff --git a/TestBench/App.config b/TestBench/App.config index fd941a7..d7b1749 100644 --- a/TestBench/App.config +++ b/TestBench/App.config @@ -3,6 +3,12 @@ + + + + + + @@ -23,7 +29,7 @@ - + diff --git a/TestBench/MainFOrm.Designer.cs b/TestBench/MainFOrm.Designer.cs index 1f749a1..50dd35e 100644 --- a/TestBench/MainFOrm.Designer.cs +++ b/TestBench/MainFOrm.Designer.cs @@ -38,6 +38,8 @@ this.txtSourceDir = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.lblHwSwData = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.lblRedis = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -54,9 +56,9 @@ this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.txtSourceDir); this.groupBox1.Location = new System.Drawing.Point(9, 10); - 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(582, 79); this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; @@ -76,7 +78,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; @@ -86,7 +88,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; @@ -107,7 +109,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; @@ -125,7 +127,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; @@ -133,7 +135,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(21, 143); + this.label3.Location = new System.Drawing.Point(21, 174); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(64, 13); this.label3.TabIndex = 2; @@ -142,21 +144,43 @@ // lblHwSwData // this.lblHwSwData.AutoSize = true; - this.lblHwSwData.Location = new System.Drawing.Point(109, 143); + this.lblHwSwData.Location = new System.Drawing.Point(109, 174); this.lblHwSwData.Name = "lblHwSwData"; this.lblHwSwData.Size = new System.Drawing.Size(16, 13); this.lblHwSwData.TabIndex = 3; this.lblHwSwData.Text = "..."; // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(22, 108); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(58, 13); + this.label4.TabIndex = 4; + this.label4.Text = "Redis Test"; + // + // lblRedis + // + this.lblRedis.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lblRedis.AutoEllipsis = true; + this.lblRedis.Location = new System.Drawing.Point(109, 108); + this.lblRedis.Name = "lblRedis"; + this.lblRedis.Size = new System.Drawing.Size(482, 52); + this.lblRedis.TabIndex = 5; + this.lblRedis.Text = "---"; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(600, 366); + this.Controls.Add(this.lblRedis); + this.Controls.Add(this.label4); this.Controls.Add(this.lblHwSwData); this.Controls.Add(this.label3); this.Controls.Add(this.groupBox1); - 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); @@ -178,6 +202,8 @@ private System.Windows.Forms.Label lblOutMessage; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label lblHwSwData; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label lblRedis; } } diff --git a/TestBench/MainFOrm.cs b/TestBench/MainFOrm.cs index 8443dc8..d3e3ed3 100644 --- a/TestBench/MainFOrm.cs +++ b/TestBench/MainFOrm.cs @@ -20,6 +20,8 @@ namespace TestBench txtDestDir.Text = @"L:\TMP\"; lblHwSwData.Text = SteamWare.HwSwInfo.man(Assembly.GetExecutingAssembly()).librariesVers; + + lblRedis.Text = memLayer.ML.getRSV("MoonPro:SQL2016DEV:MoonPro:CurrentParameters:SIMUL_01"); } private void BtnCopyAll_Click(object sender, EventArgs e)