From bbe0ccc8e1131bf7675bd3971c75e06f032b84a6 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 5 Jul 2018 17:36:01 +0200
Subject: [PATCH] forzato update nuget x data e terminus...

---
 GMW_Term/GMW_Term.csproj |  8 ++++----
 GMW_Term/Web.config      |  5 +----
 GMW_Term/packages.config |  4 ++--
 Jenkinsfile              | 10 +++++-----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/GMW_Term/GMW_Term.csproj b/GMW_Term/GMW_Term.csproj
index 47ddd157..7129ddd4 100644
--- a/GMW_Term/GMW_Term.csproj
+++ b/GMW_Term/GMW_Term.csproj
@@ -194,11 +194,11 @@
     <Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.2.2.5\lib\net40\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
     </Reference>
-    <Reference Include="StackExchange.Redis, Version=1.2.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StackExchange.Redis.1.2.4\lib\net46\StackExchange.Redis.dll</HintPath>
+    <Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net46\StackExchange.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="StackExchange.Redis.StrongName, Version=1.2.4.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
-      <HintPath>..\packages\StackExchange.Redis.StrongName.1.2.4\lib\net46\StackExchange.Redis.StrongName.dll</HintPath>
+    <Reference Include="StackExchange.Redis.StrongName, Version=1.2.6.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
+      <HintPath>..\packages\StackExchange.Redis.StrongName.1.2.6\lib\net46\StackExchange.Redis.StrongName.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/GMW_Term/Web.config b/GMW_Term/Web.config
index 4e7729f4..c9134759 100644
--- a/GMW_Term/Web.config
+++ b/GMW_Term/Web.config
@@ -146,9 +146,6 @@
   <connectionStrings>
     <add name="GMW_data.Properties.Settings.GMWConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=TK_GMW;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
   </connectionStrings>
-
-
-
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
     <modules>
@@ -189,7 +186,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="StackExchange.Redis.StrongName" publicKeyToken="c219ff1ca8c2ce46" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.6.0" newVersion="1.2.6.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/GMW_Term/packages.config b/GMW_Term/packages.config
index 0fdc5bc4..47d4cad7 100644
--- a/GMW_Term/packages.config
+++ b/GMW_Term/packages.config
@@ -6,6 +6,6 @@
   <package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net462" />
   <package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net462" />
   <package id="Microsoft.Web.RedisSessionStateProvider" version="2.2.5" targetFramework="net462" />
-  <package id="StackExchange.Redis" version="1.2.4" targetFramework="net462" />
-  <package id="StackExchange.Redis.StrongName" version="1.2.4" targetFramework="net462" />
+  <package id="StackExchange.Redis" version="1.2.6" targetFramework="net462" />
+  <package id="StackExchange.Redis.StrongName" version="1.2.6" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 3471b82e..47b277f9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
       steps {
         /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
         script {
-          withEnv(['NEXT_BUILD_NUMBER=2667']) {
+          withEnv(['NEXT_BUILD_NUMBER=2669']) {
             // impiego numero di build del SINGOLO RAMO
             // env.versionNumber = VersionNumber(versionNumberString : '3.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
             // forzo numero di build x tutti  rami uguali
@@ -30,9 +30,9 @@ pipeline {
 			steps {
 				// CAMBIO numero versione in file sorgente + recupero packages
         bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\GMW.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
+        bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Data.sln"
         bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW.sln"
-        // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Data.sln"
-        // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Terminus.sln"
+        bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Terminus.sln"
 				script {
 					/* compilo installers in base al BRANCH del cliente... */
 					if (env.BRANCH_NAME == "develop") {
@@ -77,9 +77,9 @@ pipeline {
 			steps {
 				// CAMBIO numero versione in file sorgente + recupero packages
         bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\GMW.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
+        bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Data.sln"
         bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW.sln"
-        // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Data.sln"
-        // bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Terminus.sln"
+        bat "e:\\nuget.exe restore ${WORKSPACE}\\GMW_Terminus.sln"
 				script {
 					/* DEPLOY condizionale: develop / master */
 					if (env.BRANCH_NAME == "develop") {