From f7c3cb60d3693e4f06109ff15fc3d56d605e82ef Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 28 Aug 2019 17:51:12 +0200 Subject: [PATCH] Refresh pacchetti --- AppData/AppData.csproj | 2 +- AppData/app.config | 4 +- AppData/packages.config | 2 +- Jenkinsfile | 4 +- NKC_WF/NKC_WF.csproj | 9 +- NKC_WF/Web.config | 434 ++++++++++++++++++++-------------------- NKC_WF/packages.config | 2 +- 7 files changed, 227 insertions(+), 230 deletions(-) diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj index 194ae76..a9d616b 100644 --- a/AppData/AppData.csproj +++ b/AppData/AppData.csproj @@ -44,7 +44,7 @@ ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Pipelines.Sockets.Unofficial.2.0.22\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.0.25\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll diff --git a/AppData/app.config b/AppData/app.config index 6f9fb4b..c9adfa6 100644 --- a/AppData/app.config +++ b/AppData/app.config @@ -3,9 +3,7 @@ - + diff --git a/AppData/packages.config b/AppData/packages.config index a4dbf58..da48877 100644 --- a/AppData/packages.config +++ b/AppData/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Jenkinsfile b/Jenkinsfile index b392552..3839fee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,8 +18,8 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { withEnv(['NEXT_BUILD_NUMBER=74']) { - // env.versionNumber = VersionNumber(versionNumberString : '0.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '0.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + env.versionNumber = VersionNumber(versionNumberString : '0.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) + // env.versionNumber = VersionNumber(versionNumberString : '0.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'NKC' } } diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index f6ba8f9..e88bba1 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -59,6 +59,9 @@ ..\packages\Microsoft.AspNet.SessionState.SessionStateModule.1.1.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll + + ..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -70,7 +73,7 @@ packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\Pipelines.Sockets.Unofficial.2.0.22\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.0.25\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll @@ -141,10 +144,6 @@ True packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - True - packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll - packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 040ea14..ed3e893 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -1,4 +1,4 @@ - +