Merge branch 'develop'

Jenkinsfile

@@ -7,7 +7,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=744']) {
+        withEnv(['NEXT_BUILD_NUMBER=746']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')

SteamWareLib/SteamWare.csproj

@@ -123,6 +123,9 @@
     <Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
       <HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
     </Reference>
+    <Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll</HintPath>
+    </Reference>
     <Reference Include="System">
       <HintPath>c:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll</HintPath>
     </Reference>
@@ -447,12 +450,6 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SteamWare.Logger\SteamWare.Logger.csproj">
-      <Project>{97a9f482-c173-4f0f-9f8f-7bb41c59cdd6}</Project>
-      <Name>SteamWare.Logger</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

SteamWareLib/memLayer.cs

@@ -1222,6 +1222,20 @@ namespace SteamWare
             {
                 try
                 {
+                    // cerco come key...
+                    var redVal = getRSV(redHash(nomeVar));
+                    answ = !string.IsNullOrEmpty(redVal);
+                    if (!answ)
+                    {
+                        answ = redKeyPresent(redHash(nomeVar));
+                        // cerco come variabile se NON trovata...
+                        if (!answ)
+                        {
+                            // cerco come hash...
+                            answ = redHashPresent(redHash(nomeVar));
+                        }
+                    }
+#if false
                     // cerco come key...
                     answ = redKeyPresent(redHash(nomeVar));
                     if (!answ)
@@ -1233,8 +1247,9 @@ namespace SteamWare
                     if (!answ)
                     {
                         var redVal = getRSV(redHash(nomeVar));
-                        answ = redVal != null && redVal != "";
+                        answ = !string.IsNullOrEmpty(redVal);
                     }
+#endif
                 }
                 catch (Exception exc)
                 {

SteamWareLib/packages.config

@@ -19,6 +19,7 @@
   <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.1.58" targetFramework="net462" />
+  <package id="SteamWare.Logger" version="5.0.2010.745" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
   <package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />

TestBench/MainFOrm.cs

@@ -33,16 +33,12 @@ namespace TestBench
 
         #endregion Public Constructors
 
-
-
         #region Private Delegates
 
         private delegate void SetTextCallback(string text);
 
         #endregion Private Delegates
 
-
-
         #region Private Methods
 
         private void actionTimer_Tick(object sender, EventArgs e)
@@ -249,7 +245,7 @@ namespace TestBench
         private void txtChannelSend_KeyPress(object sender, KeyPressEventArgs e)
         {
             // cerco Enter
-            if (e.KeyChar == (char)13)
+           if (e.KeyChar == (char)13)
             {
                 // invio
                 subscriber.Publish("TestChannel", $"{DateTime.Now} | {txtChannelSend.Text}");