Browse Source

Updates for .NET 6 Preview 6.

philliphoff-arm64
Phillip Hoff 5 years ago
parent
commit
c774c2bfeb
  1. 6
      global.json
  2. 11
      src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs
  3. 4
      src/Microsoft.Tye.Hosting/TyeHost.cs

6
global.json

@ -1,12 +1,12 @@
{ {
"tools": { "tools": {
"dotnet": "6.0.100-preview.5.21302.13", "dotnet": "6.0.100-preview.6.21355.2",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"6.0.0-preview.5.21301.5" "6.0.0-preview.6.21352.12"
], ],
"aspnetcore": [ "aspnetcore": [
"6.0.0-preview.5.21301.17" "6.0.0-preview.6.21355.2"
] ]
} }
}, },

11
src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs

@ -37,9 +37,9 @@ namespace Microsoft.Tye.Hosting
_logs = logs; _logs = logs;
} }
public IDisposable? BeginScope<TState>(TState state) public IDisposable BeginScope<TState>(TState state)
{ {
return null; return new NoOpScope();
} }
public bool IsEnabled(LogLevel logLevel) public bool IsEnabled(LogLevel logLevel)
@ -59,6 +59,13 @@ namespace Microsoft.Tye.Hosting
_logs.OnNext(exception.ToString()); _logs.OnNext(exception.ToString());
} }
} }
private sealed class NoOpScope : IDisposable
{
public void Dispose()
{
}
}
} }
} }
} }

4
src/Microsoft.Tye.Hosting/TyeHost.cs

@ -333,7 +333,7 @@ namespace Microsoft.Tye.Hosting
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error while shutting down"); _logger?.LogError(ex, "Error while shutting down");
} }
finally finally
{ {
@ -375,7 +375,7 @@ namespace Microsoft.Tye.Hosting
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error launching dashboard."); _logger?.LogError(ex, "Error launching dashboard.");
} }
} }

Loading…
Cancel
Save