From 35ccf151aedc2d3bd12005c66f55b46a30ff4c7d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 31 Dec 2020 10:36:13 +0100 Subject: [PATCH] refresh conf x MP generale --- MAPO.sln | 22 +++++++++++++------ .../WebUserControls/mod_statoMacchina.ascx.cs | 2 +- .../Properties/PublishProfiles/IIS01.pubxml | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/MAPO.sln b/MAPO.sln index 16d94656..2f5bc949 100644 --- a/MAPO.sln +++ b/MAPO.sln @@ -27,7 +27,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-SITE", "MP-SITE\MP-SITE. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapoSDK", "MapoSDK\MapoSDK.csproj", "{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebConfigSetter", "WebConfigSetter\WebConfigSetter.csproj", "{58E9A6EB-C1E7-4C0F-B497-C0DE02D7B950}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagData", "MagData\MagData.csproj", "{973245E4-02C0-4ED1-A81B-1727C5F4CA59}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MAG", "MP-MAG\MP-MAG.csproj", "{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -90,12 +92,18 @@ Global {D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Prod|Any CPU.Build.0 = Release|Any CPU {D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU {D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.Build.0 = Release|Any CPU - {58E9A6EB-C1E7-4C0F-B497-C0DE02D7B950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58E9A6EB-C1E7-4C0F-B497-C0DE02D7B950}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58E9A6EB-C1E7-4C0F-B497-C0DE02D7B950}.Prod|Any CPU.ActiveCfg = Debug|Any CPU - {58E9A6EB-C1E7-4C0F-B497-C0DE02D7B950}.Prod|Any CPU.Build.0 = Debug|Any CPU - {58E9A6EB-C1E7-4C0F-B497-C0DE02D7B950}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58E9A6EB-C1E7-4C0F-B497-C0DE02D7B950}.Release|Any CPU.Build.0 = Release|Any CPU + {973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Debug|Any CPU.Build.0 = Debug|Any CPU + {973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Prod|Any CPU.ActiveCfg = Debug|Any CPU + {973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Prod|Any CPU.Build.0 = Debug|Any CPU + {973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Release|Any CPU.ActiveCfg = Release|Any CPU + {973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Release|Any CPU.Build.0 = Release|Any CPU + {ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Prod|Any CPU.ActiveCfg = Debug|Any CPU + {ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Prod|Any CPU.Build.0 = Debug|Any CPU + {ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index 6104e889..97a2440e 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -338,7 +338,7 @@ namespace MP_SITE.WebUserControls string urlMacchina; if (_IdxMacchina != "nd") { - urlMacchina = string.Format("~/images/macchine/{0}", resoconti.mngr.urlMacchina(IdxMacchina)); + urlMacchina = $"~/images/macchine/{resoconti.mngr.urlMacchina(IdxMacchina)}"; if (urlMacchina == "thumb_") { urlMacchina = "~/images/empty.png"; diff --git a/MP-TAB/Properties/PublishProfiles/IIS01.pubxml b/MP-TAB/Properties/PublishProfiles/IIS01.pubxml index 66f856fa..2c74c429 100644 --- a/MP-TAB/Properties/PublishProfiles/IIS01.pubxml +++ b/MP-TAB/Properties/PublishProfiles/IIS01.pubxml @@ -6,7 +6,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt MSDeploy - IIS01 + Debug Any CPU True