diff --git a/global.json b/global.json index ba6539de..3ea7289e 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,12 @@ { "tools": { - "dotnet": "6.0.100-preview.5.21302.13", + "dotnet": "6.0.100-preview.6.21355.2", "runtimes": { "dotnet": [ - "6.0.0-preview.5.21301.5" + "6.0.0-preview.6.21352.12" ], "aspnetcore": [ - "6.0.0-preview.5.21301.17" + "6.0.0-preview.6.21355.2" ] } }, diff --git a/src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs b/src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs index 04a1fc2d..5885ba8b 100644 --- a/src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs +++ b/src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs @@ -37,9 +37,9 @@ namespace Microsoft.Tye.Hosting _logs = logs; } - public IDisposable? BeginScope(TState state) + public IDisposable BeginScope(TState state) { - return null; + return new NoOpScope(); } public bool IsEnabled(LogLevel logLevel) @@ -59,6 +59,13 @@ namespace Microsoft.Tye.Hosting _logs.OnNext(exception.ToString()); } } + + private sealed class NoOpScope : IDisposable + { + public void Dispose() + { + } + } } } } diff --git a/src/Microsoft.Tye.Hosting/TyeHost.cs b/src/Microsoft.Tye.Hosting/TyeHost.cs index 2392601f..8e6d3b27 100644 --- a/src/Microsoft.Tye.Hosting/TyeHost.cs +++ b/src/Microsoft.Tye.Hosting/TyeHost.cs @@ -333,7 +333,7 @@ namespace Microsoft.Tye.Hosting } catch (Exception ex) { - _logger.LogError(ex, "Error while shutting down"); + _logger?.LogError(ex, "Error while shutting down"); } finally { @@ -375,7 +375,7 @@ namespace Microsoft.Tye.Hosting } catch (Exception ex) { - _logger.LogError(ex, "Error launching dashboard."); + _logger?.LogError(ex, "Error launching dashboard."); } }