From d0716cbf45a5894d6edd8c49caff5ac7bee5b06e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 10 Oct 2019 16:06:23 +0200 Subject: [PATCH] Update con spostamento favicon + config come example e rimozione appunti --- Jenkinsfile | 2 +- SteamWareLib/appunti.txt | 18 +++++++++--------- SteamWareLib/example-app.config | 17 +++++++++++++++++ .../{favicon.ico => example-favicon.ico} | Bin 4 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 SteamWareLib/example-app.config rename SteamWareLib/{favicon.ico => example-favicon.ico} (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 694f493..dba0fa2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=670']) { + withEnv(['NEXT_BUILD_NUMBER=671']) { // 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.versionNumberBeta = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/SteamWareLib/appunti.txt b/SteamWareLib/appunti.txt index d56e81f..2172463 100644 --- a/SteamWareLib/appunti.txt +++ b/SteamWareLib/appunti.txt @@ -2,16 +2,16 @@ CREATE PROCEDURE dbo.sp_scambiaObjTree ( - @oldIdxObj varchar(20), - @newIdxObj varchar(20) + @oldIdxObj varchar(20), + @newIdxObj varchar(20) ) AS - /* sposto i tree indicati */ - UPDATE dbo.Obj - SET idxObj = REPLACE( idxObj, @oldIdxObj, @newIdxObj ) - WHERE (idxObj LIKE @oldIdxObj + '%') - - - RETURN + /* sposto i tree indicati */ + UPDATE dbo.Obj + SET idxObj = REPLACE( idxObj, @oldIdxObj, @newIdxObj ) + WHERE (idxObj LIKE @oldIdxObj + '%') + + + RETURN GO diff --git a/SteamWareLib/example-app.config b/SteamWareLib/example-app.config new file mode 100644 index 0000000..fb42165 --- /dev/null +++ b/SteamWareLib/example-app.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/SteamWareLib/favicon.ico b/SteamWareLib/example-favicon.ico similarity index 100% rename from SteamWareLib/favicon.ico rename to SteamWareLib/example-favicon.ico