From d0d2c29d72eb108294a58b827d1017284bdf8bfb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 8 Jan 2025 09:56:46 +0100 Subject: [PATCH] Cleanup vari x PING + update versione FACADE e test PING --- .gitlab-ci.yml | 2 +- IOB-WIN-FACADE.sln | 42 +++++++++ IOB-WIN-FACADE/Properties/AssemblyInfo.cs | 10 +- IOB-WIN-PING.sln | 14 +++ IOB-WIN-PING/AdapterFormNext.cs | 4 +- IOB-WIN-PING/IOB-WIN-PING.csproj | 110 +++++++++++++++++++++- IOB-WIN-PING/Properties/AssemblyInfo.cs | 11 --- IOB-WIN-WPS/IOB-WIN-WPS.csproj | 3 - 8 files changed, 169 insertions(+), 27 deletions(-) create mode 100644 IOB-WIN-FACADE.sln diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bff6b312..6f28cd55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/IOB-WIN-FACADE.sln b/IOB-WIN-FACADE.sln new file mode 100644 index 00000000..5e5873cb --- /dev/null +++ b/IOB-WIN-FACADE.sln @@ -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 diff --git a/IOB-WIN-FACADE/Properties/AssemblyInfo.cs b/IOB-WIN-FACADE/Properties/AssemblyInfo.cs index 7dd8a5f1..38923ebd 100644 --- a/IOB-WIN-FACADE/Properties/AssemblyInfo.cs +++ b/IOB-WIN-FACADE/Properties/AssemblyInfo.cs @@ -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")] diff --git a/IOB-WIN-PING.sln b/IOB-WIN-PING.sln index 85b8f574..cfadd30c 100644 --- a/IOB-WIN-PING.sln +++ b/IOB-WIN-PING.sln @@ -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 diff --git a/IOB-WIN-PING/AdapterFormNext.cs b/IOB-WIN-PING/AdapterFormNext.cs index c0062fdd..d4b03e39 100644 --- a/IOB-WIN-PING/AdapterFormNext.cs +++ b/IOB-WIN-PING/AdapterFormNext.cs @@ -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; diff --git a/IOB-WIN-PING/IOB-WIN-PING.csproj b/IOB-WIN-PING/IOB-WIN-PING.csproj index 2710f746..a645522c 100644 --- a/IOB-WIN-PING/IOB-WIN-PING.csproj +++ b/IOB-WIN-PING/IOB-WIN-PING.csproj @@ -7,7 +7,7 @@ {6ADF1E82-124C-489C-99EF-A857C933D362} WinExe IOB_WIN_PING - IOB_WIN_PING + IOB-WIN-PING v4.6.2 512 true @@ -46,14 +46,24 @@ - + + VersGen.cs + + Form - - Form1.cs + + + Form + + Always + + + Always + ResXFileCodeGenerator Resources.Designer.cs @@ -63,6 +73,59 @@ True Resources.resx + + App.config + PreserveNewest + + + App.config + PreserveNewest + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + SettingsSingleFileGenerator Settings.Designer.cs @@ -72,9 +135,46 @@ Settings.settings True + + Always + + + + Always + - + + Designer + PreserveNewest + + + + + Always + + + + Always + + + + Always + + + Always + + + + + + {90512e12-29fc-460d-94cc-648c2a072dbd} + IOB-UT-NEXT + + + {9ba331bb-9bf1-40e0-ac03-74b43d73a097} + IOB-WIN-FORM + \ No newline at end of file diff --git a/IOB-WIN-PING/Properties/AssemblyInfo.cs b/IOB-WIN-PING/Properties/AssemblyInfo.cs index 0cfd2b0b..baad1c62 100644 --- a/IOB-WIN-PING/Properties/AssemblyInfo.cs +++ b/IOB-WIN-PING/Properties/AssemblyInfo.cs @@ -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")] diff --git a/IOB-WIN-WPS/IOB-WIN-WPS.csproj b/IOB-WIN-WPS/IOB-WIN-WPS.csproj index 7c90551a..fe0a770e 100644 --- a/IOB-WIN-WPS/IOB-WIN-WPS.csproj +++ b/IOB-WIN-WPS/IOB-WIN-WPS.csproj @@ -157,7 +157,6 @@ Always - Always @@ -202,8 +201,6 @@ Always - - Always