diff --git a/Jenkinsfile b/Jenkinsfile index 57e4f4e..c45b1af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=308']) { + withEnv(['NEXT_BUILD_NUMBER=309']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 74ce879..a2574ff 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -67,8 +67,8 @@ ..\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.1\lib\net45\DnsClient.dll ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll @@ -82,6 +82,9 @@ ..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -89,14 +92,14 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.10.2\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.11.0\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.10.2\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.11.0\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.10.2\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.11.0\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll @@ -105,7 +108,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.3\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -114,7 +117,7 @@ ..\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.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -123,13 +126,13 @@ ..\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.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.2002.721\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.0.2003.734\lib\net462\SteamWare.dll - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -139,14 +142,22 @@ ..\packages\System.Diagnostics.PerformanceCounter.4.7.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.4.7.1\lib\netstandard2.0\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll @@ -155,7 +166,7 @@ ..\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.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -163,12 +174,32 @@ True + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll + ..\packages\System.Threading.Channels.4.7.1\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 @@ -253,6 +284,9 @@ SheetColor.css + + + @@ -1499,6 +1533,7 @@ + - - - - - - - + + + + + + + - - + + - - - - - - + + + + + + - + - - - + + + - + - - - + + + - + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - - + + - - - - - + + + + + - + - - - - + + + + @@ -399,20 +394,20 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - + - + worked, 2--> selected, 100--> parked... - switch (itemRow.StatusID) - { - case 0: - displError("ERROR: Item not ready", false); - break; - case 1: - case 2: - case 100: - // salvo che è in STATO 2 (picked up) - DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId); - doUpdate(); - break; - case 3: - displError("Item already on CART!", false); - break; - case 4: - // fino a concorrenza qta richiesta sposto, POI do errori - displError("ALL Item already scanned on BIN!", false); - break; - case 5: - displError("Item already at KIT STATION!", false); - break; - case 990: - displError("Item declared SCRAP!", false); - break; - case 991: - displError("Item declared SCRAP with CNC program created!", false); - break; - default: - displError("ERROR: Item status UNKNOWN!", false); - break; - } } lbtResetSel.Visible = (itemIdSelected != 0); } @@ -594,13 +419,6 @@ namespace NKC_WF.WebUserControls private void fixVisibility() { - // reset grafico -#if false - cmp_KS_Cart.Visible = cmp_KS_Cart.CartID > 0 && (cmp_KS_BinCart.BinID + cmp_KS_OtherItemsCart.OtherItemID == 0); - cmp_KS_BinCart.Visible = cmp_KS_BinCart.BinID > 0; - cmp_KS_OtherItemsCart.Visible = cmp_KS_OtherItemsCart.OtherItemID > 0; -#endif - // fix btn reset! lbtResetSel.Visible = (itemIdSelected != 0); } diff --git a/NKC_WF/packages.config b/NKC_WF/packages.config index 7008d54..d8172e2 100644 --- a/NKC_WF/packages.config +++ b/NKC_WF/packages.config @@ -7,7 +7,7 @@ - + @@ -32,6 +32,7 @@ + @@ -42,29 +43,35 @@ - - - + + + - + - + - - - + + + - + + + - + - - + + + + + + \ No newline at end of file