From 6c6a3ee14bf925041be428b83f93706227f5689a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 5 Nov 2019 19:38:17 +0100 Subject: [PATCH] Fix placeholder name --- Jenkinsfile | 2 +- MP-IO/Controllers/IOBController.cs | 2 +- MP-IO/MP-IO.csproj | 4 ++-- MP-IO/fileUpload/.PlaceHolder.file | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 MP-IO/fileUpload/.PlaceHolder.file diff --git a/Jenkinsfile b/Jenkinsfile index 2265e029..070f390d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1246']) { + withEnv(['NEXT_BUILD_NUMBER=1247']) { // env.versionNumber = VersionNumber(versionNumberString : '6.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index 7e2e7343..727199c0 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -267,7 +267,7 @@ namespace MP_IO.Controllers currFile = new smallFile() { fileName = item.Nome, - content = fileContent.Replace("\n",Environment.NewLine) + content = fileContent.Replace("\n", Environment.NewLine) }; list4send.Add(currFile); } diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index f5a4e2f2..73d82736 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -260,12 +260,12 @@ - + PreserveNewest - + Designer diff --git a/MP-IO/fileUpload/.PlaceHolder.file b/MP-IO/fileUpload/.PlaceHolder.file new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/MP-IO/fileUpload/.PlaceHolder.file @@ -0,0 +1 @@ + \ No newline at end of file