diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj
index cf21b00..7151369 100644
--- a/CMS_SC/CMS_SC.csproj
+++ b/CMS_SC/CMS_SC.csproj
@@ -326,11 +326,11 @@
-
+
Designer
-
-
-
+
+
+
Always
diff --git a/CMS_SC/setupTgt.bat b/CMS_SC/setupTgt.bat
index cc32ca1..0b944e3 100644
--- a/CMS_SC/setupTgt.bat
+++ b/CMS_SC/setupTgt.bat
@@ -1,27 +1,27 @@
-@echo off
-echo Effettua setup dei file specifici per ambienti cliente POST build installer: verifica da nome configurazione %1
-
-REM INIZIO eliminando i files che COMUNQUE devo copiare x target...
-
-if %1 == "Release" goto Release
-if %1 == "Debug" goto Debug
-if %1 == "CMS" goto CMS
-
-:Release
-echo Release: nulla da copiare
-goto END
-
-:Debug
-echo Debug: nulla da copiare
-goto END
-
-:CMS
-echo CMS: copio files CMS
-del /F /Q %2"Reports\*.rdlc"
-REM del /F /Q %2"DATA\CONF\*.*"
-copy %2"Resources\CMS\*.rdlc" %2"Reports\"
-goto END
-
-
-:END
-echo Fatto!
\ No newline at end of file
+REM @echo off
+REM echo Effettua setup dei file specifici per ambienti cliente POST build installer: verifica da nome configurazione %1
+REM
+REM REM INIZIO eliminando i files che COMUNQUE devo copiare x target...
+REM
+REM if %1 == "Release" goto Release
+REM if %1 == "Debug" goto Debug
+REM if %1 == "CMS" goto CMS
+REM
+REM :Release
+REM echo Release: nulla da copiare
+REM goto END
+REM
+REM :Debug
+REM echo Debug: nulla da copiare
+REM goto END
+REM
+REM :CMS
+REM echo CMS: copio files CMS
+REM del /F /Q %2"Reports\*.rdlc"
+REM REM del /F /Q %2"DATA\CONF\*.*"
+REM copy %2"Resources\CMS\*.rdlc" %2"Reports\"
+REM goto END
+REM
+REM
+REM :END
+REM echo Fatto!
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index b93db42..66ece49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=4244']) {
+ withEnv(['NEXT_BUILD_NUMBER=4245']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'CMS-SC'
@@ -45,7 +45,7 @@ pipeline {
parallel (
REL: {
sleep 0
- bat "\"${tool 'MSBuild-14.0'}\" CMS_SC/CMS_SC.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
+ bat "\"${tool 'MSBuild-15.0'}\" CMS_SC/CMS_SC.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
},
failFast: false)
}
@@ -71,10 +71,10 @@ pipeline {
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"
+ 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=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"
+ 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=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)
}
@@ -103,7 +103,7 @@ pipeline {
{
parallel (
CMS_SC_ZIP: {
- 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}/CMS_SC.zip /p:DeployIisAppPath=\"Default Web Site/CMS-SC\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ CMS_SC/CMS_SC.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=${env.BRANCH_NAME} /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/CMS_SC.zip /p:DeployIisAppPath=\"Default Web Site/CMS-SC\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ CMS_SC/CMS_SC.csproj"
// // SOLO se è tra i branch "cliente" pubblico in dropbox...
// if (env.BRANCH_NAME == "Donati") {