diff --git a/Jenkinsfile b/Jenkinsfile index f98f048..6d8e1e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=89']) { + withEnv(['NEXT_BUILD_NUMBER=90']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'LPA' diff --git a/LPA/App.config b/LPA/App.config index 30f431a..5fcafd9 100644 --- a/LPA/App.config +++ b/LPA/App.config @@ -5,8 +5,10 @@ - - + + + diff --git a/LPA/LPA.csproj b/LPA/LPA.csproj index 2e22d20..73b6705 100644 --- a/LPA/LPA.csproj +++ b/LPA/LPA.csproj @@ -203,7 +203,9 @@ .editorconfig - + + PreserveNewest + Always @@ -216,7 +218,9 @@ Always - + + PreserveNewest + Always diff --git a/LPA/conf/serverSetup.json b/LPA/conf/serverSetup.json index 96bb97b..9bd50a9 100644 --- a/LPA/conf/serverSetup.json +++ b/LPA/conf/serverSetup.json @@ -1,4 +1,4 @@ { "serverIp": "iis01", - "serverBaseAddr": "http://iis01/NKC/" + "serverBaseAddr": "http://iis01/MP/MAG/" } \ No newline at end of file