From b1f1c9ca55ef00a811c4fe6b9beb587469882bf4 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 21 Sep 2018 21:44:11 +0200 Subject: [PATCH] update versione e fix soluzione x nuovi profiles pub --- C-TRACK.sln | 36 ++++++-- C-TRACK/C-TRACK.csproj | 23 ++++- .../OVH-ElettronicaScalvina.pubxml | 46 ---------- .../OVH-ElettronicaScalvina.pubxml.user | 11 --- Jenkinsfile | 90 +++++++++---------- 5 files changed, 92 insertions(+), 114 deletions(-) delete mode 100644 C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml delete mode 100644 C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml.user diff --git a/C-TRACK.sln b/C-TRACK.sln index 5b37ffc..674902d 100644 --- a/C-TRACK.sln +++ b/C-TRACK.sln @@ -14,32 +14,50 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - OVH|Any CPU = OVH|Any CPU + IIS01|Any CPU = IIS01|Any CPU + IIS02|Any CPU = IIS02|Any CPU + OVH-EletScal|Any CPU = OVH-EletScal|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.OVH|Any CPU.ActiveCfg = OVH|Any CPU - {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.OVH|Any CPU.Build.0 = OVH|Any CPU + {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU + {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.IIS01|Any CPU.Build.0 = IIS01|Any CPU + {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU + {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.IIS02|Any CPU.Build.0 = IIS02|Any CPU + {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.OVH-EletScal|Any CPU.ActiveCfg = OVH-EletScal|Any CPU + {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.OVH-EletScal|Any CPU.Build.0 = OVH-EletScal|Any CPU {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD11A3BA-E06F-4E9A-A701-B80D8212156E}.Release|Any CPU.Build.0 = Release|Any CPU {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.OVH|Any CPU.ActiveCfg = Release|Any CPU - {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.OVH|Any CPU.Build.0 = Release|Any CPU + {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.IIS01|Any CPU.ActiveCfg = Release|Any CPU + {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.IIS01|Any CPU.Build.0 = Release|Any CPU + {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.IIS02|Any CPU.ActiveCfg = Release|Any CPU + {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.IIS02|Any CPU.Build.0 = Release|Any CPU + {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.OVH-EletScal|Any CPU.ActiveCfg = Release|Any CPU + {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.OVH-EletScal|Any CPU.Build.0 = Release|Any CPU {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {F3B6478B-756E-44F3-94AD-75CFAA4AA3AD}.Release|Any CPU.Build.0 = Release|Any CPU {85BD343D-4246-48DF-BE81-F34321896F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85BD343D-4246-48DF-BE81-F34321896F88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85BD343D-4246-48DF-BE81-F34321896F88}.OVH|Any CPU.ActiveCfg = Release|Any CPU - {85BD343D-4246-48DF-BE81-F34321896F88}.OVH|Any CPU.Build.0 = Release|Any CPU + {85BD343D-4246-48DF-BE81-F34321896F88}.IIS01|Any CPU.ActiveCfg = Release|Any CPU + {85BD343D-4246-48DF-BE81-F34321896F88}.IIS01|Any CPU.Build.0 = Release|Any CPU + {85BD343D-4246-48DF-BE81-F34321896F88}.IIS02|Any CPU.ActiveCfg = Release|Any CPU + {85BD343D-4246-48DF-BE81-F34321896F88}.IIS02|Any CPU.Build.0 = Release|Any CPU + {85BD343D-4246-48DF-BE81-F34321896F88}.OVH-EletScal|Any CPU.ActiveCfg = Release|Any CPU + {85BD343D-4246-48DF-BE81-F34321896F88}.OVH-EletScal|Any CPU.Build.0 = Release|Any CPU {85BD343D-4246-48DF-BE81-F34321896F88}.Release|Any CPU.ActiveCfg = Release|Any CPU {85BD343D-4246-48DF-BE81-F34321896F88}.Release|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-EletScal|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-EletScal|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/C-TRACK/C-TRACK.csproj b/C-TRACK/C-TRACK.csproj index c7d0ae5..9baef12 100644 --- a/C-TRACK/C-TRACK.csproj +++ b/C-TRACK/C-TRACK.csproj @@ -213,6 +213,10 @@ + + + + @@ -288,6 +292,10 @@ Designer + + + + @@ -611,7 +619,20 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + + true + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ + + true bin\ TRACE diff --git a/C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml b/C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml deleted file mode 100644 index ef8649b..0000000 --- a/C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - MSDeploy - OVH - Any CPU - - True - True - https://wprod01.steamware.net:8172/MsDeploy.axd - ctrack.steamware.net/elet-scal - - False - WMSVC - True - Administrator - <_SavePWD>True - - - - - - - - - - - - - - - True - True - False - DonotMerge - - - - False - - - \ No newline at end of file diff --git a/C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml.user b/C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml.user deleted file mode 100644 index 905dac6..0000000 --- a/C-TRACK/Properties/PublishProfiles/OVH-ElettronicaScalvina.pubxml.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAQQ5iScsMNEq899pyU6Y9ZwAAAAACAAAAAAADZgAAwAAAABAAAAC1D22+npXzAbh015aK2RqWAAAAAASAAACgAAAAEAAAAMpQJSMXjDwGduhvinyShzkYAAAA728eUhWp6BmAN647vmAKSXeBUg51O3vhFAAAANXewKsBcbXdVerPCh3nnXdLdTJR - - \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 24d97ad..f0fa6ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=52']) { + withEnv(['NEXT_BUILD_NUMBER=53']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'C.TRACK' @@ -50,10 +50,6 @@ pipeline { /* compilo installers in base al BRANCH del cliente... */ if (env.BRANCH_NAME == "develop") { parallel ( - // ADM: { - // sleep 5 - // bat "\"${tool 'MSBuild-15.0'}\" ADM/ADM.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - // }, PUB: { sleep 0 bat "\"${tool 'MSBuild-15.0'}\" C-TRACK/C-TRACK.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" @@ -66,48 +62,48 @@ pipeline { } } } - // stage('Deploy') { - // agent any - // steps { - // script { - // // CAMBIO numero versione + checkout NuGet in file sorgente!!! - // bat "e:\\fart.exe VersGen\\VersGen.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" - // bat "e:\\nuget.exe restore ${WORKSPACE}\\C-TRACK.sln" - // } - // script { - // /* DEPLOY condizionale: develop / master / demo_ovh */ - // if (env.BRANCH_NAME == "master") { - // parallel ( - // PUB_IIS01: { - // if(env.enableIIS01 == "Y") - // { - // sleep 0 - // 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=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ C-TRACK/C-TRACK.csproj" - // } - // }, - // PUB_IIS02: { - // if(env.enableIIS02 == "Y") - // { - // sleep 0 - // 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.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ C-TRACK/C-TRACK.csproj" - // } - // }, - // failFast: false) - // } - // if (env.BRANCH_NAME == "OVH") { - // parallel ( - // PUB_PROD: { - // sleep 0 - // 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=OVH-prod.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=OVH /p:username=WPROD01\\Steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ C-TRACK/C-TRACK.csproj" - // }, - // failFast: false) - // } - // else { - // echo 'Nothing to deploy...' - // } - // } - // } - // } + stage('Deploy') { + agent any + steps { + script { + // CAMBIO numero versione + checkout NuGet in file sorgente!!! + bat "e:\\fart.exe VersGen\\VersGen.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" + bat "e:\\nuget.exe restore ${WORKSPACE}\\C-TRACK.sln" + } + script { + /* DEPLOY condizionale: develop / master / demo_ovh */ + if (env.BRANCH_NAME == "master") { + parallel ( + PUB_IIS01: { + if(env.enableIIS01 == "Y") + { + sleep 0 + 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=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ C-TRACK/C-TRACK.csproj" + } + }, + PUB_IIS02: { + if(env.enableIIS02 == "Y") + { + sleep 0 + 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.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ C-TRACK/C-TRACK.csproj" + } + }, + failFast: false) + } + // if (env.BRANCH_NAME == "OVH-EletScal") { + // parallel ( + // PUB_PROD: { + // sleep 0 + // 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=OVH-EletScal.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=OVH-EletScal /p:username=WPROD01\\Steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ C-TRACK/C-TRACK.csproj" + // }, + // failFast: false) + // } + else { + echo 'Nothing to deploy...' + } + } + } + } } post { success {