From 17d595310f38695c8a44bc6b739e2f20a0f16c0b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 4 Oct 2018 16:05:57 +0200 Subject: [PATCH] Modifica jenkins x nuovo processo di build (TAB) con NUOVE release --- Jenkinsfile | 17 +++++----- MAPO.sln | 45 ++----------------------- MP-Admin/MP-Admin.csproj.user | 2 +- MP-IO/MP-IO.csproj.user | 2 +- MP-MON/MP-MON.csproj.user | 2 +- MP-Site/MP-Site.csproj.user | 2 +- MP-TAB/MP-TAB.csproj | 8 +---- MP-TAB/Web.Donati.config | 30 ----------------- MP-TAB/Web.IIS01.config | 4 --- MP-TAB/Web.IIS02.config | 4 --- MP-TAB/Web.Jetco.config | 30 ----------------- MP-TAB/Web.Prod.config | 16 +++++++++ MP-TAB/Web.Release.config | 27 +-------------- MP-TAB/Web.Steamware.config | 62 ----------------------------------- MP-TAB/Web.Valgasket.config | 4 --- MP-TAB/Web.config | 7 ++-- MP/MP.csproj.user | 2 +- 17 files changed, 40 insertions(+), 224 deletions(-) delete mode 100644 MP-TAB/Web.Donati.config delete mode 100644 MP-TAB/Web.IIS01.config delete mode 100644 MP-TAB/Web.IIS02.config delete mode 100644 MP-TAB/Web.Jetco.config create mode 100644 MP-TAB/Web.Prod.config delete mode 100644 MP-TAB/Web.Steamware.config delete mode 100644 MP-TAB/Web.Valgasket.config diff --git a/Jenkinsfile b/Jenkinsfile index 05ffd6ea..9161bc0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=843']) { + withEnv(['NEXT_BUILD_NUMBER=844']) { // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' @@ -91,7 +91,7 @@ pipeline { bat "e:\\nuget.exe restore ${WORKSPACE}\\MAPO.sln" } script { - /* DEPLOY condizionale: develop / master / demo_ovh */ + /* DEPLOY condizionale: master (Ufficio Seriate) / demo_ovh (Demo Online) */ if (env.BRANCH_NAME == "master") { parallel ( LANDING: { @@ -170,6 +170,7 @@ pipeline { } if (env.BRANCH_NAME == "OVH-DEMO") { parallel ( + // da fare!!! failFast: false) } else { @@ -191,11 +192,7 @@ pipeline { // ora mi occupo delle operazioni di compressione e copia... script { /* compilo installers in base al BRANCH del cliente... */ - if (env.BRANCH_NAME == "master" || env.BRANCH_NAME.contains("DEMO") || env.BRANCH_NAME.contains("Giancarlo")) { - echo 'Questo BRANCH non necessita di installer...' - } - else - { + if (env.BRANCH_NAME == "stable" || env.BRANCH_NAME.contains("beta") ) { parallel ( LANDING: { sleep 4 @@ -229,12 +226,16 @@ pipeline { }, TABLET: { sleep 2 - 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}/TAB.zip /p:DeployIisAppPath=\"Default Web Site/MP/TAB\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj" + 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=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/TAB.zip /p:DeployIisAppPath=\"Default Web Site/MP/TAB\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj" // pubblico su server deploy! publishToDeployServer("MP-TAB\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "TAB") }, failFast: false) } + else + { + echo 'Questo BRANCH non necessita di installer...' + } } } } diff --git a/MAPO.sln b/MAPO.sln index 24020712..e19ce0a1 100644 --- a/MAPO.sln +++ b/MAPO.sln @@ -24,6 +24,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8688B7C8-87E9-4FCE-B607-9C3F963CD6B7}" ProjectSection(SolutionItems) = preProject Appunti.md = Appunti.md + BranchConfSetup.md = BranchConfSetup.md + webAppSettings.config = webAppSettings.config + webConnectionString.config = webConnectionString.config EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MAKE", "MP-MAKE\MP-MAKE.csproj", "{E5A49351-F487-4329-8117-925A8FE662E5}" @@ -31,10 +34,8 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Donati|Any CPU = Donati|Any CPU IIS01|Any CPU = IIS01|Any CPU IIS02|Any CPU = IIS02|Any CPU - Jetco|Any CPU = Jetco|Any CPU OVH-Demo|Any CPU = OVH-Demo|Any CPU Release|Any CPU = Release|Any CPU Staging|Any CPU = Staging|Any CPU @@ -42,14 +43,10 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {663F7136-F470-4911-A9B6-044447F93168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.Debug|Any CPU.Build.0 = Debug|Any CPU - {663F7136-F470-4911-A9B6-044447F93168}.Donati|Any CPU.ActiveCfg = Release|Any CPU - {663F7136-F470-4911-A9B6-044447F93168}.Donati|Any CPU.Build.0 = Release|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.IIS01|Any CPU.ActiveCfg = Release|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.IIS01|Any CPU.Build.0 = Release|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.ActiveCfg = Release|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.Build.0 = Release|Any CPU - {663F7136-F470-4911-A9B6-044447F93168}.Jetco|Any CPU.ActiveCfg = Release|Any CPU - {663F7136-F470-4911-A9B6-044447F93168}.Jetco|Any CPU.Build.0 = Release|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU {663F7136-F470-4911-A9B6-044447F93168}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -58,14 +55,10 @@ Global {663F7136-F470-4911-A9B6-044447F93168}.Staging|Any CPU.Build.0 = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Donati|Any CPU.ActiveCfg = Release|Any CPU - {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Donati|Any CPU.Build.0 = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.ActiveCfg = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.Build.0 = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.ActiveCfg = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.Build.0 = Release|Any CPU - {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Jetco|Any CPU.ActiveCfg = Release|Any CPU - {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Jetco|Any CPU.Build.0 = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,14 +67,10 @@ Global {4617A665-D6E3-4CEB-A689-CE2EECD45713}.Staging|Any CPU.Build.0 = Release|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Donati|Any CPU.ActiveCfg = Donati|Any CPU - {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Donati|Any CPU.Build.0 = Donati|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS01|Any CPU.Build.0 = IIS01|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS02|Any CPU.Build.0 = IIS02|Any CPU - {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU - {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Jetco|Any CPU.Build.0 = Jetco|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -90,14 +79,10 @@ Global {119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Staging|Any CPU.Build.0 = Staging|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Donati|Any CPU.ActiveCfg = Donati|Any CPU - {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Donati|Any CPU.Build.0 = Donati|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS01|Any CPU.Build.0 = IIS01|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.IIS02|Any CPU.Build.0 = IIS02|Any CPU - {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU - {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Jetco|Any CPU.Build.0 = Jetco|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -106,14 +91,10 @@ Global {18C9C6CF-52CB-4299-BC6E-C1DC78DF632C}.Staging|Any CPU.Build.0 = Staging|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Donati|Any CPU.ActiveCfg = Donati|Any CPU - {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Donati|Any CPU.Build.0 = Donati|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS01|Any CPU.Build.0 = IIS01|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS02|Any CPU.Build.0 = IIS02|Any CPU - {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU - {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Jetco|Any CPU.Build.0 = Jetco|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -122,14 +103,10 @@ Global {CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Staging|Any CPU.Build.0 = Staging|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Donati|Any CPU.ActiveCfg = Donati|Any CPU - {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Donati|Any CPU.Build.0 = Donati|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS01|Any CPU.Build.0 = IIS01|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS02|Any CPU.Build.0 = IIS02|Any CPU - {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU - {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Jetco|Any CPU.Build.0 = Jetco|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -138,14 +115,10 @@ Global {BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Staging|Any CPU.Build.0 = Staging|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Donati|Any CPU.ActiveCfg = Donati|Any CPU - {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Donati|Any CPU.Build.0 = Donati|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS01|Any CPU.Build.0 = IIS01|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS02|Any CPU.Build.0 = IIS02|Any CPU - {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU - {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Jetco|Any CPU.Build.0 = Jetco|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -154,14 +127,10 @@ Global {51F720FE-7BED-4275-93B1-CDA9A9B53670}.Staging|Any CPU.Build.0 = Staging|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}.Donati|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Donati|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}.Jetco|Any CPU.ActiveCfg = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Jetco|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -170,14 +139,10 @@ Global {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Staging|Any CPU.Build.0 = Release|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Donati|Any CPU.ActiveCfg = Donati|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Donati|Any CPU.Build.0 = Donati|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS01|Any CPU.Build.0 = IIS01|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.IIS02|Any CPU.Build.0 = IIS02|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Jetco|Any CPU.Build.0 = Jetco|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -186,14 +151,10 @@ Global {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Staging|Any CPU.Build.0 = Staging|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5A49351-F487-4329-8117-925A8FE662E5}.Donati|Any CPU.ActiveCfg = Debug|Any CPU - {E5A49351-F487-4329-8117-925A8FE662E5}.Donati|Any CPU.Build.0 = Debug|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.IIS01|Any CPU.Build.0 = Release|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.IIS02|Any CPU.ActiveCfg = Release|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.IIS02|Any CPU.Build.0 = Release|Any CPU - {E5A49351-F487-4329-8117-925A8FE662E5}.Jetco|Any CPU.ActiveCfg = Release|Any CPU - {E5A49351-F487-4329-8117-925A8FE662E5}.Jetco|Any CPU.Build.0 = Release|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/MP-Admin/MP-Admin.csproj.user b/MP-Admin/MP-Admin.csproj.user index 8dabf90c..3b118c25 100644 --- a/MP-Admin/MP-Admin.csproj.user +++ b/MP-Admin/MP-Admin.csproj.user @@ -10,7 +10,7 @@ - Staging|Any CPU + Prod|Any CPU diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index fc238e43..adf77f49 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - Staging|Any CPU + Prod|Any CPU diff --git a/MP-MON/MP-MON.csproj.user b/MP-MON/MP-MON.csproj.user index 3ed56025..d13000c8 100644 --- a/MP-MON/MP-MON.csproj.user +++ b/MP-MON/MP-MON.csproj.user @@ -19,7 +19,7 @@ - Staging|Any CPU + Prod|Any CPU diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index cfeaee48..afd15656 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -10,7 +10,7 @@ - Staging|Any CPU + Prod|Any CPU diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 1c32521f..5579f730 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -556,13 +556,10 @@ Web.config - - Web.config - Web.config - + Web.config @@ -992,9 +989,6 @@ - - Web.config - Web.config Designer diff --git a/MP-TAB/Web.Donati.config b/MP-TAB/Web.Donati.config deleted file mode 100644 index 476cb07e..00000000 --- a/MP-TAB/Web.Donati.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-TAB/Web.IIS01.config b/MP-TAB/Web.IIS01.config deleted file mode 100644 index da245199..00000000 --- a/MP-TAB/Web.IIS01.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/MP-TAB/Web.IIS02.config b/MP-TAB/Web.IIS02.config deleted file mode 100644 index da245199..00000000 --- a/MP-TAB/Web.IIS02.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/MP-TAB/Web.Jetco.config b/MP-TAB/Web.Jetco.config deleted file mode 100644 index 5f8fe07b..00000000 --- a/MP-TAB/Web.Jetco.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-TAB/Web.Prod.config b/MP-TAB/Web.Prod.config new file mode 100644 index 00000000..014c369e --- /dev/null +++ b/MP-TAB/Web.Prod.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP-TAB/Web.Release.config b/MP-TAB/Web.Release.config index 4122d79b..c93c6701 100644 --- a/MP-TAB/Web.Release.config +++ b/MP-TAB/Web.Release.config @@ -1,31 +1,6 @@ - - - - + - - \ No newline at end of file diff --git a/MP-TAB/Web.Steamware.config b/MP-TAB/Web.Steamware.config deleted file mode 100644 index 38172868..00000000 --- a/MP-TAB/Web.Steamware.config +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-TAB/Web.Valgasket.config b/MP-TAB/Web.Valgasket.config deleted file mode 100644 index da245199..00000000 --- a/MP-TAB/Web.Valgasket.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config index 406dc21a..944870cd 100644 --- a/MP-TAB/Web.config +++ b/MP-TAB/Web.config @@ -31,7 +31,10 @@ - + + + - + diff --git a/MP/MP.csproj.user b/MP/MP.csproj.user index 60f5b806..2c1916eb 100644 --- a/MP/MP.csproj.user +++ b/MP/MP.csproj.user @@ -10,7 +10,7 @@ - Staging|Any CPU + Prod|Any CPU