Merge branch 'develop'

This commit is contained in:
Samuele E. Locatelli
2020-02-18 16:16:59 +01:00
Vendored
+5 -5
View File
@@ -46,6 +46,11 @@ pipeline {
/* compilo installers in base al BRANCH del cliente... */
if (env.BRANCH_NAME == "develop") {
bat "\"${tool 'MSBuild-15.0'}\" ZCode\\ZCode.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
if(env.enableIIS02 == "Y")
{
// SITE
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.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ ZCode\\ZCode.csproj"
}
}
else {
echo 'Niente x Build (limitata a develop)...'
@@ -116,11 +121,6 @@ pipeline {
script {
/* DEPLOY condizionale: develop (Ufficio Seriate) / master (Sito Online) */
if (env.BRANCH_NAME == "master") {
if(env.enableIIS02 == "Y")
{
// SITE
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.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ ZCode\\ZCode.csproj"
}
if(env.enableIIS01 == "Y")
{
// SITE