Merge branch 'release/ReloadConfFix'

Fix problema lettura NKC_WFConnectionString
Merge tag 'FixAppConf' into develop
2021-08-11 16:01:18 +02:00 · 2021-08-11 16:00:48 +02:00 · 2021-08-11 15:33:02 +02:00 · 2021-08-11 15:32:52 +02:00 · 2021-08-11 15:31:17 +02:00 · 2021-08-11 11:44:24 +02:00
10 changed files with 95 additions and 75 deletions
@@ -51,8 +51,8 @@
    <Reference Include="Crc32C.NET, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll</HintPath>
    </Reference>
-    <Reference Include="DnsClient, Version=1.4.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
-      <HintPath>..\packages\DnsClient.1.4.0\lib\net45\DnsClient.dll</HintPath>
+    <Reference Include="DnsClient, Version=1.5.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
+      <HintPath>..\packages\DnsClient.1.5.0\lib\net45\DnsClient.dll</HintPath>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
      <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -72,17 +72,17 @@
    <Reference Include="Microsoft.ReportViewer.WinForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.ReportViewer.Runtime.WinForms.12.0.2402.15\lib\Microsoft.ReportViewer.WinForms.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Bson, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.12.4\lib\net452\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.13.1\lib\net452\MongoDB.Bson.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.12.4\lib\net452\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.13.1\lib\net452\MongoDB.Driver.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.12.4\lib\net452\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.13.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
+    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.2\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -106,13 +106,15 @@
      <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.2.4\lib\net461\StackExchange.Redis.dll</HintPath>
+      <HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
    </Reference>
-    <Reference Include="SteamWare, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.5.1.2107.759\lib\net462\SteamWare.dll</HintPath>
+    <Reference Include="SteamWare, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.5.1.2108.1115\lib\net462\SteamWare.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="SteamWare.Logger, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.Logger.5.1.2107.759\lib\net462\SteamWare.Logger.dll</HintPath>
+    <Reference Include="SteamWare.Logger, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.Logger.5.1.2108.1115\lib\net462\SteamWare.Logger.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -184,6 +186,9 @@
      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Web" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml.Linq" />
@@ -278,10 +283,10 @@
      <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets'))" />
  </Target>
  <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')" />
-  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" />
-  <Import Project="..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" />
+  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" />
+  <Import Project="..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" />
 </Project>
@@ -56,8 +56,8 @@ namespace AppData
        public DS_AppTableAdapters.StatusDecodeTableAdapter taStatDec;
        public DS_AppTableAdapters.StatusLogTableAdapter taStatLog;
        public DS_AppTableAdapters.StackListTableAdapter taSTL;
-        public DS_AppTableAdapters.UnloadStatsTableAdapter taUS;
        public DS_AppTableAdapters.UpdManTableAdapter taUpdMan;
+        public DS_AppTableAdapters.UnloadStatsTableAdapter taUS;

        #endregion Public Fields

