diff --git a/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs b/src/Umbraco.Abstractions/Logging/DebugDiagnosticsLogger.cs
similarity index 77%
rename from src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
rename to src/Umbraco.Abstractions/Logging/DebugDiagnosticsLogger.cs
index d1bde55306..552daba713 100644
--- a/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
+++ b/src/Umbraco.Abstractions/Logging/DebugDiagnosticsLogger.cs
@@ -7,6 +7,13 @@ namespace Umbraco.Core.Logging
///
public class DebugDiagnosticsLogger : ILogger
{
+ private readonly IMessageTemplates _messageTemplates;
+
+ public DebugDiagnosticsLogger(IMessageTemplates messageTemplates)
+ {
+ _messageTemplates = messageTemplates;
+ }
+
public bool IsEnabled(Type reporting, LogLevel level)
=> true;
@@ -31,7 +38,7 @@ namespace Umbraco.Core.Logging
///
public void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
{
- System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, reporting.FullName);
}
///
@@ -61,7 +68,7 @@ namespace Umbraco.Core.Logging
///
public void Error(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
{
- System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, reporting.FullName);
}
///
@@ -79,7 +86,7 @@ namespace Umbraco.Core.Logging
///
public void Warn(Type reporting, string message, params object[] propertyValues)
{
- System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(message, propertyValues), reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(message, propertyValues), reporting.FullName);
}
///
@@ -91,7 +98,7 @@ namespace Umbraco.Core.Logging
///
public void Warn(Type reporting, Exception exception, string message, params object[] propertyValues)
{
- System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(message + Environment.NewLine + exception, propertyValues), reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(message + Environment.NewLine + exception, propertyValues), reporting.FullName);
}
///
@@ -103,7 +110,7 @@ namespace Umbraco.Core.Logging
///
public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
{
- System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
}
///
@@ -115,7 +122,7 @@ namespace Umbraco.Core.Logging
///
public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
{
- System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
}
///
@@ -127,7 +134,7 @@ namespace Umbraco.Core.Logging
///
public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
{
- System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
}
}
}
diff --git a/src/Umbraco.Abstractions/Logging/IMessageTemplates.cs b/src/Umbraco.Abstractions/Logging/IMessageTemplates.cs
new file mode 100644
index 0000000000..60aa1035ad
--- /dev/null
+++ b/src/Umbraco.Abstractions/Logging/IMessageTemplates.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Logging
+{
+ public interface IMessageTemplates
+ {
+ string Render(string messageTemplate, params object[] args);
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Logging/LogProfiler.cs b/src/Umbraco.Abstractions/Logging/LogProfiler.cs
similarity index 97%
rename from src/Umbraco.Core/Logging/LogProfiler.cs
rename to src/Umbraco.Abstractions/Logging/LogProfiler.cs
index 74dae545b4..294f92dad3 100644
--- a/src/Umbraco.Core/Logging/LogProfiler.cs
+++ b/src/Umbraco.Abstractions/Logging/LogProfiler.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Logging
///
/// Implements by writing profiling results to an .
///
- internal class LogProfiler : IProfiler
+ public class LogProfiler : IProfiler
{
private readonly ILogger _logger;
diff --git a/src/Umbraco.Core/Logging/LoggingTaskExtension.cs b/src/Umbraco.Abstractions/Logging/LoggingTaskExtension.cs
similarity index 100%
rename from src/Umbraco.Core/Logging/LoggingTaskExtension.cs
rename to src/Umbraco.Abstractions/Logging/LoggingTaskExtension.cs
diff --git a/src/Umbraco.Core/Logging/VoidProfiler.cs b/src/Umbraco.Abstractions/Logging/VoidProfiler.cs
similarity index 92%
rename from src/Umbraco.Core/Logging/VoidProfiler.cs
rename to src/Umbraco.Abstractions/Logging/VoidProfiler.cs
index 24eb8e81c3..51bec521a3 100644
--- a/src/Umbraco.Core/Logging/VoidProfiler.cs
+++ b/src/Umbraco.Abstractions/Logging/VoidProfiler.cs
@@ -2,7 +2,7 @@
namespace Umbraco.Core.Logging
{
- internal class VoidProfiler : IProfiler
+ public class VoidProfiler : IProfiler
{
private readonly VoidDisposable _disposable = new VoidDisposable();
diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
index f12bf0dd63..ed64347816 100644
--- a/src/Umbraco.Core/Composing/Current.cs
+++ b/src/Umbraco.Core/Composing/Current.cs
@@ -113,7 +113,7 @@ namespace Umbraco.Core.Composing
public static ILogger Logger
=> _logger ?? (_logger = _factory?.TryGetInstance()
- ?? new DebugDiagnosticsLogger());
+ ?? new DebugDiagnosticsLogger(new MessageTemplates()));
public static IProfiler Profiler
=> _profiler ?? (_profiler = _factory?.TryGetInstance()
diff --git a/src/Umbraco.Core/Logging/MessageTemplates.cs b/src/Umbraco.Core/Logging/MessageTemplates.cs
index 47de1230ff..887aa1402d 100644
--- a/src/Umbraco.Core/Logging/MessageTemplates.cs
+++ b/src/Umbraco.Core/Logging/MessageTemplates.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Core.Logging
///
/// Provides tools to support message templates.
///
- public static class MessageTemplates
+ public class MessageTemplates : IMessageTemplates
{
// Umbraco now uses Message Templates (https://messagetemplates.org/) for logging, which means
// we cannot plainly use string.Format() to format them. There is a work-in-progress C# lib,
@@ -21,7 +21,7 @@ namespace Umbraco.Core.Logging
private static readonly Lazy MinimalLogger = new Lazy(() => new LoggerConfiguration().CreateLogger());
- public static string Render(string messageTemplate, params object[] args)
+ public string Render(string messageTemplate, params object[] args)
{
// by default, unless initialized otherwise, Log.Logger is SilentLogger which cannot bind message
// templates. Log.Logger is set to a true Logger when initializing Umbraco's logger, but in case
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index d41240c586..25de78105f 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -572,13 +572,9 @@
-
-
-
-
diff --git a/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
index d6dc1f8c73..dc260c4a3b 100644
--- a/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
+++ b/src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Tests.Benchmarks
[GlobalSetup]
public void Setup()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var path = TestHelper.CurrentAssemblyDirectory;
SetupSqlCe(path, logger);
diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
index ca622e9288..5511c5cba3 100644
--- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
@@ -94,7 +94,7 @@ namespace Umbraco.Tests.Composing
private static IProfilingLogger GetTestProfilingLogger()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}
diff --git a/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs b/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs
index c13d141fa5..01c93a40ec 100644
--- a/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs
+++ b/src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateTableOfTDto()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var builder = Mock.Of();
Mock.Get(builder)
@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void DeleteKeysAndIndexesOfTDto()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var builder = Mock.Of();
Mock.Get(builder)
@@ -87,7 +87,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateKeysAndIndexesOfTDto()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var builder = Mock.Of();
Mock.Get(builder)
@@ -124,7 +124,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateKeysAndIndexes()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var builder = Mock.Of();
Mock.Get(builder)
@@ -161,7 +161,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateColumn()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var builder = Mock.Of();
Mock.Get(builder)
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 3116087669..8dded05eab 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -55,7 +55,7 @@ namespace Umbraco.Tests.Models
var mediaTypeService = Mock.Of();
var memberTypeService = Mock.Of();
Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService, contentTypeBaseServiceProvider: new ContentTypeBaseServiceProvider(_contentTypeService, mediaTypeService, memberTypeService)));
-
+
}
[Test]
@@ -236,7 +236,7 @@ namespace Umbraco.Tests.Models
private static IProfilingLogger GetTestProfilingLogger()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}
diff --git a/src/Umbraco.Tests/Models/ContentTypeTests.cs b/src/Umbraco.Tests/Models/ContentTypeTests.cs
index 9c3b976bf3..74229dd5d6 100644
--- a/src/Umbraco.Tests/Models/ContentTypeTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTypeTests.cs
@@ -129,7 +129,7 @@ namespace Umbraco.Tests.Models
private static IProfilingLogger GetTestProfilingLogger()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs
index 2a6c1f4e12..85b07d4828 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs
+++ b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs
@@ -92,7 +92,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests
// create the db
// prob not what we want, this is not a real database, but hey, the test is ignored anyways
// we'll fix this when we have proper testing infrastructure
- var dbSqlServer = TestObjects.GetUmbracoSqlServerDatabase(new DebugDiagnosticsLogger());
+ var dbSqlServer = TestObjects.GetUmbracoSqlServerDatabase(new DebugDiagnosticsLogger(new MessageTemplates()));
//drop the table
dbSqlServer.Execute("DROP TABLE [umbracoServer]");
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 5850153100..7cf3c008f1 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Tests.Runtimes
// test runtime
public class TestRuntime : CoreRuntime
{
- protected override ILogger GetLogger() => new DebugDiagnosticsLogger();
+ protected override ILogger GetLogger() => new DebugDiagnosticsLogger(new MessageTemplates());
protected override IProfiler GetProfiler() => new TestProfiler();
// must override the database factory
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index d0258a100f..fdeb743b6c 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.Runtimes
// FIXME: we need a better management of settings here (and, true config files?)
// create the very basic and essential things we need
- var logger = new ConsoleLogger();
+ var logger = new ConsoleLogger(new MessageTemplates());
var profiler = new LogProfiler(logger);
var profilingLogger = new ProfilingLogger(logger, profiler);
var appCaches = new AppCaches(); // FIXME: has HttpRuntime stuff?
@@ -244,7 +244,7 @@ namespace Umbraco.Tests.Runtimes
// - assigning the factory to Current.Factory
// create the very basic and essential things we need
- var logger = new ConsoleLogger();
+ var logger = new ConsoleLogger(new MessageTemplates());
var profiler = Mock.Of();
var profilingLogger = new ProfilingLogger(logger, profiler);
var appCaches = AppCaches.Disabled;
diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
index 3664717af7..27abca7cbd 100644
--- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
+++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Scheduling
[OneTimeSetUp]
public void InitializeFixture()
{
- _logger = new DebugDiagnosticsLogger();
+ _logger = new DebugDiagnosticsLogger(new MessageTemplates());
}
[Test]
diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs
index 8e886d7dc9..6a65f3afbc 100644
--- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs
+++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Scheduling
[Timeout(4000)]
public async Task ThreadResumeIssue()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var runner = new BackgroundTaskRunner(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger);
var work = new ThreadResumeIssueWorkItem();
runner.Add(work);
@@ -76,7 +76,7 @@ namespace Umbraco.Tests.Scheduling
[Ignore("Only runs in the debugger.")]
public async Task DebuggerInterferenceIssue()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var runner = new BackgroundTaskRunner(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger);
var taskCompleted = false;
runner.TaskCompleted += (sender, args) =>
diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
index ef80672baf..ace45fe356 100644
--- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
+++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Tests.Services
private static IProfilingLogger GetTestProfilingLogger()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}
@@ -268,7 +268,7 @@ namespace Umbraco.Tests.Services
var tagRepo = new TagRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger);
var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, tRepository, AppCaches);
var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches.Disabled, Logger);
- var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository, languageRepository);
+ var ctRepository = new ContentTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, commonRepository, languageRepository);
var repository = new DocumentRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, ctRepository, tRepository, tagRepo, languageRepository);
// Act
diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs
index 9cf38e1789..0ac6eeb863 100644
--- a/src/Umbraco.Tests/Services/PerformanceTests.cs
+++ b/src/Umbraco.Tests/Services/PerformanceTests.cs
@@ -60,7 +60,7 @@ namespace Umbraco.Tests.Services
private static IProfilingLogger GetTestProfilingLogger()
{
- var logger = new DebugDiagnosticsLogger();
+ var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}
diff --git a/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs b/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
index a3e36db363..53d6078e4b 100644
--- a/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
+++ b/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
@@ -5,6 +5,13 @@ namespace Umbraco.Tests.TestHelpers
{
public class ConsoleLogger : ILogger
{
+ private readonly IMessageTemplates _messageTemplates;
+
+ public ConsoleLogger(IMessageTemplates messageTemplates)
+ {
+ _messageTemplates = messageTemplates;
+ }
+
public bool IsEnabled(Type reporting, LogLevel level)
=> true;
@@ -27,13 +34,13 @@ namespace Umbraco.Tests.TestHelpers
public void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
{
- Console.WriteLine("FATAL {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
+ Console.WriteLine("FATAL {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine(exception);
}
public void Fatal(Type reporting, string messageTemplate, params object[] propertyValues)
{
- Console.WriteLine("FATAL {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
+ Console.WriteLine("FATAL {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void Error(Type reporting, Exception exception, string message)
@@ -55,13 +62,13 @@ namespace Umbraco.Tests.TestHelpers
public void Error(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
{
- Console.WriteLine("ERROR {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
+ Console.WriteLine("ERROR {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine(exception);
}
public void Error(Type reporting, string messageTemplate, params object[] propertyValues)
{
- Console.WriteLine("ERROR {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
+ Console.WriteLine("ERROR {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void Warn(Type reporting, string message)
@@ -71,7 +78,7 @@ namespace Umbraco.Tests.TestHelpers
public void Warn(Type reporting, string message, params object[] propertyValues)
{
- Console.WriteLine("WARN {0} - {1}", reporting.Name, MessageTemplates.Render(message, propertyValues));
+ Console.WriteLine("WARN {0} - {1}", reporting.Name, _messageTemplates.Render(message, propertyValues));
}
public void Warn(Type reporting, Exception exception, string message)
@@ -82,13 +89,13 @@ namespace Umbraco.Tests.TestHelpers
public void Warn(Type reporting, Exception exception, string message, params object[] propertyValues)
{
- Console.WriteLine("WARN {0} - {1}", reporting.Name, MessageTemplates.Render(message, propertyValues));
+ Console.WriteLine("WARN {0} - {1}", reporting.Name, _messageTemplates.Render(message, propertyValues));
Console.WriteLine(exception);
}
public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
{
- Console.WriteLine("INFO {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
+ Console.WriteLine("INFO {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void Info(Type reporting, string message)
@@ -103,7 +110,7 @@ namespace Umbraco.Tests.TestHelpers
public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
{
- Console.WriteLine("DEBUG {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
+ Console.WriteLine("DEBUG {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void Verbose(Type reporting, string message)
@@ -113,7 +120,7 @@ namespace Umbraco.Tests.TestHelpers
public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
{
- Console.WriteLine("VERBOSE {0} - {1}", reporting.Name, MessageTemplates.Render(messageTemplate, propertyValues));
+ Console.WriteLine("VERBOSE {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
}
}
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 7e72a5aefb..2f86bddb3b 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -190,7 +190,7 @@ namespace Umbraco.Tests.Testing
profiler = new LogProfiler(logger);
break;
case UmbracoTestOptions.Logger.Console:
- logger = new ConsoleLogger();
+ logger = new ConsoleLogger(new MessageTemplates());
profiler = new LogProfiler(logger);
break;
default: