diff --git a/Vrh.Web.Reporting/Properties/AssemblyInfo.cs b/Vrh.Web.Reporting/Properties/AssemblyInfo.cs index 85d8cb3..ce526b7 100644 --- a/Vrh.Web.Reporting/Properties/AssemblyInfo.cs +++ b/Vrh.Web.Reporting/Properties/AssemblyInfo.cs @@ -36,6 +36,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.1.0")] -[assembly: AssemblyFileVersion("1.1.1.0")] -[assembly: AssemblyInformationalVersion("1.1.1")] +[assembly: AssemblyVersion("1.1.2.0")] +[assembly: AssemblyFileVersion("1.1.2.0")] +[assembly: AssemblyInformationalVersion("1.1.2")] diff --git a/Vrh.Web.Reporting/WebServerHostedServiceStarter.cs b/Vrh.Web.Reporting/WebServerHostedServiceStarter.cs index 6dc4948..97558eb 100644 --- a/Vrh.Web.Reporting/WebServerHostedServiceStarter.cs +++ b/Vrh.Web.Reporting/WebServerHostedServiceStarter.cs @@ -286,7 +286,9 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS websitename = websitename ?? HostingEnvironment.SiteName; //websitename = System.Web.Hosting.HostingEnvironment.ApplicationHost.GetSiteName(); webapplicationname = webapplicationname ?? HostingEnvironment.ApplicationVirtualPath; //webapplicationname = System.Web.HttpRuntime.AppDomainAppVirtualPath; applicationpoolname = applicationpoolname ?? GetCurrentApplicationPoolName(websitename); - string autostartprovidername = (websitename + "____" + applicationpoolname + "____" + webapplicationname).Replace(" ", "_").Replace("-", "_").Replace("/", "_"); + const string PARTSEP = "____"; + string autostartprovidername = string.Concat(websitename,PARTSEP,applicationpoolname,PARTSEP,webapplicationname, PARTSEP, typeof(WebServerHostedServiceStarter).FullName) + .Replace(" ", "_").Replace("-", "_").Replace("/", "_").Replace(".", "_"); string serviceAutoStartProviderTypeFullName = serviceAutoStartProviderType.FullName; string serviceAutoStartProviderAssassemblyName = serviceAutoStartProviderType.Assembly.GetName().Name; string configfilepath = Path.Combine(NativeSystemPath, CONFIGFILEDIRECTORY, CONFIGFILENAME); @@ -325,7 +327,7 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS } reader = new StreamReader(file, Encoding.ASCII); - filecontent = ProcessFileContent(le, reader.ReadToEnd(), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value); + filecontent = ProcessFileContent(reader.ReadToEnd(), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value); configchanged = filecontent != null; if (configchanged) { @@ -337,7 +339,7 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS } else { - filecontent = ProcessFileContent(le, System.IO.File.ReadAllText(configfilepath), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value); + filecontent = ProcessFileContent(System.IO.File.ReadAllText(configfilepath), applicationpoolname, websitename, webapplicationname, autostartprovidername, serviceAutoStartProviderAssassemblyName, serviceAutoStartProviderTypeFullName, disablemode.Value); configchanged = filecontent != null; if (configchanged) System.IO.File.WriteAllText(configfilepath, filecontent); } @@ -348,7 +350,7 @@ namespace Vrh.Web.WebServerHostedServiceStarterNS catch (Exception ex) { le.AddDataField("SetupAutoStart EXCEPTION",ex.Message); le.SetLogLevel(LogLevel.Error); return; } finally { if (writele) le.Write(); } } - private static string ProcessFileContent(DCLogEntry le, string filecontent,string applicationpoolname,string websitename,string webapplicationname,string autostartprovidername,string serviceAutoStartProviderAssassemblyName, string serviceAutoStartProviderTypeFullName,bool disablemode) + private static string ProcessFileContent(string filecontent,string applicationpoolname,string websitename,string webapplicationname,string autostartprovidername,string serviceAutoStartProviderAssassemblyName, string serviceAutoStartProviderTypeFullName,bool disablemode) { const string SYSTEMAPPLICATIONHOST_ELEMENT = "system.applicationHost"; const string APPLICATIONPOOLS_ELEMENT = "applicationPools"; -- libgit2 0.21.2