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

Refresh nuget + compilazione nuova versione...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-07-13 11:22:51 +02:00
parent 1b9ed1a825
commit 7e69c39e83
8 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
SteamWareLib/ApplicationUserControl.cs
+4 -4
View File
@@ -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";
}
SteamWareLib/SteamWare.csproj
+5 -5
View File
@@ -68,8 +68,8 @@
<Reference Include="AegisImplicitMail, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll</HintPath>
</Reference>
<Reference Include="AjaxControlToolkit, Version=18.1.1.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.18.1.1\lib\net40\AjaxControlToolkit.dll</HintPath>
<Reference Include="AjaxControlToolkit, Version=19.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -79,7 +79,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.6.4\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.6.5\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.0.22\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
@@ -124,8 +124,8 @@
<Reference Include="System.Threading.Channels, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
SteamWareLib/app.config
+4
View File
@@ -78,6 +78,10 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
SteamWareLib/devicesAuthProxy.cs
+1 -1
View File
@@ -936,7 +936,7 @@ namespace SteamWare
{
logger.lg.scriviLog(exc.ToString(), tipoLog.EXCEPTION);
}
if (_lingua == "")
if (string.IsNullOrEmpty(_lingua))
{
_lingua = "EN";
}
SteamWareLib/memLayer.cs
+8 -8
View File
@@ -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<ConnectionMultiplexer> lazyConnection = new Lazy<ConnectionMultiplexer>(() =>
{
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<ConnectionMultiplexer> lazyConnectionAdmin = new Lazy<ConnectionMultiplexer>(() =>
{
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<KeyValuePair<string, int>> answ = new List<KeyValuePair<string, int>>();
// se vuoto = ALL...
keyPattern = keyPattern == "" ? "**" : keyPattern;
keyPattern = string.IsNullOrEmpty(keyPattern) ? "**" : keyPattern;
// recupero in primis elenco chiavi
try
SteamWareLib/packages.config
+3 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AIM" version="1.0.3" targetFramework="net462" />
<package id="AjaxControlToolkit" version="18.1.1" targetFramework="net462" />
<package id="AjaxControlToolkit" version="19.1.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
<package id="NLog" version="4.6.4" targetFramework="net462" />
<package id="NLog" version="4.6.5" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.0.22" targetFramework="net462" />
<package id="SharpZipLib" version="1.1.0" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.601" targetFramework="net462" />
@@ -14,5 +14,5 @@
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net462" />
<package id="System.Threading.Channels" version="4.5.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net462" />
</packages>
SteamWareLib/user_std.cs
+4 -4
View File
@@ -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";
}