diff --git a/Jenkinsfile b/Jenkinsfile index fe5300a..da4df07 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=683']) { + withEnv(['NEXT_BUILD_NUMBER=684']) { // env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/SteamWareLib/ExtLibrary/ICSharpCode.SharpZipLib.dll b/SteamWareLib/ExtLibrary/ICSharpCode.SharpZipLib.dll deleted file mode 100644 index fe643eb..0000000 Binary files a/SteamWareLib/ExtLibrary/ICSharpCode.SharpZipLib.dll and /dev/null differ diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index b2d9413..2308508 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -293,7 +293,6 @@ DS_devices.xsd - DS_Utility.xsd @@ -365,6 +364,7 @@ + diff --git a/SteamWareLib/example-config-table.txt b/SteamWareLib/example-config-table.txt index 5244f15..dd0ab8e 100644 --- a/SteamWareLib/example-config-table.txt +++ b/SteamWareLib/example-config-table.txt @@ -16,7 +16,7 @@ _useAIMSmtp false false impiego client posta elettronica alternativo _useAuthSmtp true true true AuthCookieName admodellingAuth admodellingAuth Cookie applicativo autoConfCmd true true Conferma automatica comandi barcode -baseUrl http://iis02/test/admodelling http://iis02/test/admodelling URL base del sito +baseUrl http://site_name http://iis02/site_name URL base del sito cacheValSec 60 60 Validità cache dati in gestore Barcode cookieDayExp 365 365 Periodo validità cookie cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati @@ -25,6 +25,6 @@ enableLogOut true false Abilita button logout COMPLETO in alto a sx enablePlain true true Abilitazione decode plain maxAuth 1000 1000 num auth minimo per NON consumare tokens serializeSession true true Serializzazione valori in sessione (REDIS) -SiteName iis02/test/admodelling iis02/test/admodelling Nome sito +SiteName iis02/site_name iis02/site_name Nome sito enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default doShrinkFolder true true Imposta compressione area LOGS \ No newline at end of file