Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forzato update nuget x data e terminus...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-07-05 17:36:01 +02:00
parent e2dad21630
commit bbe0ccc8e1
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW_Term/GMW_Term.csproj
+4 -4
View File
@@ -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" />
GMW_Term/Web.config
+1 -4
View File
@@ -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>
GMW_Term/packages.config
+2 -2
View File
@@ -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>
Jenkinsfile
Vendored
+5 -5
View File
@@ -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") {