diff --git a/Jenkinsfile b/Jenkinsfile index 5ef6484c..6efa0632 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1213']) { + withEnv(['NEXT_BUILD_NUMBER=1215']) { // env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 760d2ba0..098a4157 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -103,8 +103,8 @@ ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll diff --git a/MP-ADM/Web.config b/MP-ADM/Web.config index 858c5252..624ec383 100644 --- a/MP-ADM/Web.config +++ b/MP-ADM/Web.config @@ -313,6 +313,10 @@ + + + + diff --git a/MP-ADM/packages.config b/MP-ADM/packages.config index e382ba46..4c248d8b 100644 --- a/MP-ADM/packages.config +++ b/MP-ADM/packages.config @@ -34,6 +34,6 @@ - + \ No newline at end of file diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 35d7c6d6..abab82af 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -95,8 +95,8 @@ ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 6c153de6..34719347 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -294,6 +294,10 @@ + + + + diff --git a/MP-IO/packages.config b/MP-IO/packages.config index ae4360c0..cd56df9a 100644 --- a/MP-IO/packages.config +++ b/MP-IO/packages.config @@ -25,5 +25,5 @@ - + \ No newline at end of file diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index accee7a2..5124d48f 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -98,8 +98,8 @@ ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll diff --git a/MP-LAND/Web.config b/MP-LAND/Web.config index 96592dfe..14d13556 100644 --- a/MP-LAND/Web.config +++ b/MP-LAND/Web.config @@ -314,6 +314,10 @@ + + + + diff --git a/MP-LAND/packages.config b/MP-LAND/packages.config index f482c265..02771e9f 100644 --- a/MP-LAND/packages.config +++ b/MP-LAND/packages.config @@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj index 044dd0f0..4c952702 100644 --- a/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON.csproj @@ -98,8 +98,8 @@ ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll diff --git a/MP-MON/Web.config b/MP-MON/Web.config index 9ee5e5ed..8001cad8 100644 --- a/MP-MON/Web.config +++ b/MP-MON/Web.config @@ -306,6 +306,10 @@ + + + + diff --git a/MP-MON/packages.config b/MP-MON/packages.config index 0a7ddb58..9db307b6 100644 --- a/MP-MON/packages.config +++ b/MP-MON/packages.config @@ -28,6 +28,6 @@ - + \ No newline at end of file diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index e4dedeac..834469ef 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -101,8 +101,8 @@ ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll diff --git a/MP-Site/Web.config b/MP-Site/Web.config index 316a9005..c7d5af6e 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -322,6 +322,10 @@ + + + + diff --git a/MP-Site/packages.config b/MP-Site/packages.config index 15377f5a..d7687fd2 100644 --- a/MP-Site/packages.config +++ b/MP-Site/packages.config @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index ca589634..5db2f2d8 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -160,8 +160,8 @@ ..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config index bdab6a92..6caf8336 100644 --- a/MP-TAB/Web.config +++ b/MP-TAB/Web.config @@ -313,6 +313,10 @@ + + + + diff --git a/MP-TAB/fixODL.aspx.cs b/MP-TAB/fixODL.aspx.cs index bd25a3f0..4efeef8c 100644 --- a/MP-TAB/fixODL.aspx.cs +++ b/MP-TAB/fixODL.aspx.cs @@ -197,14 +197,8 @@ namespace MoonProTablet { logger.lg.scriviLog(string.Format("Errore recupero ODL corrente da confermare per la macchina {0}{1}{2}", idxMacchina, Environment.NewLine, exc), tipoLog.ERROR); } - //if (odlOk) - //{ + // forzo COMUNQUE redirect... Response.Redirect("ODL"); - //} - //else - //{ - // mod_dettMacchina1.doUpdate(); - //} } } } \ No newline at end of file diff --git a/MP-TAB/packages.config b/MP-TAB/packages.config index 3e74290d..c6c19258 100644 --- a/MP-TAB/packages.config +++ b/MP-TAB/packages.config @@ -35,6 +35,6 @@ - + \ No newline at end of file