diff --git a/Jenkinsfile b/Jenkinsfile index 4c2e7d2a..491cc29c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1012']) { + withEnv(['NEXT_BUILD_NUMBER=1013']) { // env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MAPO.sln b/MAPO.sln index 63c252f6..dcd6c327 100644 --- a/MAPO.sln +++ b/MAPO.sln @@ -25,8 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-ADM", "MP-ADM\MP-ADM.csproj", "{E5A49351-F487-4329-8117-925A8FE662E5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-Site-old", "MP-Site-old\MP-Site-old.csproj", "{616F889A-BDBE-48B3-ADF6-32D69CB1EA96}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-SITE", "MP-SITE\MP-SITE.csproj", "{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}" EndProject Global @@ -169,22 +167,6 @@ Global {E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.Build.0 = Prod|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5A49351-F487-4329-8117-925A8FE662E5}.Release|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 = Release|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Donati|Any CPU.Build.0 = Release|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}.Prod|Any CPU.ActiveCfg = Prod|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Prod|Any CPU.Build.0 = Prod|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {616F889A-BDBE-48B3-ADF6-32D69CB1EA96}.Release|Any CPU.Build.0 = Release|Any CPU {F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU {F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Donati|Any CPU.ActiveCfg = Release|Any CPU diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 3d62744f..1100c938 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -409,8 +409,6 @@ - - diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 226a19a2..61a709a7 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -221,12 +221,6 @@ - - Always - - - Always - Designer diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 55066cc0..970efc09 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - IIS01|Any CPU + Debug|Any CPU diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj index 51bd1698..d0ef1364 100644 --- a/MP-LAND/MP-LAND.csproj +++ b/MP-LAND/MP-LAND.csproj @@ -256,12 +256,6 @@ - - Always - - - Always - TextTemplatingFileGenerator MPModel.edmx @@ -325,6 +319,7 @@ + diff --git a/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj index da187401..fabd0835 100644 --- a/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON.csproj @@ -287,15 +287,6 @@ Always - - Always - - - Always - - - Always - TextTemplatingFileGenerator MapoModel.edmx diff --git a/MP-MON/MP-MON.csproj.user b/MP-MON/MP-MON.csproj.user index 6a81cf4a..009e2263 100644 --- a/MP-MON/MP-MON.csproj.user +++ b/MP-MON/MP-MON.csproj.user @@ -19,7 +19,7 @@ - IIS01|Any CPU + Debug|Any CPU diff --git a/MP-SITE/Resources/Donati/BASI/web.config.ref b/MP-SITE/Resources/Donati/BASI/web.config.ref deleted file mode 100644 index 78d87ed3..00000000 --- a/MP-SITE/Resources/Donati/BASI/web.config.ref +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-SITE/Resources/Donati/LAVORAZIONI/Web.config.ref b/MP-SITE/Resources/Donati/LAVORAZIONI/Web.config.ref deleted file mode 100644 index d35a7e2e..00000000 --- a/MP-SITE/Resources/Donati/LAVORAZIONI/Web.config.ref +++ /dev/null @@ -1,206 +0,0 @@ - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index 43b02838..3452302a 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -333,8 +333,6 @@ - - compilerconfig.json diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index c9a953a4..c2cb7f33 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -8,7 +8,7 @@ - IIS01|Any CPU + Debug|Any CPU ShowAllFiles IIS02 diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 95c03d29..b8522e55 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -21,11 +21,9 @@ 4.0 - 44384 - - - - + 44328 + enabled + disabled @@ -421,12 +419,6 @@ Always - - Always - - - Always - Always @@ -1006,6 +998,8 @@ + + diff --git a/MP-TAB/Resources/Donati/BASI/Web.config.ref b/MP-TAB/Resources/Donati/BASI/Web.config.ref deleted file mode 100644 index 69e09e5c..00000000 --- a/MP-TAB/Resources/Donati/BASI/Web.config.ref +++ /dev/null @@ -1,168 +0,0 @@ - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MP-TAB/Resources/Donati/LAVORAZIONI/Web.config.ref b/MP-TAB/Resources/Donati/LAVORAZIONI/Web.config.ref deleted file mode 100644 index cebe06fe..00000000 --- a/MP-TAB/Resources/Donati/LAVORAZIONI/Web.config.ref +++ /dev/null @@ -1,163 +0,0 @@ - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file