diff --git a/IobConf.Core/IniFile.cs b/IobConf.Core/IniFile.cs index 1a0fc606..f02ee733 100644 --- a/IobConf.Core/IniFile.cs +++ b/IobConf.Core/IniFile.cs @@ -41,7 +41,7 @@ namespace IobConf.Core /// public void IniDeleteKey(string Section, string Key) { - WritePrivateProfileString(Section, Key, null, FileName); + WritePrivateProfileString(Section, Key, "", FileName); } /// @@ -50,7 +50,7 @@ namespace IobConf.Core /// public void IniDeleteSection(string Section) { - WritePrivateProfileSection(Section, null, FileName); + WritePrivateProfileSection(Section, "", FileName); } /// diff --git a/IobConf.Core/IobConf.Core.csproj b/IobConf.Core/IobConf.Core.csproj index 7361855e..d36839cf 100644 --- a/IobConf.Core/IobConf.Core.csproj +++ b/IobConf.Core/IobConf.Core.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/IobConf.Core/IobConfTree.cs b/IobConf.Core/IobConfTree.cs index 7c76ca94..d169220a 100644 --- a/IobConf.Core/IobConfTree.cs +++ b/IobConf.Core/IobConfTree.cs @@ -19,7 +19,9 @@ namespace IobConf.Core /// Init classe configurazione /// public IobConfTree() - { } + { + Log = LogManager.GetCurrentClassLogger(); + } /// /// Restituisce un oggetto di conf leggendo INI ed effettuando conversione @@ -33,8 +35,8 @@ namespace IobConf.Core { // leggo file INI IniFile fIni = new IniFile(iniFilePath); - string codIob= Path.GetFileNameWithoutExtension(iniFilePath); - + string codIob = Path.GetFileNameWithoutExtension(iniFilePath); + // effettuo conversione... // Dati generali (vendor, modello...) @@ -46,13 +48,13 @@ namespace IobConf.Core // tipo adapter// verifico tipo adapter try { - newConfObj.IobType = (AdapterType)Enum.Parse(typeof(AdapterType), fIni.ReadString("IOB", "CNCTYPE", "ND")); + newConfObj.IobType = (AdapterType)Enum.Parse(typeof(AdapterType), fIni.ReadString("IOB", "CNCTYPE", "ND")); } catch (Exception exc) { newConfObj.IobType = AdapterType.ND; string rawVal = fIni.ReadString("IOB", "CNCTYPE", "DEMO"); - //newConfObj.lgError($"Eccezione in conversione tipo adapter: richiesto {rawVal} | tipo non codificato...{Environment.NewLine}{exc}"); + newConfObj.lgError($"Eccezione in conversione tipo adapter: richiesto {rawVal} | tipo non codificato...{Environment.NewLine}{exc}"); } newConfObj.GeneralCom = (ComLayer)Enum.Parse(typeof(ComLayer), fIni.ReadString("IOB", "CNCFAMILY", "ND")); @@ -72,16 +74,15 @@ namespace IobConf.Core newConfObj.TempoCiclo.MaxIncrPz = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_MAX_INCR", "5").Replace(".", ",")); // Server - string MpIp=fIni.ReadString("SERVER", "MPIP", "::1"); + string MpIp = fIni.ReadString("SERVER", "MPIP", "::1"); if (!string.IsNullOrEmpty(MpIp)) { newConfObj.ServerMES.Transport = MpIp.StartsWith("https://") ? "https" : "http"; newConfObj.ServerMES.IpAddr = MpIp.Replace($"{newConfObj.ServerMES.Transport}://", ""); // tolgo http/https... } - //newConfObj.ServerMES.Commands.Alive - + // Altro (versione, ...) - newConfObj.ReleaseVers = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); + newConfObj.ReleaseVers = $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}"; newConfObj.IobManConf.MinDeltaSec = fIni.ReadInteger("IOB", "MinDeltaSec", 6); // OptPar @@ -101,7 +102,7 @@ namespace IobConf.Core } catch (Exception exc) { - //newConfObj.lgError(string.Format("EXCEPTION in fase di lettura OPTPAR: {0}{1}", Environment.NewLine, exc)); + newConfObj.lgError(string.Format("EXCEPTION in fase di lettura OPTPAR: {0}{1}", Environment.NewLine, exc)); } } // riordino alfabeticamente diff --git a/MP.FileData/MP.FileData.csproj b/MP.FileData/MP.FileData.csproj index 287fa655..529ef021 100644 --- a/MP.FileData/MP.FileData.csproj +++ b/MP.FileData/MP.FileData.csproj @@ -5,19 +5,21 @@ - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index f9e55a89..904d1238 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -52,7 +52,7 @@ - + diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index 536bb21c..b6682b6e 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.16.2209.2118 + 6.16.2302.1317 @@ -29,9 +29,8 @@ - - - + + diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html index 51fe82f4..9cee4eff 100644 --- a/MP.Mon/Resources/ChangeLog.html +++ b/MP.Mon/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.16.2209.2118

+

Versione: 6.16.2302.1317


Note di rilascio:
  • diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt index ebf3f94a..a0e080d2 100644 --- a/MP.Mon/Resources/VersNum.txt +++ b/MP.Mon/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2209.2118 +6.16.2302.1317 diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml index 13b33d6f..e3b998f3 100644 --- a/MP.Mon/Resources/manifest.xml +++ b/MP.Mon/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2209.2118 + 6.16.2302.1317 https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html false diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index ae8af523..03a4f522 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net6.0 MP.Prog - 6.16.2212.2917 + 6.16.2302.1317 @@ -17,14 +17,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + + diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index 88f38ae0..be3c27d3 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

    Versione: 6.16.2212.2917

    +

    Versione: 6.16.2302.1317


    Note di rilascio:
      diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index 2641f650..a0e080d2 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2212.2917 +6.16.2302.1317 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index 966edd03..21989afb 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2212.2917 + 6.16.2302.1317 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false