Merge branch 'release/ReloadConfFix'

Rilascio produzione (master)

AppData/AppData.csproj

@@ -108,11 +108,13 @@
     <Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
       <HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="SteamWare, Version=5.1.2108.1018, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SteamWare, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.5.1.2108.1018\lib\net462\SteamWare.dll</HintPath>
+      <HintPath>..\packages\SteamWare.5.1.2108.1115\lib\net462\SteamWare.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="SteamWare.Logger, Version=5.1.2108.1018, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SteamWare.Logger, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.Logger.5.1.2108.1018\lib\net462\SteamWare.Logger.dll</HintPath>
+      <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">
@@ -255,8 +257,6 @@
     <None Include="DS_Report.xss">
       <DependentUpon>DS_Report.xsd</DependentUpon>
     </None>
-    <None Include="libmongocrypt.dylib" />
-    <None Include="libmongocrypt.so" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -276,10 +276,6 @@
     <Content Include="Core\Compression\Snappy\lib\win\snappy32.dll" />
     <Content Include="Core\Compression\Snappy\lib\win\snappy64.dll" />
     <Content Include="Core\Compression\Zstandard\lib\win\libzstd.dll" />
-    <Content Include="libzstd.dll" />
-    <Content Include="mongocrypt.dll" />
-    <Content Include="snappy32.dll" />
-    <Content Include="snappy64.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

AppData/DataLayer.cs

@@ -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;

AppData/packages.config

@@ -21,8 +21,8 @@
   <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.62" targetFramework="net462" />
-  <package id="SteamWare" version="5.1.2108.1018" targetFramework="net462" />
+  <package id="SteamWare" version="5.1.2108.1115" targetFramework="net462" />
-  <package id="SteamWare.Logger" version="5.1.2108.1018" 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" />

NKC_WF/NKC_WF.csproj

@@ -127,11 +127,13 @@
     <Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
       <HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="SteamWare, Version=5.1.2108.1018, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SteamWare, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.5.1.2108.1018\lib\net462\SteamWare.dll</HintPath>
+      <HintPath>..\packages\SteamWare.5.1.2108.1115\lib\net462\SteamWare.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="SteamWare.Logger, Version=5.1.2108.1018, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SteamWare.Logger, Version=5.1.2108.1115, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.Logger.5.1.2108.1018\lib\net462\SteamWare.Logger.dll</HintPath>
+      <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>
@@ -310,8 +312,6 @@
     <Content Include="Images\999999999.svg" />
     <Content Include="Images\LogoEgalware.png" />
     <Content Include="Images\test.svg" />
-    <Content Include="libzstd.dll" />
-    <Content Include="mongocrypt.dll" />
     <Content Include="Resources\ChangeLog.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -346,8 +346,6 @@
     <Content Include="NLog.config" />
     <Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
     <Content Include="App_Readme\SteamWare_demo\example-app.config" />
-    <Content Include="libmongocrypt.so" />
-    <Content Include="libmongocrypt.dylib" />
     <None Include="Scripts\jquery-3.6.0.intellisense.js" />
     <Content Include="Scripts\jquery-3.6.0.js" />
     <Content Include="Scripts\jquery-3.6.0.min.js" />
@@ -478,8 +476,6 @@
     <Content Include="site\StackManager.aspx" />
     <Content Include="site\Unauth.aspx" />
     <Content Include="site\UpdMan.aspx" />
-    <Content Include="snappy32.dll" />
-    <Content Include="snappy64.dll" />
     <Content Include="WebUserControls\cmp_barcode.ascx" />
     <Content Include="WebUserControls\cmp_batchDetail.ascx" />
     <Content Include="WebUserControls\cmp_batchDetailData.ascx" />

NKC_WF/Web.config

@@ -27,7 +27,8 @@
         </pages>
         <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" />
+                <add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false"
+                    applicationName="NKC" databaseId="2" timeout="480"/>
             </providers>
         </sessionState>
         <httpModules>
@@ -58,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\"/>
@@ -85,13 +87,19 @@
         <!--Configurazioni DB per classi referenziate AppData e Steamware dll-->
         <add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
         <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
-        <add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <add key="VocabolarioConnectionString"
-        <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
-        <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <add key="UtenteCdcConnectionString"
+            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+        <add key="PermessiConnectionString"
+            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
     </appSettings>
     <connectionStrings>
-        <add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+        <add name="AppData.Properties.Settings.Sauder_NKCConnectionString"
-        <add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+            connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
+            providerName="System.Data.SqlClient"/>
+        <add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
+            providerName="System.Data.SqlClient"/>
     </connectionStrings>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -400,7 +408,9 @@
     <system.webServer>
         <modules>
             <remove name="Session"/>
-            <add name="Session" type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode" />
+            <add name="Session"
+                type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+                preCondition="integratedMode"/>
             <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler"/>
             <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler"/>
             <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler"/>
@@ -410,7 +420,8 @@
             <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
             <remove name="OPTIONSVerbHandler"/>
             <remove name="TRACEVerbHandler"/>
-            <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+            <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler"
+                preCondition="integratedMode,runtimeVersionv4.0"/>
         </handlers>
         <staticContent>
             <clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00"/>
@@ -459,8 +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=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.0 /nowarn:1659;1699;1701;612;618"
-      <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" />
+                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>

NKC_WF/WebUserControls/mod_lemmiVocab.ascx.cs

@@ -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()
         {
@@ -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
     }
 }

NKC_WF/packages.config

@@ -59,8 +59,8 @@
   <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.62" targetFramework="net462" />
-  <package id="SteamWare" version="5.1.2108.1018" targetFramework="net462" />
+  <package id="SteamWare" version="5.1.2108.1115" targetFramework="net462" />
-  <package id="SteamWare.Logger" version="5.1.2108.1018" 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" />

gitSpread.bat

@@ -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 )