diff --git a/Jenkinsfile b/Jenkinsfile index e4bcf47..5b2e1cc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=619']) { + withEnv(['NEXT_BUILD_NUMBER=620']) { // env.versionNumber = VersionNumber(versionNumberString : '3.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SteamWareLib' diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index c2d164b..ea5d822 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -61,6 +61,9 @@ favicon.ico + + true + ..\packages\AjaxControlToolkit.18.1.0\lib\net40\AjaxControlToolkit.dll @@ -311,11 +314,4 @@ - \ No newline at end of file diff --git a/SteamWareLib/UserControl.cs b/SteamWareLib/UserControl.cs index 38c2313..fbd106d 100644 --- a/SteamWareLib/UserControl.cs +++ b/SteamWareLib/UserControl.cs @@ -110,6 +110,7 @@ namespace SteamWare } catch (Exception exc) { + logger.lg.scriviLog(string.Format("Errore isWriteEnabled{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); } return answ; } diff --git a/SteamWareLib/user_std.cs b/SteamWareLib/user_std.cs index 21b8664..c1170bc 100644 --- a/SteamWareLib/user_std.cs +++ b/SteamWareLib/user_std.cs @@ -1,7 +1,5 @@ -using Newtonsoft.Json; using System; using System.Collections.Generic; -using System.Data; namespace SteamWare { @@ -167,7 +165,11 @@ namespace SteamWare _lingua = rigaUtente.COD_LINGUA; } catch { } - if (_lingua == "") _lingua = "IT"; + if (_lingua == "") + { + _lingua = "IT"; + } + lingua = _lingua; } @@ -417,7 +419,7 @@ namespace SteamWare } catch (Exception exc) { - logger.lg.scriviLog("Errore recupero lingua utente", tipoLog.EXCEPTION); + logger.lg.scriviLog(string.Format("Errore recupero lingua utente{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); } if (answ == "") { @@ -642,7 +644,11 @@ namespace SteamWare } } } - if (currRunMode == runModes.echoLemmi) logger.lg.scriviLog(lemma, tipoLog.LEMMA); + if (currRunMode == runModes.echoLemmi) + { + logger.lg.scriviLog(lemma, tipoLog.LEMMA); + } + return answ; }