diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj index f25c2ad..5c9f563 100644 --- a/AppData/AppData.csproj +++ b/AppData/AppData.csproj @@ -42,20 +42,23 @@ MinimumRecommendedRules.ruleset - - ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll + + ..\packages\AIM.1.1.0\lib\netstandard2.0\AegisImplicitMail.dll - - ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll + + ..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - - ..\packages\DnsClient.1.2.0\lib\net45\DnsClient.dll + + ..\packages\DnsClient.1.3.2\lib\net45\DnsClient.dll - - ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.Common.dll @@ -69,14 +72,14 @@ ..\packages\Microsoft.ReportViewer.Runtime.WinForms.12.0.2402.15\lib\Microsoft.ReportViewer.WinForms.dll - - ..\packages\MongoDB.Bson.2.10.2\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.11.4\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.10.2\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.11.4\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.10.2\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.11.4\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll @@ -85,7 +88,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.6.8\lib\net45\NLog.dll + ..\packages\NLog.4.7.5\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -94,43 +97,55 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.2.0\lib\net461\Pipelines.Sockets.Unofficial.dll - - ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll + + ..\packages\SharpCompress.0.26.0\lib\net46\SharpCompress.dll ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.2.4\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.2001.709\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.0.2012.750\lib\net462\SteamWare.dll + + + ..\packages\SteamWare.Logger.5.0.2011.746\lib\net462\SteamWare.Logger.dll - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.5.0.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - - ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + + + ..\packages\System.IO.Pipelines.5.0.0\lib\net461\System.IO.Pipelines.dll - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -138,12 +153,32 @@ True + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Pkcs.5.0.0\lib\net461\System.Security.Cryptography.Pkcs.dll + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + - - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -152,7 +187,6 @@ - @@ -230,7 +264,13 @@ + + + + + + @@ -240,6 +280,8 @@ + + \ No newline at end of file diff --git a/AppData/DS_Report.Designer.cs b/AppData/DS_Report.Designer.cs index 636e9ad..f904ef4 100644 --- a/AppData/DS_Report.Designer.cs +++ b/AppData/DS_Report.Designer.cs @@ -6934,7 +6934,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@queue", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_PJQ_getFirtsByUdc"; + this._commandCollection[4].CommandText = "dbo.stp_PJQ_getFirtsByParam"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@keyParam", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/AppData/DS_Report.xsd b/AppData/DS_Report.xsd index e475933..593db39 100644 --- a/AppData/DS_Report.xsd +++ b/AppData/DS_Report.xsd @@ -149,8 +149,8 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - - dbo.stp_PJQ_getFirtsByUdc + + dbo.stp_PJQ_getFirtsByParam @@ -495,7 +495,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -527,7 +527,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -559,7 +559,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -586,7 +586,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -653,7 +653,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -681,7 +681,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -720,7 +720,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -766,7 +766,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -815,7 +815,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + @@ -895,7 +895,7 @@ SELECT codPostazione, stampante, note FROM ElencoPostazioni WHERE (codPostazione - + diff --git a/AppData/DS_Report.xss b/AppData/DS_Report.xss index 2536959..d9e475b 100644 --- a/AppData/DS_Report.xss +++ b/AppData/DS_Report.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - +