diff --git a/Jenkinsfile b/Jenkinsfile
index d2e6d27..17b316e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=663']) {
+ withEnv(['NEXT_BUILD_NUMBER=665']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.2.${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/ApplicationUserControl.cs b/SteamWareLib/ApplicationUserControl.cs
index 7173600..1b9ef8a 100644
--- a/SteamWareLib/ApplicationUserControl.cs
+++ b/SteamWareLib/ApplicationUserControl.cs
@@ -642,7 +642,7 @@ namespace SteamWare
_paginaCorrente = finalUrl[n - 1].ToString();
// tolgo .aspx!
_paginaCorrente = _paginaCorrente.Replace(".aspx", "");
- if (_paginaPrecedente == "" || _paginaPrecedente == null)
+ if (string.IsNullOrEmpty(_paginaPrecedente) || _paginaPrecedente == null)
{
_paginaPrecedente = _paginaCorrente;
memLayer.ML.setSessionVal("_paginaPrecedente", _paginaPrecedente);
@@ -756,7 +756,7 @@ namespace SteamWare
try
{
_dataFrom = _dataFrom.Replace(".", "/");
- if (_dataFrom == "")
+ if (string.IsNullOrEmpty(_dataFrom))
{
_dataFrom = "01/01/1900";
}
@@ -768,7 +768,7 @@ namespace SteamWare
try
{
_dataTo = _dataTo.Replace(".", "/");
- if (_dataTo == "")
+ if (string.IsNullOrEmpty(_dataTo))
{
_dataTo = "01/01/2200";
}
@@ -811,7 +811,7 @@ namespace SteamWare
try
{
_data = _data.Replace(".", "/");
- if (_data == "")
+ if (string.IsNullOrEmpty(_data))
{
_data = "01/01/1900";
}
diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj
index dc85f09..aba4449 100644
--- a/SteamWareLib/SteamWare.csproj
+++ b/SteamWareLib/SteamWare.csproj
@@ -68,8 +68,8 @@
..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll
-
- ..\packages\AjaxControlToolkit.18.1.1\lib\net40\AjaxControlToolkit.dll
+
+ ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll
..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll
@@ -79,7 +79,7 @@
..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.6.4\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.5\lib\net45\NLog.dll
..\packages\Pipelines.Sockets.Unofficial.2.0.22\lib\net461\Pipelines.Sockets.Unofficial.dll
@@ -124,8 +124,8 @@
..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll
-
- ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll
+
+ ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll
diff --git a/SteamWareLib/app.config b/SteamWareLib/app.config
index 814443b..002c5b9 100644
--- a/SteamWareLib/app.config
+++ b/SteamWareLib/app.config
@@ -78,6 +78,10 @@
+
+
+
+
diff --git a/SteamWareLib/devicesAuthProxy.cs b/SteamWareLib/devicesAuthProxy.cs
index 3118651..25eb034 100644
--- a/SteamWareLib/devicesAuthProxy.cs
+++ b/SteamWareLib/devicesAuthProxy.cs
@@ -936,7 +936,7 @@ namespace SteamWare
{
logger.lg.scriviLog(exc.ToString(), tipoLog.EXCEPTION);
}
- if (_lingua == "")
+ if (string.IsNullOrEmpty(_lingua))
{
_lingua = "EN";
}
diff --git a/SteamWareLib/memLayer.cs b/SteamWareLib/memLayer.cs
index 16940a1..19c8672 100644
--- a/SteamWareLib/memLayer.cs
+++ b/SteamWareLib/memLayer.cs
@@ -77,12 +77,12 @@ namespace SteamWare
string answ = "";
answ = confReadString("DbConfConnectionString");
// se fosse vuota fallback a path dei permessi...
- if (answ == "")
+ if (string.IsNullOrEmpty(answ))
{
answ = confReadString("PermessiConnectionString");
}
// se ancora vuota --> devAuth
- if (answ == "")
+ if (string.IsNullOrEmpty(answ))
{
answ = confReadString("DevicesAuthConnectionString");
}
@@ -383,7 +383,7 @@ namespace SteamWare
string answ = "";
// PROVO IN PRIMIS a cercare su DB...
answ = cdv(nomeParam);
- if (answ == "")
+ if (string.IsNullOrEmpty(answ))
{
answ = confReadString(nomeParam);
}
@@ -1386,7 +1386,7 @@ namespace SteamWare
private Lazy lazyConnection = new Lazy(() =>
{
string RedisConn = memLayer.ML.confReadString("RedisConn");
- if (RedisConn == "")
+ if (string.IsNullOrEmpty(RedisConn))
{
RedisConn = "localhost,abortConnect=false,ssl=false";
}
@@ -1399,7 +1399,7 @@ namespace SteamWare
private Lazy lazyConnectionAdmin = new Lazy(() =>
{
string RedisConnAdmin = memLayer.ML.confReadString("RedisConnAdmin");
- if (RedisConnAdmin == "")
+ if (string.IsNullOrEmpty(RedisConnAdmin))
{
RedisConnAdmin = "localhost,abortConnect=false,ssl=false,allowAdmin=true";
}
@@ -1935,7 +1935,7 @@ namespace SteamWare
bool answ = false;
// cerco se ci sia valore in redis...
// se vuoto = ALL...
- keyPattern = keyPattern == "" ? "**" : keyPattern;
+ keyPattern = string.IsNullOrEmpty(keyPattern) ? "**" : keyPattern;
try
{
foreach (var ep in connRedis.GetEndPoints())
@@ -1965,7 +1965,7 @@ namespace SteamWare
int answ = 0;
// cerco se ci sia valore in redis...
// se vuoto = ALL...
- keyPattern = keyPattern == "" ? "**" : keyPattern;
+ keyPattern = string.IsNullOrEmpty(keyPattern) ? "**" : keyPattern;
try
{
foreach (var ep in connRedis.GetEndPoints())
@@ -2017,7 +2017,7 @@ namespace SteamWare
RedisKey[] chiavi = new RedisKey[numAnsw];
List> answ = new List>();
// se vuoto = ALL...
- keyPattern = keyPattern == "" ? "**" : keyPattern;
+ keyPattern = string.IsNullOrEmpty(keyPattern) ? "**" : keyPattern;
// recupero in primis elenco chiavi
try
diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config
index 2d8013a..c19adb5 100644
--- a/SteamWareLib/packages.config
+++ b/SteamWareLib/packages.config
@@ -1,9 +1,9 @@
-
+
-
+
@@ -14,5 +14,5 @@
-
+
\ No newline at end of file
diff --git a/SteamWareLib/user_std.cs b/SteamWareLib/user_std.cs
index 90baea4..7f2eb61 100644
--- a/SteamWareLib/user_std.cs
+++ b/SteamWareLib/user_std.cs
@@ -165,7 +165,7 @@ namespace SteamWare
_lingua = rigaUtente.COD_LINGUA;
}
catch { }
- if (_lingua == "")
+ if (string.IsNullOrEmpty(_lingua))
{
_lingua = "IT";
}
@@ -421,7 +421,7 @@ namespace SteamWare
{
logger.lg.scriviLog(string.Format("Errore recupero lingua utente{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
- if (answ == "")
+ if (string.IsNullOrEmpty(answ))
{
answ = memLayer.ML.CRS("baseLang");
}
@@ -610,10 +610,10 @@ namespace SteamWare
string answ = string.Format("_{0}_", lemma);
try
{
- if (lingua == "")
+ if (string.IsNullOrEmpty(lingua))
{
lingua = memLayer.ML.CRS("baseLang");
- if (lingua == "")
+ if (string.IsNullOrEmpty(lingua))
{
lingua = "IT";
}