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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-31 15:55:36 +01:00
parent b3a1b36d54 1b52d9a517
commit 04b5dd2d3c
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=709']) {
withEnv(['NEXT_BUILD_NUMBER=711']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
SteamWareLib/memLayer.cs
+22 -5
View File
@@ -150,7 +150,14 @@ namespace SteamWare
AppConf = new Dictionary<string, string>();
foreach (var item in redGetHash(ACBH))
{
AppConf.Add(item.Key, item.Value);
if (AppConf.ContainsKey(item.Key))
{
AppConf[item.Key] = item.Value;
}
else
{
AppConf.Add(item.Key, item.Value);
}
}
}
else
@@ -304,11 +311,16 @@ namespace SteamWare
{
try
{
answ = Convert.ToBoolean(configDbVal(chiave));
//answ = Convert.ToBoolean(configDbVal(chiave));
bool fatto = bool.TryParse(sVal, out answ);
if (!fatto)
{
logger.lg.scriviLog($"Errore in lettura chiave [{chiave}] durante cdvb: ricevuto {sVal}", tipoLog.EXCEPTION);
}
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Errore in lettura chiave [{0}] durante cdvb{1}{2}", chiave, Environment.NewLine, exc), tipoLog.EXCEPTION);
logger.lg.scriviLog($"Errore in lettura chiave [{chiave}] durante cdvb{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
}
}
return answ;
@@ -326,11 +338,16 @@ namespace SteamWare
{
try
{
answ = Convert.ToInt32(configDbVal(chiave));
//answ = Convert.ToInt32(configDbVal(chiave));
bool fatto = int.TryParse(sVal, out answ);
if (!fatto)
{
logger.lg.scriviLog($"Errore in lettura chiave [{chiave}] durante cdvi: ricevuto {sVal}", tipoLog.EXCEPTION);
}
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Errore in lettura chiave [{0}] durante cdvi{1}{2}", chiave, Environment.NewLine, exc), tipoLog.EXCEPTION);
logger.lg.scriviLog($"Errore in lettura chiave [{chiave}] durante cdvi{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
}
}
return answ;