Egalware/SteamWare
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-28 08:31:21 +01:00
parent 50440e435a b2ae00d9d1
commit e5cbe69d37
11 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SteamWareLib/README.txt → SteamWareLib/App_Readme/README_SteamWare.txt
View File
SteamWareLib/example-NLog.config → SteamWareLib/App_Readme/SteamWare_demo/example-NLog.config
View File
SteamWareLib/example-app.config → SteamWareLib/App_Readme/SteamWare_demo/example-app.config
View File
SteamWareLib/example-config-table.txt → SteamWareLib/App_Readme/SteamWare_demo/example-config-table.txt
View File
SteamWareLib/example-favicon.ico → SteamWareLib/App_Readme/SteamWare_demo/example-favicon.ico
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

SteamWareLib/SteamWare.csproj
+10 -10
View File
@@ -61,7 +61,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>example-favicon.ico</ApplicationIcon>
<ApplicationIcon>App_Readme\SteamWare_demo\example-favicon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -106,7 +106,7 @@
<HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.0.25\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll</HintPath>
@@ -115,7 +115,7 @@
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.0.593\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="System">
<HintPath>c:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll</HintPath>
@@ -135,8 +135,8 @@
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
<Reference Include="System.IO.Pipelines, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -266,17 +266,17 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="example-config-table.txt" />
<Content Include="example-favicon.ico">
<Content Include="App_Readme\SteamWare_demo\example-config-table.txt" />
<Content Include="App_Readme\SteamWare_demo\example-favicon.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="example-NLog.config">
<Content Include="App_Readme\SteamWare_demo\example-NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="README.txt">
<Content Include="App_Readme\README_SteamWare.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="example-app.config">
<Content Include="App_Readme\SteamWare_demo\example-app.config">
<SubType>Designer</SubType>
</Content>
<None Include="SteamWare.tt">
SteamWareLib/app.config
+5 -5
View File
@@ -72,16 +72,16 @@
<bindingRedirect oldVersion="0.0.0.0-0.24.0.0" newVersion="0.24.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -93,7 +93,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
SteamWareLib/packages.config
+3 -3
View File
@@ -12,14 +12,14 @@
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
<package id="NLog" version="4.6.8" targetFramework="net462" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.0.25" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.1.0" targetFramework="net462" />
<package id="SharpCompress" version="0.24.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.593" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.601" targetFramework="net462" />
<package id="System.Buffers" version="4.5.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.6.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.5.3" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.6.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.3" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net462" />
TestBench/App.config
+7 -1
View File
@@ -3,6 +3,12 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<appSettings>
<!--Redis conn-->
<add key="RedisConn" value="localhost,abortConnect=false,ssl=false" />
<add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false" />
<add key="redisDb" value="1" />
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -23,7 +29,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
TestBench/MainFOrm.Designer.cs
Generated
+35 -9
View File
@@ -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;
}
}
TestBench/MainFOrm.cs
+2
View File
@@ -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)