diff --git a/Jenkinsfile b/Jenkinsfile
index 2cdc81a..c4dcc6e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
agent none
environment {
EMAIL_RECIPIENTS = 'samuele@steamware.net'
- enableIIS01 = 'Y'
+ enableIIS01 = 'N'
enableIIS02 = 'Y'
}
stages {
@@ -20,7 +20,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=263']) {
+ withEnv(['NEXT_BUILD_NUMBER=264']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'WebSCR'
@@ -58,7 +58,7 @@ pipeline {
bat "\"${tool 'MSBuild-15.0'}\" WebSCR/WebSCR.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
},
DataUploader: {
- sleep 4
+ sleep 2
bat "\"${tool 'MSBuild-15.0'}\" DataUploader/DataUploader.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
},
failFast: false)
@@ -84,15 +84,15 @@ pipeline {
WebSCR_IIS01: {
if(env.enableIIS01 == "Y")
{
- sleep 3
- 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=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ WebSCR/WebSCR.csproj"
+ sleep 2
+ 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/ WebSCR/WebSCR.csproj"
}
},
WebSCR_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=IIS02.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ WebSCR/WebSCR.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=15.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ WebSCR/WebSCR.csproj"
}
},
failFast: false)
diff --git a/WebSCR/Web.IIS01.config b/WebSCR/Web.IIS01.config
new file mode 100644
index 0000000..40150c7
--- /dev/null
+++ b/WebSCR/Web.IIS01.config
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebSCR/Web.IIS02.config b/WebSCR/Web.IIS02.config
new file mode 100644
index 0000000..40150c7
--- /dev/null
+++ b/WebSCR/Web.IIS02.config
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebSCR/Web.WinLab.config b/WebSCR/Web.WinLab.config
deleted file mode 100644
index a346cd9..0000000
--- a/WebSCR/Web.WinLab.config
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj
index 127de4c..c07a896 100644
--- a/WebSCR/WebSCR.csproj
+++ b/WebSCR/WebSCR.csproj
@@ -477,7 +477,7 @@
Designer
-
+
Web.config
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index ea2c164..f57ce2b 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