diff --git a/Jenkinsfile b/Jenkinsfile
index c53b184..20df934 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=201']) {
+ withEnv(['NEXT_BUILD_NUMBER=203']) {
// 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'
@@ -69,51 +69,51 @@ 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}\\WebSCR.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/ PUB/PUB.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/ PUB/PUB.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/ PUB/PUB.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}\\WebSCR.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/ PUB/PUB.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/ PUB/PUB.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/ PUB/PUB.csproj"
+ },
+ failFast: false)
+ }
+ else {
+ echo 'Nothing to deploy...'
+ }
+ }
+ }
+ }
+
-
// stage('Installers') {
// agent any
// steps {
diff --git a/WebSCR.sln b/WebSCR.sln
index ef90967..52e1d51 100644
--- a/WebSCR.sln
+++ b/WebSCR.sln
@@ -16,6 +16,7 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ IIS01|Any CPU = IIS01|Any CPU
IIS02|Any CPU = IIS02|Any CPU
OVH|Any CPU = OVH|Any CPU
Release|Any CPU = Release|Any CPU
@@ -23,6 +24,8 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3753524E-FD74-4896-A4EB-EEE1406F94CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3753524E-FD74-4896-A4EB-EEE1406F94CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3753524E-FD74-4896-A4EB-EEE1406F94CF}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
+ {3753524E-FD74-4896-A4EB-EEE1406F94CF}.IIS01|Any CPU.Build.0 = Release|Any CPU
{3753524E-FD74-4896-A4EB-EEE1406F94CF}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{3753524E-FD74-4896-A4EB-EEE1406F94CF}.IIS02|Any CPU.Build.0 = Release|Any CPU
{3753524E-FD74-4896-A4EB-EEE1406F94CF}.OVH|Any CPU.ActiveCfg = OVH|Any CPU
@@ -31,6 +34,8 @@ Global
{3753524E-FD74-4896-A4EB-EEE1406F94CF}.Release|Any CPU.Build.0 = Release|Any CPU
{88774E43-68A1-4E52-B692-493FEE0BA5C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88774E43-68A1-4E52-B692-493FEE0BA5C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {88774E43-68A1-4E52-B692-493FEE0BA5C2}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
+ {88774E43-68A1-4E52-B692-493FEE0BA5C2}.IIS01|Any CPU.Build.0 = Release|Any CPU
{88774E43-68A1-4E52-B692-493FEE0BA5C2}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{88774E43-68A1-4E52-B692-493FEE0BA5C2}.IIS02|Any CPU.Build.0 = Release|Any CPU
{88774E43-68A1-4E52-B692-493FEE0BA5C2}.OVH|Any CPU.ActiveCfg = Release|Any CPU
@@ -39,6 +44,8 @@ Global
{88774E43-68A1-4E52-B692-493FEE0BA5C2}.Release|Any CPU.Build.0 = Release|Any CPU
{D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
+ {D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.IIS01|Any CPU.Build.0 = Release|Any CPU
{D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.IIS02|Any CPU.Build.0 = Release|Any CPU
{D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.OVH|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,6 +54,8 @@ Global
{D2ED1B6F-171D-4A7F-B0D5-87942451B79D}.Release|Any CPU.Build.0 = Release|Any CPU
{6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
+ {6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.IIS01|Any CPU.Build.0 = Release|Any CPU
{6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.IIS02|Any CPU.Build.0 = Release|Any CPU
{6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.OVH|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +64,8 @@ Global
{6A63FCE4-8388-4C62-9339-CCCF013C5D8A}.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}.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|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,4 +76,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {F726D559-A3E0-47D8-B3B7-86F0B8F80A97}
+ EndGlobalSection
EndGlobal
diff --git a/WebSCR/Properties/PublishProfiles/IIS01.pubxml b/WebSCR/Properties/PublishProfiles/IIS01.pubxml
new file mode 100644
index 0000000..31ab62d
--- /dev/null
+++ b/WebSCR/Properties/PublishProfiles/IIS01.pubxml
@@ -0,0 +1,73 @@
+
+
+
+
+ MSDeploy
+ Release
+ Any CPU
+
+ True
+ True
+ https://IIS02:8172/MsDeploy.axd
+ Default Web Site/WebSCR
+
+ False
+ WMSVC
+ True
+ steamw\administrator
+ <_SavePWD>True
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+ True
+ True
+ False
+ DonotMerge
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+
\ No newline at end of file
diff --git a/WebSCR/Properties/PublishProfiles/IIS01.pubxml.user b/WebSCR/Properties/PublishProfiles/IIS01.pubxml.user
new file mode 100644
index 0000000..76132bc
--- /dev/null
+++ b/WebSCR/Properties/PublishProfiles/IIS01.pubxml.user
@@ -0,0 +1,11 @@
+
+
+
+
+
+ AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxuK+nr/9g0KSCaOI75B13AAAAAACAAAAAAADZgAAwAAAABAAAAD1F/RhBSz2MteBl1gIuNWdAAAAAASAAACgAAAAEAAAAOyiRZsJgs+bayYKV89Q5K8YAAAAnfbKbvUkA9GBAHbXvSh6QEEyNciDbJnMFAAAAErftYBbcGo3U7T/brHWmhBqQlxz
+
+
\ No newline at end of file
diff --git a/WebSCR/Properties/PublishProfiles/IIS02.pubxml b/WebSCR/Properties/PublishProfiles/IIS02.pubxml
index 14d8522..31ab62d 100644
--- a/WebSCR/Properties/PublishProfiles/IIS02.pubxml
+++ b/WebSCR/Properties/PublishProfiles/IIS02.pubxml
@@ -60,8 +60,14 @@ by editing this MSBuild file. In order to learn more about this please visit htt
DonotMerge
-
-
-
+
+ False
+
+
+ False
+
+
+ False
+
\ No newline at end of file
diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj
index 7a5188a..d925db7 100644
--- a/WebSCR/WebSCR.csproj
+++ b/WebSCR/WebSCR.csproj
@@ -414,9 +414,11 @@
+
+
diff --git a/WebSCR/WebSCR.csproj.user b/WebSCR/WebSCR.csproj.user
index 3aceeba..bc15a20 100644
--- a/WebSCR/WebSCR.csproj.user
+++ b/WebSCR/WebSCR.csproj.user
@@ -1,7 +1,7 @@
- OVH-Rigamonti
+ IIS01
ShowAllFiles
true
@@ -10,7 +10,7 @@
- OVH|Any CPU
+ Release|Any CPU