Update console logger and set content root. (#1903)

Update console logger to 5.0.0
Set content root to correctly load application settings.

diff --git a/eng/Versions.props b/eng/Versions.props
index 154fb9f32e7d038f2841cd41474faafd38446892..fd1145456f17219d3ede33a8a46a4c3b4d685565 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,7 +53,7 @@
     <MicrosoftExtensionsDependencyInjectionVersion>2.1.1</MicrosoftExtensionsDependencyInjectionVersion>
     <MicrosoftExtensionsHostingAbstractionsVersion>2.1.1</MicrosoftExtensionsHostingAbstractionsVersion>
     <MicrosoftExtensionsLoggingVersion>2.1.1</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>2.1.1</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>5.0.0</MicrosoftExtensionsLoggingConsoleVersion>
     <!-- We use a newer version of LoggingEventSource due to a bug in an older version-->
     <MicrosoftExtensionsLoggingEventSourceVersion>3.1.4</MicrosoftExtensionsLoggingEventSourceVersion>
     <SystemCommandLineVersion>2.0.0-beta1.20468.1</SystemCommandLineVersion>

diff --git a/src/Microsoft.Diagnostics.Monitoring.RestServer/appsettings.json b/src/Microsoft.Diagnostics.Monitoring.RestServer/appsettings.json
index f64be2ad196d20062efb01b612948ad98ef74e98..bb0389bc56fd6878679a72e42ab4ee4203ee5996 100644 (file)
--- a/src/Microsoft.Diagnostics.Monitoring.RestServer/appsettings.json
+++ b/src/Microsoft.Diagnostics.Monitoring.RestServer/appsettings.json
@@ -6,8 +6,11 @@
       "Microsoft.Hosting.Lifetime": "Information"
     },
     "Console": {
-      "IncludeScopes": true,
-      "TimestampFormat": "HH:mm:ss "
+      "FormatterName": "simple",
+      "FormatterOptions": {
+        "IncludeScopes": true,
+        "TimestampFormat": "HH:mm:ss "
+      }
     },
     "EventLog": {
       "LogLevel": {

diff --git a/src/Tools/dotnet-monitor/DiagnosticsMonitorCommandHandler.cs b/src/Tools/dotnet-monitor/DiagnosticsMonitorCommandHandler.cs
index e8a82155cb58debf9a40e7be91be2da1612b7c64..a2bfd798fb6fe44fe7c9c3d4f365502816f85c1a 100644 (file)
--- a/src/Tools/dotnet-monitor/DiagnosticsMonitorCommandHandler.cs
+++ b/src/Tools/dotnet-monitor/DiagnosticsMonitorCommandHandler.cs
@@ -61,6 +61,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor
             }
 
             return Host.CreateDefaultBuilder()
+                .UseContentRoot(AppContext.BaseDirectory) // Use the application root instead of the current directory
                 .ConfigureAppConfiguration((IConfigurationBuilder builder) =>
                 {
                     //Note these are in precedence order.

diff --git a/src/Tools/dotnet-monitor/dotnet-monitor.csproj b/src/Tools/dotnet-monitor/dotnet-monitor.csproj
index 2c54cb859b8c07df647928c6a366431b99dad1db..f323d2ac36132ac0af0a59aee372bf307cd32b2c 100644 (file)
--- a/src/Tools/dotnet-monitor/dotnet-monitor.csproj
+++ b/src/Tools/dotnet-monitor/dotnet-monitor.csproj
@@ -23,6 +23,7 @@
   <ItemGroup>
     <PackageReference Include="Azure.Storage.Blobs" Version="$(AzureStorageBlobsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="$(MicrosoftExtensionsConfigurationKeyPerFileVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
   </ItemGroup>