diff --git a/Jenkinsfile b/Jenkinsfile index 7c4be63e..8ee11d3e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=845']) { + withEnv(['NEXT_BUILD_NUMBER=846']) { // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' @@ -196,19 +196,19 @@ pipeline { parallel ( LANDING: { sleep 4 - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=${env.BRANCH_NAME} /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/LAND.zip /p:DeployIisAppPath=\"Default Web Site/MP/LAND\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP/MP.csproj" + bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/LAND.zip /p:DeployIisAppPath=\"Default Web Site/MP/LAND\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP/MP.csproj" // pubblico su server deploy! publishToDeployServer("MP\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "LAND") }, ADMIN: { sleep 0 - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=${env.BRANCH_NAME} /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/ADM.zip /p:DeployIisAppPath=\"Default Web Site/MP/ADM\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-Admin/MP-Admin.csproj" + bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/ADM.zip /p:DeployIisAppPath=\"Default Web Site/MP/ADM\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-Admin/MP-Admin.csproj" // pubblico su server deploy! publishToDeployServer("MP-Admin\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "ADM") }, IO: { sleep 0 - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=${env.BRANCH_NAME} /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/IO.zip /p:DeployIisAppPath=\"Default Web Site/MP/IO\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-IO/MP-IO.csproj" + bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/IO.zip /p:DeployIisAppPath=\"Default Web Site/MP/IO\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-IO/MP-IO.csproj" // pubblico su server deploy! publishToDeployServer("MP-IO\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "IO") }, diff --git a/MP-Admin/Web.IIS01.config b/MP-Admin/Web.IIS01.config deleted file mode 100644 index da245199..00000000 --- a/MP-Admin/Web.IIS01.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/MP-Admin/Web.IIS02.config b/MP-Admin/Web.IIS02.config deleted file mode 100644 index da245199..00000000 --- a/MP-Admin/Web.IIS02.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/MP-Admin/Web.Jetco.config b/MP-Admin/Web.Jetco.config deleted file mode 100644 index 9e1a27a7..00000000 --- a/MP-Admin/Web.Jetco.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-Admin/Web.Donati.config b/MP-Admin/Web.Prod.config similarity index 55% rename from MP-Admin/Web.Donati.config rename to MP-Admin/Web.Prod.config index 60690e79..6f389e5d 100644 --- a/MP-Admin/Web.Donati.config +++ b/MP-Admin/Web.Prod.config @@ -1,16 +1,16 @@ - + - - - - + + + + - - - + + + diff --git a/MP-Admin/Web.Steamware.config b/MP-Admin/Web.Steamware.config deleted file mode 100644 index b2eeb1a4..00000000 --- a/MP-Admin/Web.Steamware.config +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-Admin/Web.Valgasket.config b/MP-Admin/Web.Valgasket.config deleted file mode 100644 index 09b2bcc4..00000000 --- a/MP-Admin/Web.Valgasket.config +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-IO/Web.IIS01.config b/MP-IO/Web.IIS01.config deleted file mode 100644 index 40150c72..00000000 --- a/MP-IO/Web.IIS01.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/MP-IO/Web.IIS02.config b/MP-IO/Web.IIS02.config deleted file mode 100644 index 40150c72..00000000 --- a/MP-IO/Web.IIS02.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/MP-IO/Web.Jetco.config b/MP-IO/Web.Jetco.config deleted file mode 100644 index 4ba1577f..00000000 --- a/MP-IO/Web.Jetco.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-IO/Web.Donati.config b/MP-IO/Web.Prod.config similarity index 56% rename from MP-IO/Web.Donati.config rename to MP-IO/Web.Prod.config index 6e491efd..570f2399 100644 --- a/MP-IO/Web.Donati.config +++ b/MP-IO/Web.Prod.config @@ -6,16 +6,16 @@ - - - - - - + + + + + + - - + + diff --git a/MP-IO/Web.Steamware.config b/MP-IO/Web.Steamware.config deleted file mode 100644 index 1e353362..00000000 --- a/MP-IO/Web.Steamware.config +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP/Web.IIS01.config b/MP/Web.IIS01.config deleted file mode 100644 index 5811b164..00000000 --- a/MP/Web.IIS01.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MP/Web.IIS02.config b/MP/Web.IIS02.config deleted file mode 100644 index 797770c9..00000000 --- a/MP/Web.IIS02.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MP/Web.Jetco.config b/MP/Web.Jetco.config deleted file mode 100644 index d2e00b52..00000000 --- a/MP/Web.Jetco.config +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP/Web.Donati.config b/MP/Web.Prod.config similarity index 58% rename from MP/Web.Donati.config rename to MP/Web.Prod.config index 71e9b223..ac35ed91 100644 --- a/MP/Web.Donati.config +++ b/MP/Web.Prod.config @@ -2,9 +2,8 @@ - - - + + @@ -12,8 +11,8 @@ - - + + diff --git a/MP/Web.config b/MP/Web.config index cbf98f6a..a875411d 100644 --- a/MP/Web.config +++ b/MP/Web.config @@ -16,7 +16,7 @@ - +