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-10-03 16:54:15 +02:00
parent 9e47f29e2e 0e3971e795
commit 4a157611c0
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=744']) {
withEnv(['NEXT_BUILD_NUMBER=745']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
SteamWareLib/memLayer.cs
+16 -1
View File
@@ -1222,6 +1222,20 @@ namespace SteamWare
{
try
{
// cerco come key...
var redVal = getRSV(redHash(nomeVar));
answ = !string.IsNullOrEmpty(redVal);
if (!answ)
{
answ = redKeyPresent(redHash(nomeVar));
// cerco come variabile se NON trovata...
if (!answ)
{
// cerco come hash...
answ = redHashPresent(redHash(nomeVar));
}
}
#if false
// cerco come key...
answ = redKeyPresent(redHash(nomeVar));
if (!answ)
@@ -1233,8 +1247,9 @@ namespace SteamWare
if (!answ)
{
var redVal = getRSV(redHash(nomeVar));
answ = redVal != null && redVal != "";
answ = !string.IsNullOrEmpty(redVal);
}
#endif
}
catch (Exception exc)
{