diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.csproj.CoreCompileInputs.cache b/CMS-SC-Data/obj/Release/CMS-SC-Data.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..43229fa --- /dev/null +++ b/CMS-SC-Data/obj/Release/CMS-SC-Data.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +ae4ced187f87f625b7c9369aa18db4b37426e9fc diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 8135bd1..584717b 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll index c0b7302..01961e7 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Utility.Designer.cs.dll differ diff --git a/CMS_SC/Web.IIS01.config b/CMS_SC/Web.IIS01.config new file mode 100644 index 0000000..817ae52 --- /dev/null +++ b/CMS_SC/Web.IIS01.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/CMS_SC/Web.IIS02.config b/CMS_SC/Web.IIS02.config new file mode 100644 index 0000000..817ae52 --- /dev/null +++ b/CMS_SC/Web.IIS02.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/CMS_SC/Web.WinLab.config b/CMS_SC/Web.OVH.config similarity index 100% rename from CMS_SC/Web.WinLab.config rename to CMS_SC/Web.OVH.config diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll deleted file mode 100644 index 2547490..0000000 Binary files a/CMS_SC/bin/CMS_SC.dll and /dev/null differ diff --git a/Jenkinsfile b/Jenkinsfile index a88b505..96fa349 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4154']) { + withEnv(['NEXT_BUILD_NUMBER=4155']) { // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC' @@ -57,30 +57,30 @@ pipeline { echo 'Testing.. 2 be done...' } } - // stage('Deploy') { - // agent any - // steps { - // script { - // /* DEPLOY condizionale: develop / master */ - // if (env.BRANCH_NAME == "master") { - // /* CAMBIO numero versione in file sorgente!!! */ - // bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\VersGen.cs 000.000 ${env.versionNumber} || EXIT /B 0" - // bat "e:\\nuget.exe restore ${WORKSPACE}\\CMS-SC.sln" - // parallel ( - // IIS01: { - // 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.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ CMS_SC/CMS_SC.csproj" - // }, - // IIS02: { - // 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.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ CMS_SC/CMS_SC.csproj" - // }, - // failFast: false) - // } - // else { - // echo 'Nothing to deploy...' - // } - // } - // } - // } + stage('Deploy') { + agent any + steps { + script { + /* DEPLOY condizionale: develop / master */ + if (env.BRANCH_NAME == "master") { + /* CAMBIO numero versione in file sorgente!!! */ + bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\VersGen.cs 000.000 ${env.versionNumber} || EXIT /B 0" + bat "e:\\nuget.exe restore ${WORKSPACE}\\CMS-SC.sln" + parallel ( + IIS01: { + 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.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ CMS_SC/CMS_SC.csproj" + }, + IIS02: { + 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.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ CMS_SC/CMS_SC.csproj" + }, + failFast: false) + } + else { + echo 'Nothing to deploy...' + } + } + } + } // stage('RemoteDeploy') { // agent any // steps {