@@ -210,7 +210,7 @@ namespace AppData

        private void setupConnString()
        {
-            string connString = memLayer.ML.CRS("NKC_WFConnectionString");
+            string connString = memLayer.ML.confReadString("NKC_WFConnectionString");
            taBL.Connection.ConnectionString = connString;
            taBN.Connection.ConnectionString = connString;
            taBNLS.Connection.ConnectionString = connString;
@@ -45,7 +45,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.2.0" newVersion="1.3.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
@@ -3,15 +3,15 @@
  <package id="AIM" version="1.1.0" targetFramework="net462" />
  <package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
  <package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
-  <package id="DnsClient" version="1.4.0" targetFramework="net462" />
+  <package id="DnsClient" version="1.5.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net462" />
  <package id="Microsoft.ReportViewer.Runtime.Common" version="12.0.2402.15" targetFramework="net462" />
  <package id="Microsoft.ReportViewer.Runtime.WinForms" version="12.0.2402.15" targetFramework="net462" />
-  <package id="MongoDB.Bson" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver.Core" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Libmongocrypt" version="1.2.1" targetFramework="net462" />
+  <package id="MongoDB.Bson" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver.Core" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Libmongocrypt" version="1.2.2" targetFramework="net462" />
  <package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
  <package id="NLog" version="4.7.10" targetFramework="net462" />
@@ -20,9 +20,9 @@
  <package id="SharpCompress" version="0.28.3" targetFramework="net462" />
  <package id="SharpZipLib" version="1.3.2" targetFramework="net462" />
  <package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
-  <package id="StackExchange.Redis" version="2.2.4" targetFramework="net462" />
-  <package id="SteamWare" version="5.1.2107.759" targetFramework="net462" />
-  <package id="SteamWare.Logger" version="5.1.2107.759" targetFramework="net462" />
+  <package id="StackExchange.Redis" version="2.2.62" targetFramework="net462" />
+  <package id="SteamWare" version="5.1.2108.1115" targetFramework="net462" />
+  <package id="SteamWare.Logger" version="5.1.2108.1115" targetFramework="net462" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
  <package id="System.Diagnostics.PerformanceCounter" version="5.0.1" targetFramework="net462" />
  <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
@@ -40,4 +40,5 @@
  <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net462" />
  <package id="System.Threading.Channels" version="5.0.0" targetFramework="net462" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>
@@ -66,8 +66,8 @@
    <Reference Include="Crc32C.NET, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll</HintPath>
    </Reference>
-    <Reference Include="DnsClient, Version=1.4.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
-      <HintPath>..\packages\DnsClient.1.4.0\lib\net45\DnsClient.dll</HintPath>
+    <Reference Include="DnsClient, Version=1.5.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
+      <HintPath>..\packages\DnsClient.1.5.0\lib\net45\DnsClient.dll</HintPath>
    </Reference>
    <Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
@@ -91,17 +91,17 @@
    <Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Bson, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.12.4\lib\net452\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.13.1\lib\net452\MongoDB.Bson.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.12.4\lib\net452\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.13.1\lib\net452\MongoDB.Driver.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.12.4\lib\net452\MongoDB.Driver.Core.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.13.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
    </Reference>
-    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
+    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.2\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -125,13 +125,15 @@
      <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.2.4\lib\net461\StackExchange.Redis.dll</HintPath>
+      <HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
    </Reference>
-    <Reference Include="SteamWare, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.5.1.2107.759\lib\net462\SteamWare.dll</HintPath>
+    <Reference Include="SteamWare, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.5.1.2108.1115\lib\net462\SteamWare.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="SteamWare.Logger, Version=5.1.2107.759, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.Logger.5.1.2107.759\lib\net462\SteamWare.Logger.dll</HintPath>
+    <Reference Include="SteamWare.Logger, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.Logger.5.1.2108.1115\lib\net462\SteamWare.Logger.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -207,6 +209,9 @@
      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Web.Extensions" />
    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
@@ -1919,8 +1924,8 @@
    <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets'))" />
    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets'))" />
  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
@@ -1948,6 +1953,6 @@
  <Import Project="..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets')" />
  <Import Project="..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" />
  <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" />
-  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" />
-  <Import Project="..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.12.4\build\MongoDB.Driver.Core.targets')" />
+  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" />
+  <Import Project="..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" />
 </Project>
@@ -28,7 +28,7 @@
        <sessionState mode="Custom" customProvider="MySessionStateStore">
            <providers>
                <add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false"
-                    applicationName="NKC" databaseId="2" timeout="120"/>
+                    applicationName="NKC" databaseId="2" timeout="480"/>
            </providers>
        </sessionState>
        <httpModules>
@@ -59,6 +59,7 @@
        <add key="copyRight" value="Egaltech &amp; Steamware "/>
        <add key="authSenzaDominio" value="true"/>
        <add key="_safePages" value="Test#Home#Default"/>
+        <add key="_righeDataGridAnagr" value="20"/>
        <add key="BaseUrl" value="http://IIS02/NKC"/>
        <!--Updater area-->
        <add key="downloadPath" value="c:\Steamware\installers\"/>
@@ -392,7 +393,7 @@
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.3.2.0" newVersion="1.3.2.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0"/>
            </dependentAssembly>
            <dependentAssembly>
                <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
@@ -469,11 +470,11 @@
    </location>
    <system.codedom>
        <compilers>
-      <compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.0 /nowarn:1659;1699;1701;612;618"
-          type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-      <compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4"
-          compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
-          type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-    </compilers>
+            <compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.0 /nowarn:1659;1699;1701;612;618"
+                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+            <compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4"
+                compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
+                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        </compilers>
    </system.codedom>
 </configuration>
@@ -2,12 +2,11 @@ using SteamWare;
 using System;
 using System.Web.UI.WebControls;

-
 namespace NKC_WF.WebUserControls
 {
    public partial class mod_lemmiVocab : ApplicationUserControl
    {
-        #region protected
+        #region Protected Methods

        protected override void aggiornaControlliDataGL()
        {
@@ -20,7 +19,7 @@ namespace NKC_WF.WebUserControls
            if (grView.Rows.Count > 0)
            {
                LinkButton lb;
-                // aggiorno gli headers        
+                // aggiorno gli headers
                foreach (TableCell cella in grView.HeaderRow.Cells)
                {
                    try
@@ -39,6 +38,11 @@ namespace NKC_WF.WebUserControls
                lblNumRec.Text = "";
            }
        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
        /// <summary>
        /// aggiorna i dati mostrati
        /// </summary>
@@ -48,6 +52,6 @@ namespace NKC_WF.WebUserControls
            grView.DataBind();
        }

-        #endregion
+        #endregion Public Methods
    }
 }
@@ -8,7 +8,7 @@
  <package id="bootstrap" version="4.6.0" targetFramework="net462" />
  <package id="Chart.js" version="2.9.3" targetFramework="net462" />
  <package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
-  <package id="DnsClient" version="1.4.0" targetFramework="net462" />
+  <package id="DnsClient" version="1.5.0" targetFramework="net462" />
  <package id="elmah" version="1.2.2" targetFramework="net462" />
  <package id="elmah.corelibrary" version="1.2.2" targetFramework="net462" />
  <package id="FontAwesome" version="4.7.0" targetFramework="net462" />
@@ -45,10 +45,10 @@
  <package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
  <package id="Modernizr" version="2.8.3" targetFramework="net462" />
  <package id="Moment.js" version="2.29.1" targetFramework="net462" />
-  <package id="MongoDB.Bson" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Driver.Core" version="2.12.4" targetFramework="net462" />
-  <package id="MongoDB.Libmongocrypt" version="1.2.1" targetFramework="net462" />
+  <package id="MongoDB.Bson" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Driver.Core" version="2.13.1" targetFramework="net462" />
+  <package id="MongoDB.Libmongocrypt" version="1.2.2" targetFramework="net462" />
  <package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
  <package id="NLog" version="4.7.10" targetFramework="net462" />
@@ -58,9 +58,9 @@
  <package id="SharpCompress" version="0.28.3" targetFramework="net462" />
  <package id="SharpZipLib" version="1.3.2" targetFramework="net462" />
  <package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
-  <package id="StackExchange.Redis" version="2.2.4" targetFramework="net462" />
-  <package id="SteamWare" version="5.1.2107.759" targetFramework="net462" />
-  <package id="SteamWare.Logger" version="5.1.2107.759" targetFramework="net462" />
+  <package id="StackExchange.Redis" version="2.2.62" targetFramework="net462" />
+  <package id="SteamWare" version="5.1.2108.1115" targetFramework="net462" />
+  <package id="SteamWare.Logger" version="5.1.2108.1115" targetFramework="net462" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
  <package id="System.Diagnostics.PerformanceCounter" version="5.0.1" targetFramework="net462" />
  <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
@@ -78,5 +78,6 @@
  <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net462" />
  <package id="System.Threading.Channels" version="5.0.0" targetFramework="net462" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
  <package id="WebGrease" version="1.6.0" targetFramework="net462" />
 </packages>
@@ -104,12 +104,15 @@ namespace NKC_WF
            get
            {
                bool answ = false;
-                try
+                if (BatchId > 0)
                {
-                    answ = DLMan.taIL.getMissingByBatch(BatchId).Count > 0;
+                    try
+                    {
+                        answ = DLMan.taIL.getMissingByBatch(BatchId).Count > 0;
+                    }
+                    catch
+                    { }
                }
-                catch
-                { }
                return answ;
            }
        }
@@ -11,7 +11,7 @@ set baseBranch=%1
 set pushRemote=%2

 git push . %baseBranch%:develop
-git push . %baseBranch%:master
+REM git push . %baseBranch%:master
 git push . %baseBranch%:SDK
 git push . %baseBranch%:report
 git push . %baseBranch%:stable
@@ -20,7 +20,7 @@ REM Faccio push remoto condizionale
 if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:%baseBranch% )
 if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop )
 if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:SDK )
