Skip to content

Commit a6d2b10

Browse files
authored
[Group 4] Enable nullable annotations for Microsoft.Extensions.Logging.TraceSource (#66892)
1 parent ca8ddae commit a6d2b10

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Microsoft.Extensions.Logging.TraceSource
2020
public partial class TraceSourceLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, System.IDisposable
2121
{
2222
public TraceSourceLoggerProvider(System.Diagnostics.SourceSwitch rootSourceSwitch) { }
23-
public TraceSourceLoggerProvider(System.Diagnostics.SourceSwitch rootSourceSwitch, System.Diagnostics.TraceListener rootTraceListener) { }
23+
public TraceSourceLoggerProvider(System.Diagnostics.SourceSwitch rootSourceSwitch, System.Diagnostics.TraceListener? rootTraceListener) { }
2424
public Microsoft.Extensions.Logging.ILogger CreateLogger(string name) { throw null; }
2525
public void Dispose() { }
2626
}

src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
4+
<Nullable>enable</Nullable>
45
</PropertyGroup>
56

67
<ItemGroup>

src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
5+
<Nullable>enable</Nullable>
56
<EnableDefaultItems>true</EnableDefaultItems>
67
<!-- Use targeting pack references instead of granular ones in the project file. -->
78
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>

src/libraries/Microsoft.Extensions.Logging.TraceSource/src/TraceSourceLogger.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public TraceSourceLogger(DiagnosticsTraceSource traceSource)
1616
_traceSource = traceSource;
1717
}
1818

19-
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
19+
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
2020
{
2121
if (!IsEnabled(logLevel))
2222
{
@@ -36,7 +36,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
3636

3737
if (exception != null)
3838
{
39-
string exceptionDelimiter = string.IsNullOrEmpty(message) ? string.Empty : " " ;
39+
string exceptionDelimiter = string.IsNullOrEmpty(message) ? string.Empty : " ";
4040
message += exceptionDelimiter + exception;
4141
}
4242

@@ -70,7 +70,7 @@ private static TraceEventType GetEventType(LogLevel logLevel)
7070
}
7171
}
7272

73-
public IDisposable BeginScope<TState>(TState state)
73+
public IDisposable BeginScope<TState>(TState state) where TState : notnull
7474
{
7575
return new TraceSourceScope(state);
7676
}

src/libraries/Microsoft.Extensions.Logging.TraceSource/src/TraceSourceLoggerProvider.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Microsoft.Extensions.Logging.TraceSource
1515
public class TraceSourceLoggerProvider : ILoggerProvider
1616
{
1717
private readonly SourceSwitch _rootSourceSwitch;
18-
private readonly TraceListener _rootTraceListener;
18+
private readonly TraceListener? _rootTraceListener;
1919

2020
private readonly ConcurrentDictionary<string, DiagnosticsTraceSource> _sources = new ConcurrentDictionary<string, DiagnosticsTraceSource>(StringComparer.OrdinalIgnoreCase);
2121

@@ -35,7 +35,7 @@ public TraceSourceLoggerProvider(SourceSwitch rootSourceSwitch)
3535
/// </summary>
3636
/// <param name="rootSourceSwitch">The <see cref="SourceSwitch"/> to use.</param>
3737
/// <param name="rootTraceListener">The <see cref="TraceListener"/> to use.</param>
38-
public TraceSourceLoggerProvider(SourceSwitch rootSourceSwitch!!, TraceListener rootTraceListener)
38+
public TraceSourceLoggerProvider(SourceSwitch rootSourceSwitch!!, TraceListener? rootTraceListener)
3939
{
4040
_rootSourceSwitch = rootSourceSwitch;
4141
_rootTraceListener = rootTraceListener;
@@ -59,7 +59,7 @@ private DiagnosticsTraceSource GetOrAddTraceSource(string name)
5959
private DiagnosticsTraceSource InitializeTraceSource(string traceSourceName)
6060
{
6161
var traceSource = new DiagnosticsTraceSource(traceSourceName);
62-
string parentSourceName = ParentSourceName(traceSourceName);
62+
string? parentSourceName = ParentSourceName(traceSourceName);
6363

6464
if (string.IsNullOrEmpty(parentSourceName))
6565
{
@@ -92,7 +92,7 @@ private DiagnosticsTraceSource InitializeTraceSource(string traceSourceName)
9292
return traceSource;
9393
}
9494

95-
private static string ParentSourceName(string traceSourceName)
95+
private static string? ParentSourceName(string traceSourceName)
9696
{
9797
int indexOfLastDot = traceSourceName.LastIndexOf('.');
9898
return indexOfLastDot == -1 ? null : traceSourceName.Substring(0, indexOfLastDot);

0 commit comments

Comments
 (0)