From b79cd686314ec0185aebdd31e3787083ee4a7d8e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 2 Jul 2018 10:46:04 +0200 Subject: [PATCH] Build vers 15 + fix check null in part2kit --- GMW/WebUserControls/mod_part2kit.ascx.cs | 2 +- Jenkinsfile | 30 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/GMW/WebUserControls/mod_part2kit.ascx.cs b/GMW/WebUserControls/mod_part2kit.ascx.cs index 38e79285..dce31471 100644 --- a/GMW/WebUserControls/mod_part2kit.ascx.cs +++ b/GMW/WebUserControls/mod_part2kit.ascx.cs @@ -111,7 +111,7 @@ namespace GMW.WebUserControls } set { - if (value == "" || value is null) value = "###"; + if (value == "" || value == null) value = "###"; hfCodKIT.Value = value; } } diff --git a/Jenkinsfile b/Jenkinsfile index 30c74022..cbf32200 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=2649']) { + withEnv(['NEXT_BUILD_NUMBER=2650']) { // impiego numero di build del SINGOLO RAMO // env.versionNumber = VersionNumber(versionNumberString : '3.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) // forzo numero di build x tutti rami uguali @@ -39,11 +39,11 @@ pipeline { parallel ( GMW: { sleep 0 - bat "\"${tool 'MSBuild-14.0'}\" GMW/GMW.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + bat "\"${tool 'MSBuild-15.0'}\" GMW/GMW.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" }, GMWT: { sleep 1 - // bat "\"${tool 'MSBuild-14.0'}\" GMW_Term/GMW_Term.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + // bat "\"${tool 'MSBuild-15.0'}\" GMW_Term/GMW_Term.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" }, failFast: false) } @@ -60,12 +60,12 @@ pipeline { parallel ( GMW: { sleep 0 - // bat "\"${tool 'MSBuild-14.0'}\" GMW/GMW.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + // bat "\"${tool 'MSBuild-15.0'}\" GMW/GMW.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" echo 'Testing.. 2 be done...' }, GMWT: { sleep 1 - // bat "\"${tool 'MSBuild-14.0'}\" GMW_Term/GMW_Term.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + // bat "\"${tool 'MSBuild-15.0'}\" GMW_Term/GMW_Term.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" echo 'Testing.. 2 be done...' }, failFast: false) @@ -86,17 +86,17 @@ pipeline { parallel ( GMW_TK: { sleep 0 - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_TK.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_TK /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_TK.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_TK /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" }, GMW_SP: { sleep 1 - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_SP.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_SP /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_SP.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_SP /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" }, // GMWT: { // sleep 2 - // bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_TK.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_TK /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMWT/GMWT.csproj" + // bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_TK.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_TK /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMWT/GMWT.csproj" // sleep 3 - // bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_SP.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_SP /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMWT/GMWT.csproj" + // bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02_SP.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02_SP /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMWT/GMWT.csproj" // }, failFast: false) } @@ -104,18 +104,18 @@ pipeline { parallel ( GMW_TK: { sleep 0 - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_TK.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01_TK /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_TK.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01_TK /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" }, TEST: { sleep 1 - 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=TK_test /p:PublishProfile=TK_test.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/TK_test/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=TK_test /p:PublishProfile=TK_test.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/TK_test/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\TK_test\" \"E:\\Staging\\byProd\\GMW\\TK_test\\GMW-site\" " // bat "E:\\Jenkins\\exportInstaller.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\TK_test\" \"E:\\Staging\\GMW\\GMW-site\\TK_test\" " dropbox configName: 'Mazzucconi - Tekal', remoteDirectory: 'File_Installazione_GMW_Test', removePrefix: 'GMW/ReleaseClienti/TK_test', sourceFiles: 'GMW/ReleaseClienti/TK_test/**' }, PROD: { sleep 2 - 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=TK_prod /p:PublishProfile=TK_prod.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/TK_prod/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=TK_prod /p:PublishProfile=TK_prod.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/TK_prod/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\TK_prod\" \"E:\\Staging\\byProd\\GMW\\TK_prod\\GMW-site\" " // bat "E:\\Jenkins\\exportInstaller.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\TK_prod\" \"E:\\Staging\\GMW\\GMW-site\\TK_prod\" " dropbox configName: 'Mazzucconi - Tekal', remoteDirectory: 'File_Installazione_GMW', removePrefix: 'GMW/ReleaseClienti/TK_prod', sourceFiles: 'GMW/ReleaseClienti/TK_prod/**' @@ -126,18 +126,18 @@ pipeline { parallel ( GMW_SP: { sleep 0 - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_SP.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01_SP /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_SP.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01_SP /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GMW/GMW.csproj" }, TEST: { sleep 1 - 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=SP_test /p:PublishProfile=SP_test.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SP_test/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SP_test /p:PublishProfile=SP_test.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SP_test/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\SP_test\" \"E:\\Staging\\byProd\\GMW\\SP_test\\GMW-site\" " // bat "E:\\Jenkins\\exportInstaller.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\SP_test\" \"E:\\Staging\\GMW\\GMW-site\\SP_test\" " dropbox configName: 'Mazzucconi - San Possidonio', remoteDirectory: 'File_Installazione_GMW_Test', removePrefix: 'GMW/ReleaseClienti/SP_test', sourceFiles: 'GMW/ReleaseClienti/SP_test/**' }, PROD: { sleep 2 - 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=SP_prod /p:PublishProfile=SP_prod.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SP_prod/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" + bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SP_prod /p:PublishProfile=SP_prod.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SP_prod/Build_${env.versionNumber}/GMW.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ GMW/GMW.csproj" bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\SP_prod\" \"E:\\Staging\\byProd\\GMW\\SP_prod\\GMW-site\" " // bat "E:\\Jenkins\\exportInstaller.bat \"${WORKSPACE}\\GMW\\ReleaseClienti\\SP_prod\" \"E:\\Staging\\GMW\\GMW-site\\SP_prod\" " dropbox configName: 'Mazzucconi - San Possidonio', remoteDirectory: 'File_Installazione_GMW', removePrefix: 'GMW/ReleaseClienti/SP_prod', sourceFiles: 'GMW/ReleaseClienti/SP_prod/**'