diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.WebContent/diagnostics.wadcfg b/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.WebContent/diagnostics.wadcfg new file mode 100644 index 000000000..ffb3acf35 --- /dev/null +++ b/src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.WebContent/diagnostics.wadcfg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config index 02c2206f7..4b8b809f6 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config +++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config @@ -8,6 +8,7 @@ + diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj index 72f3d0a00..801995ac6 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj +++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj @@ -50,6 +50,11 @@ ..\..\..\lib\autofac\Autofac.Integration.Web.dll True + + + + + False ..\..\..\lib\aspnetmvc\Microsoft.Web.Infrastructure.dll @@ -67,6 +72,8 @@ False + + ..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll True diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj index d208b03ad..b8c130361 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj @@ -49,13 +49,18 @@ False ..\..\..\..\lib\log4net\log4net.dll + + + + + False ..\..\..\..\lib\nhibernate\NHibernate.dll diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureConfigShellSettingsManager.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureConfigShellSettingsManager.cs index dc96b6f0a..68883bbcc 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureConfigShellSettingsManager.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureConfigShellSettingsManager.cs @@ -63,7 +63,7 @@ namespace Orchard.Azure.Services.Environment.Configuration { var settingsList = base.LoadSettings(); foreach (var settings in settingsList) { - foreach (var key in settings.Keys) { + foreach (var key in settings.Keys.ToArray()) { var cloudConfigurationKey = String.Format("{0}.{1}.{2}", _prefix, settings.Name, key); var cloudConfigurationValue = ParseValue(CloudConfigurationManager.GetSetting(cloudConfigurationKey)); if (cloudConfigurationValue != null) diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Services/Logging/AzureDiagnosticsAppender.cs b/src/Orchard.Web/Modules/Orchard.Azure/Services/Logging/AzureDiagnosticsAppender.cs index 654225bd0..e50446b54 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Services/Logging/AzureDiagnosticsAppender.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/Logging/AzureDiagnosticsAppender.cs @@ -2,6 +2,7 @@ using Microsoft.WindowsAzure.Diagnostics; using log4net.Appender; using log4net.Core; +using System.Diagnostics; namespace Orchard.Azure.Services.Logging { @@ -11,7 +12,7 @@ namespace Orchard.Azure.Services.Logging { public class AzureDiagnosticsAppender : AppenderSkeleton { private const string _wadStorageAccountConnectionStringSettingName = "Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString"; - + public AzureDiagnosticsAppender() { var defaultDiagnostics = DiagnosticMonitor.GetDefaultInitialConfiguration(); var period = TimeSpan.FromMinutes(1d); @@ -25,7 +26,7 @@ namespace Orchard.Azure.Services.Logging { protected override void Append(LoggingEvent loggingEvent) { var formattedMessage = RenderLoggingEvent(loggingEvent); - System.Diagnostics.Trace.WriteLine(formattedMessage); + Trace.WriteLine(formattedMessage); } } }