-if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:master )
+REM if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:master )
 if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:stable )
 if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:report )
Author	SHA1	Message	Date
Samuele Locatelli	73cabee7ee	Merge branch 'release/ReloadConfFix'	2021-08-11 16:01:18 +02:00
Samuele Locatelli	18992da8bf	Fix problema lettura NKC_WFConnectionString	2021-08-11 16:00:48 +02:00
Samuele Locatelli	d4eabe8edd	Merge tag 'FixAppConf' into develop Rilascio produzione (master)	2021-08-11 15:33:02 +02:00
Samuele Locatelli	ba88680aa1	Merge branch 'release/FixAppConf'	2021-08-11 15:32:52 +02:00
Samuele Locatelli	dff09fc549	Update x fix librerie steamwarelibs	2021-08-11 15:31:17 +02:00
Samuele Locatelli	2e24c01bd9	rimozione error page specifiche (usa Oops.. )	2021-08-11 11:44:24 +02:00
Samuele Locatelli	f60f5868ca	Aumento stato sessione da 120 a 480 minuti (redis)	2021-08-11 11:43:25 +02:00
Samuele Locatelli	0c7841e8d8	Merge tag 'FixdllAndVocabolario' into develop Fix minori vocabolario e dll inserite x errore	2021-08-11 09:09:47 +02:00
Samuele Locatelli	7571b732eb	Merge branch 'release/FixdllAndVocabolario'	2021-08-11 09:09:30 +02:00
Samuele Locatelli	fb610a6738	fix dll inserite in root x errore da nuget + fix vocabolario	2021-08-11 09:09:06 +02:00
Samuele Locatelli	1a28398470	review gitSpread (NON forza il master)	2021-08-11 08:58:30 +02:00
Samuele Locatelli	affaccc1e5	Merge tag 'NugetUpdateSteamwareLibs' into develop Upgrade pacchetti Nuget generico, ma in particolare le steamware libs x errore restart multiplo reload conf redis x app config	2021-08-11 08:57:27 +02:00
Samuele Locatelli	fb780c3328	Merge branch 'release/NugetUpdateSteamwareLibs'	2021-08-11 08:56:47 +02:00
Samuele Locatelli	3ce630a683	refresh	2021-08-11 08:55:19 +02:00
Samuele Locatelli	2f1e11072c	update nuget DNSClient	2021-08-11 08:55:14 +02:00
Samuele Locatelli	6ac8959b37	update nuget Mongo	2021-08-11 08:54:55 +02:00
Samuele Locatelli	963aa925bd	refresh redis lib	2021-08-11 08:49:15 +02:00
Samuele Locatelli	cfd7788f71	space refresh	2021-08-11 08:48:37 +02:00
Samuele Locatelli	2865795574	Update librerie steamware x reload conf redis	2021-08-11 08:47:51 +02:00
Samuele Locatelli	66d16ed021	piccolo check preliminare	2021-08-11 08:46:23 +02:00