Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup vari x PING + update versione FACADE e test PING

Browse Source
This commit is contained in:
Samuele Locatelli
2025-01-08 09:56:46 +01:00
parent c097d9d342
commit d0d2c29d72
8 changed files with 169 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -1
View File
@@ -176,7 +176,7 @@ variables:
codApp = $env:APP_NAME
uplAppId = "UpdateManager"
masterKey = $LiMan_Key
tipo = "Machine"
tipo = "WinApp"
versNum = $env:NEW_REL
versText = $env:NEW_REL
releaseDate = $date
IOB-WIN-FACADE.sln
+42
View File
@@ -0,0 +1,42 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32505.173
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B52E3E86-1B82-4F4D-982C-0C8909CD2A28}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-WIN-FACADE", "IOB-WIN-FACADE\IOB-WIN-FACADE.csproj", "{00306457-A682-4D5B-BFE3-F2CCC96D1B81}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
Remote_DEBUG|Any CPU = Remote_DEBUG|Any CPU
Remote_DEBUG|x86 = Remote_DEBUG|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Debug|x86.ActiveCfg = Debug|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Debug|x86.Build.0 = Debug|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Release|Any CPU.Build.0 = Release|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Release|x86.ActiveCfg = Release|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Release|x86.Build.0 = Release|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Remote_DEBUG|Any CPU.ActiveCfg = Release|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Remote_DEBUG|Any CPU.Build.0 = Release|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Remote_DEBUG|x86.ActiveCfg = Release|Any CPU
{00306457-A682-4D5B-BFE3-F2CCC96D1B81}.Remote_DEBUG|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {801DCDC5-B7D3-4EA5-B543-783D2C91765F}
EndGlobalSection
EndGlobal
IOB-WIN-FACADE/Properties/AssemblyInfo.cs
+5 -5
View File
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("IOB-WIN-FACADE")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("Adapter IOB-WIN di avvio")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("EgalWare")]
[assembly: AssemblyProduct("IOB-WIN-FACADE")]
[assembly: AssemblyCopyright("Copyright © 2025")]
[assembly: AssemblyCopyright("Copyright Egalware © 2025+")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("0.0.0.1")]
[assembly: AssemblyFileVersion("0.0.0.1")]
IOB-WIN-PING.sln
+14
View File
@@ -16,6 +16,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-WIN-FORM", "IOB-WIN-FOR
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-WIN-WPS", "IOB-WIN-WPS\IOB-WIN-WPS.csproj", "{26F72ECF-8774-4785-88E0-E5F901F97E30}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-WIN-PING", "IOB-WIN-PING\IOB-WIN-PING.csproj", "{6ADF1E82-124C-489C-99EF-A857C933D362}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -73,6 +75,18 @@ Global
{26F72ECF-8774-4785-88E0-E5F901F97E30}.Remote_DEBUG|Any CPU.Build.0 = Remote_DEBUG|Any CPU
{26F72ECF-8774-4785-88E0-E5F901F97E30}.Remote_DEBUG|x86.ActiveCfg = Remote_DEBUG|x86
{26F72ECF-8774-4785-88E0-E5F901F97E30}.Remote_DEBUG|x86.Build.0 = Remote_DEBUG|x86
{6ADF1E82-124C-489C-99EF-A857C933D362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Debug|x86.ActiveCfg = Debug|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Debug|x86.Build.0 = Debug|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Release|Any CPU.Build.0 = Release|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Release|x86.ActiveCfg = Release|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Release|x86.Build.0 = Release|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Remote_DEBUG|Any CPU.ActiveCfg = Release|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Remote_DEBUG|Any CPU.Build.0 = Release|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Remote_DEBUG|x86.ActiveCfg = Release|Any CPU
{6ADF1E82-124C-489C-99EF-A857C933D362}.Remote_DEBUG|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
IOB-WIN-PING/AdapterFormNext.cs
+2 -2
View File
@@ -28,8 +28,8 @@ namespace IOB_WIN_PING
switch (tipoScelto)
{
case tipoAdapter.WPS:
iobObj = new IobNet.WebPageScrap(this, IOBConf);
case tipoAdapter.PingWatchdog:
iobObj = new IOB_WIN_FORM.Iob.PingWatchDog(this, IOBConf);
btnStart.Enabled = true;
break;
IOB-WIN-PING/IOB-WIN-PING.csproj
+105 -5
View File
@@ -7,7 +7,7 @@
<ProjectGuid>{6ADF1E82-124C-489C-99EF-A857C933D362}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>IOB_WIN_PING</RootNamespace>
<AssemblyName>IOB_WIN_PING</AssemblyName>
<AssemblyName>IOB-WIN-PING</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -46,14 +46,24 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Form1.cs">
<Compile Include="..\VersGen\VersGen.cs">
<Link>VersGen.cs</Link>
</Compile>
<Compile Include="AdapterFormNext.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
<Compile Include="Iob\GenericNext.cs" />
<Compile Include="MainFormNext.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="Resources\STEAM-IOB-WIN.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\SteamWare.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -63,6 +73,59 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="App.Debug.config">
<DependentUpon>App.config</DependentUpon>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="App.Release.config">
<DependentUpon>App.config</DependentUpon>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3018.ini" />
<None Include="DATA\CONF\3018.json" />
<None Include="DATA\CONF\3019.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3019.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\IOB.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\MAIN.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\PING.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01_WD.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\WPS.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\WPS.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\DAT\PersistData.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\DAT\SimData.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\HIST\.placeholder">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="postBuildTgt.bat" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -72,9 +135,46 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Content Include="Resources\Start-IOB-WIN.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="setupTgt.bat" />
<None Include="temp\.placeholder">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="App.config">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="logs\.placeholder.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Readme\ToDo.txt" />
<Content Include="Resources\ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\Circuit.ico" />
<Content Include="Resources\logoSteamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\manifest.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\Net.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IOB-UT-NEXT\IOB-UT-NEXT.csproj">
<Project>{90512e12-29fc-460d-94cc-648c2a072dbd}</Project>
<Name>IOB-UT-NEXT</Name>
</ProjectReference>
<ProjectReference Include="..\IOB-WIN-FORM\IOB-WIN-FORM.csproj">
<Project>{9ba331bb-9bf1-40e0-ac03-74b43d73a097}</Project>
<Name>IOB-WIN-FORM</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
IOB-WIN-PING/Properties/AssemblyInfo.cs
-11
View File
@@ -8,9 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("IOB-WIN-PING")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("IOB-WIN-PING")]
[assembly: AssemblyCopyright("Copyright © 2025")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -22,12 +20,3 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6adf1e82-124c-489c-99ef-a857c933d362")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
IOB-WIN-WPS/IOB-WIN-WPS.csproj
-3
View File
@@ -157,7 +157,6 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Readme\ToDo.txt" />
<Content Include="RemoteDebugInfo.txt" />
<Content Include="Resources\ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -202,8 +201,6 @@
<None Include="DATA\CONF\PING.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\TEST.ini" />
<None Include="DATA\CONF\TEST.json" />
<None Include="DATA\CONF\SIMUL_01_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>