Egalware/MoonPro.net
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 17:34:29 +01:00
parent e60f2b1d85 6c1d7eb130
commit 5671fb5c50
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1282']) {
withEnv(['NEXT_BUILD_NUMBER=1283']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MapoDb/DataLayer.cs
+2 -2
View File
@@ -690,14 +690,14 @@ namespace MapoDb
else
{
string errore = "Errore: parametri macchina/valore vuoti";
logger.lg.scriviLog(errore, tipoLog.ERROR);
logger.lg.scriviLog(errore, tipoLog.INFO);
answ = errore;
}
}
else
{
string errore = "Errore: mancano parametri macchina/valore";
logger.lg.scriviLog(errore, tipoLog.ERROR);
logger.lg.scriviLog(errore, tipoLog.INFO);
answ = errore;
}
}