feat: net5 for sentry.csproj (#589)

lucas-zimerman · bruno-garcia · web-flow · commit 2693b265176b · 2020-11-16T22:45:56.000-05:00
Co-authored-by: Bruno Garcia &lt;bruno@brunogarcia.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## vNext
 
+* Add target framework NET5.0 on Sentry.csproj. Change the type of `Extra` where value parameter become nullable. @lucas-zimerman 
 * Implement envelope caching. (#576) @Tyrrrz
 * Add a list of .NET Frameworks installed when available. (#531) @lucas-zimerman
 * Parse Mono and IL2CPP stacktraces for Unity and Xamarin (#578) @bruno-garcia
diff --git a/samples/Sentry.Samples.Console.Customized/Sentry.Samples.Console.Customized.csproj b/samples/Sentry.Samples.Console.Customized/Sentry.Samples.Console.Customized.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp2.1;net472</TargetFrameworks>
     <!--Set explicitly to demonstrate one way of defining the Sentry Release-->
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
   </PropertyGroup>
diff --git a/src/Sentry.Log4Net/SentryAppender.cs b/src/Sentry.Log4Net/SentryAppender.cs
@@ -127,7 +127,7 @@ protected override void Append(LoggingEvent loggingEvent)
             _ = Hub.CaptureEvent(evt);
         }
 
-        private static IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperties(LoggingEvent loggingEvent)
+        private static IEnumerable<KeyValuePair<string, object?>> GetLoggingEventProperties(LoggingEvent loggingEvent)
         {
             var properties = loggingEvent.GetProperties();
             if (properties == null)
@@ -144,7 +144,7 @@ private static IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperti
                     if (value != null
                         && (!(value is string stringValue) || !string.IsNullOrWhiteSpace(stringValue)))
                     {
-                        yield return new KeyValuePair<string, object>(key, value);
+                        yield return new KeyValuePair<string, object?>(key, value);
                     }
                 }
             }
@@ -154,38 +154,38 @@ private static IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperti
             {
                 if (!string.IsNullOrEmpty(locInfo.ClassName))
                 {
-                    yield return new KeyValuePair<string, object>(nameof(locInfo.ClassName), locInfo.ClassName);
+                    yield return new KeyValuePair<string, object?>(nameof(locInfo.ClassName), locInfo.ClassName);
                 }
 
                 if (!string.IsNullOrEmpty(locInfo.FileName))
                 {
-                    yield return new KeyValuePair<string, object>(nameof(locInfo.FileName), locInfo.FileName);
+                    yield return new KeyValuePair<string, object?>(nameof(locInfo.FileName), locInfo.FileName);
                 }
 
                 if (int.TryParse(locInfo.LineNumber, out var lineNumber) && lineNumber != 0)
                 {
-                    yield return new KeyValuePair<string, object>(nameof(locInfo.LineNumber), lineNumber);
+                    yield return new KeyValuePair<string, object?>(nameof(locInfo.LineNumber), lineNumber);
                 }
 
                 if (!string.IsNullOrEmpty(locInfo.MethodName))
                 {
-                    yield return new KeyValuePair<string, object>(nameof(locInfo.MethodName), locInfo.MethodName);
+                    yield return new KeyValuePair<string, object?>(nameof(locInfo.MethodName), locInfo.MethodName);
                 }
             }
 
             if (!string.IsNullOrEmpty(loggingEvent.ThreadName))
             {
-                yield return new KeyValuePair<string, object>(nameof(loggingEvent.ThreadName), loggingEvent.ThreadName);
+                yield return new KeyValuePair<string, object?>(nameof(loggingEvent.ThreadName), loggingEvent.ThreadName);
             }
 
             if (!string.IsNullOrEmpty(loggingEvent.Domain))
             {
-                yield return new KeyValuePair<string, object>(nameof(loggingEvent.Domain), loggingEvent.Domain);
+                yield return new KeyValuePair<string, object?>(nameof(loggingEvent.Domain), loggingEvent.Domain);
             }
 
             if (loggingEvent.Level != null)
             {
-                yield return new KeyValuePair<string, object>("log4net-level", loggingEvent.Level.Name);
+                yield return new KeyValuePair<string, object?>("log4net-level", loggingEvent.Level.Name);
             }
         }
 
diff --git a/src/Sentry.Serilog/SentrySink.cs b/src/Sentry.Serilog/SentrySink.cs
@@ -136,7 +136,7 @@ public void Emit(LogEvent logEvent)
             }
         }
 
-        private IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperties(LogEvent logEvent)
+        private IEnumerable<KeyValuePair<string, object?>> GetLoggingEventProperties(LogEvent logEvent)
         {
             var properties = logEvent.Properties;
 
@@ -145,11 +145,11 @@ private IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperties(LogE
                 var value = property.Value;
                 if (value is ScalarValue scalarValue)
                 {
-                    yield return new KeyValuePair<string, object>(property.Key, scalarValue.Value);
+                    yield return new KeyValuePair<string, object?>(property.Key, scalarValue.Value);
                 }
                 else if (value != null)
                 {
-                    yield return new KeyValuePair<string, object>(property.Key, value);
+                    yield return new KeyValuePair<string, object?>(property.Key, value);
                 }
             }
         }
diff --git a/src/Sentry/Extensibility/DefaultRequestPayloadExtractor.cs b/src/Sentry/Extensibility/DefaultRequestPayloadExtractor.cs
@@ -18,6 +18,10 @@ public class DefaultRequestPayloadExtractor : BaseRequestPayloadExtractor
         /// </summary>
         protected override object? DoExtractPayLoad(IHttpRequest request)
         {
+            if(request.Body is null)
+            {
+                return null;
+            }
             // https://github.com/dotnet/corefx/blob/master/src/Common/src/CoreLib/System/IO/StreamReader.cs#L186
             // Default parameters other than 'leaveOpen'
             using var reader = new StreamReader(request.Body, Encoding.UTF8, true, 1024,
diff --git a/src/Sentry/Extensibility/SentryStackTraceFactory.cs b/src/Sentry/Extensibility/SentryStackTraceFactory.cs
@@ -163,7 +163,8 @@ protected SentryStackFrame InternalCreateFrame(StackFrame stackFrame, bool deman
         /// Get a <see cref="MethodBase"/> from <see cref="StackFrame"/>.
         /// </summary>
         /// <param name="stackFrame">The <see cref="StackFrame"/></param>.
-        protected virtual MethodBase GetMethod(StackFrame stackFrame) => stackFrame.GetMethod();
+        protected virtual MethodBase? GetMethod(StackFrame stackFrame)
+            => stackFrame.GetMethod();
 
         private bool IsSystemModuleName(string? moduleName)
         {
diff --git a/src/Sentry/Integrations/AppDomainProcessExitIntegration.cs b/src/Sentry/Integrations/AppDomainProcessExitIntegration.cs
@@ -27,7 +27,7 @@ public void Unregister(IHub hub)
             _hub = null;
         }
 
-        internal void HandleProcessExit(object sender, EventArgs e)
+        internal void HandleProcessExit(object? sender, EventArgs e)
         {
             (_hub as IDisposable)?.Dispose();
         }
diff --git a/src/Sentry/Integrations/TaskUnobservedTaskExceptionIntegration.cs b/src/Sentry/Integrations/TaskUnobservedTaskExceptionIntegration.cs
@@ -29,7 +29,7 @@ public void Unregister(IHub hub)
 
         // Internal for testability
         [HandleProcessCorruptedStateExceptions, SecurityCritical]
-        internal void Handle(object sender, UnobservedTaskExceptionEventArgs e)
+        internal void Handle(object? sender, UnobservedTaskExceptionEventArgs e)
         {
             if (e.Exception != null)
             {
diff --git a/src/Sentry/Internal/AppDomainAdapter.cs b/src/Sentry/Internal/AppDomainAdapter.cs
@@ -31,12 +31,12 @@ private AppDomainAdapter()
 
         public event EventHandler<UnobservedTaskExceptionEventArgs>? UnobservedTaskException;
 
-        private void OnProcessExit(object sender, EventArgs e) => ProcessExit?.Invoke(sender, e);
+        private void OnProcessExit(object? sender, EventArgs e) => ProcessExit?.Invoke(sender, e);
 
         [HandleProcessCorruptedStateExceptions, SecurityCritical]
         private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e) => UnhandledException?.Invoke(this, e);
 
         [HandleProcessCorruptedStateExceptions, SecurityCritical]
-        private void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e) => UnobservedTaskException?.Invoke(this, e);
+        private void OnUnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e) => UnobservedTaskException?.Invoke(this, e);
     }
 }
diff --git a/src/Sentry/Internal/BackgroundWorker.cs b/src/Sentry/Internal/BackgroundWorker.cs
@@ -207,7 +207,7 @@ public async ValueTask FlushAsync(TimeSpan timeout)
             var counter = 0;
             var depth = int.MaxValue;
 
-            void EventFlushedCallback(object objProcessed, EventArgs _)
+            void EventFlushedCallback(object? _, EventArgs __)
             {
                 // ReSharper disable once AccessToModifiedClosure
                 if (Interlocked.Increment(ref counter) >= depth)
diff --git a/src/Sentry/Internal/Extensions/CollectionsExtensions.cs b/src/Sentry/Internal/Extensions/CollectionsExtensions.cs
@@ -34,7 +34,8 @@ public static void TryCopyTo<TKey, TValue>(this IDictionary<TKey, TValue> from,
             }
         }
 
-        public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source) =>
+        public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
+                where TKey : notnull =>
             source.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
     }
 }
diff --git a/src/Sentry/Internal/Http/EnvelopeHttpContent.cs b/src/Sentry/Internal/Http/EnvelopeHttpContent.cs
@@ -12,7 +12,7 @@ internal class EnvelopeHttpContent : HttpContent
 
         public EnvelopeHttpContent(Envelope envelope) => _envelope = envelope;
 
-        protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context) =>
+        protected override async Task SerializeToStreamAsync(Stream stream, TransportContext? context) =>
             await _envelope.SerializeAsync(stream).ConfigureAwait(false);
 
         protected override bool TryComputeLength(out long length)
diff --git a/src/Sentry/Internal/Http/GzipBufferedRequestBodyHandler.cs b/src/Sentry/Internal/Http/GzipBufferedRequestBodyHandler.cs
@@ -52,13 +52,16 @@ protected override async Task<HttpResponseMessage> SendAsync(
             CancellationToken cancellationToken)
         {
             var memoryStream = new MemoryStream();
-            using (var gzipStream = new GZipStream(memoryStream, _compressionLevel, leaveOpen: true))
+            if (request.Content is not null)
             {
-                await request.Content.CopyToAsync(gzipStream).ConfigureAwait(false);
-            }
-            memoryStream.Position = 0;
+                using (var gzipStream = new GZipStream(memoryStream, _compressionLevel, leaveOpen: true))
+                {
+                    await request.Content.CopyToAsync(gzipStream).ConfigureAwait(false);
+                }
+                memoryStream.Position = 0;
 
-            request.Content = new BufferedStreamContent(memoryStream, memoryStream.Length, request.Content.Headers);
+                request.Content = new BufferedStreamContent(memoryStream, memoryStream.Length, request.Content.Headers);
+            }
 
             return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
         }
diff --git a/src/Sentry/Internal/Http/GzipRequestBodyHandler.cs b/src/Sentry/Internal/Http/GzipRequestBodyHandler.cs
@@ -49,8 +49,10 @@ protected override Task<HttpResponseMessage> SendAsync(
             HttpRequestMessage request,
             CancellationToken cancellationToken)
         {
-            request.Content = new GzipContent(request.Content, _compressionLevel);
-
+            if (request.Content is not null)
+            {
+                request.Content = new GzipContent(request.Content, _compressionLevel);
+            }
             return base.SendAsync(request, cancellationToken);
         }
 
@@ -80,7 +82,7 @@ protected override bool TryComputeLength(out long length)
                 return false;
             }
 
-            protected override async Task SerializeToStreamAsync(Stream stream, TransportContext context)
+            protected override async Task SerializeToStreamAsync(Stream stream, TransportContext? context)
             {
                 var gzipStream = new GZipStream(stream, _compressionLevel, leaveOpen: true);
                 try
diff --git a/src/Sentry/Internal/MainSentryEventProcessor.cs b/src/Sentry/Internal/MainSentryEventProcessor.cs
@@ -187,7 +187,10 @@ public SentryEvent Process(SentryEvent @event)
                     }
 
                     var asmName = assembly.GetName();
-                    @event.Modules[asmName.Name] = asmName.Version.ToString();
+                    if (asmName.Name is not null && asmName.Version is not null)
+                    {
+                        @event.Modules[asmName.Name] = asmName.Version.ToString();
+                    }
                 }
             }
 
diff --git a/src/Sentry/PlatformAbstractions/Runtime.cs b/src/Sentry/PlatformAbstractions/Runtime.cs
@@ -109,7 +109,7 @@ public bool Equals(Runtime other)
         /// </summary>
         /// <param name="obj">The instance to compare against.</param>
         /// <returns>True if the instances are equal by reference or its state.</returns>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
diff --git a/src/Sentry/PlatformAbstractions/RuntimeInfo.cs b/src/Sentry/PlatformAbstractions/RuntimeInfo.cs
@@ -83,7 +83,11 @@ internal static void SetNetCoreVersion(Runtime runtime)
             {
                 // https://github.com/dotnet/BenchmarkDotNet/issues/448#issuecomment-308424100
                 var assembly = typeof(System.Runtime.GCSettings).GetTypeInfo().Assembly;
+#if NET5_0
+                var assemblyPath = assembly.Location.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
+#else
                 var assemblyPath = assembly.CodeBase.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
+#endif
                 var netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
                 if (netCoreAppIndex > 0
                     && netCoreAppIndex < assemblyPath.Length - 2)
diff --git a/src/Sentry/Protocol/BaseScope.cs b/src/Sentry/Protocol/BaseScope.cs
@@ -34,7 +34,7 @@ public class BaseScope
         internal ConcurrentQueue<Breadcrumb>? InternalBreadcrumbs { get; set; }
 
         [DataMember(Name = "extra", EmitDefaultValue = false)]
-        internal ConcurrentDictionary<string, object>? InternalExtra { get; set; }
+        internal ConcurrentDictionary<string, object?>? InternalExtra { get; set; }
 
         [DataMember(Name = "tags", EmitDefaultValue = false)]
         internal ConcurrentDictionary<string, string>? InternalTags { get; set; }
@@ -140,24 +140,14 @@ public User User
         /// <summary>
         /// An arbitrary mapping of additional metadata to store with the event.
         /// </summary>
-        public
-#if NET451
-            IDictionary<string, object>
-#else
-            IReadOnlyDictionary<string, object>
-#endif
-            Extra => InternalExtra ??= new ConcurrentDictionary<string, object>();
+        public IReadOnlyDictionary<string, object?> Extra
+            => InternalExtra ??= new ConcurrentDictionary<string, object?>();
 
         /// <summary>
         /// Arbitrary key-value for this event
         /// </summary>
-        public
-#if NET451
-            IDictionary<string, string>
-#else
-            IReadOnlyDictionary<string, string>
-#endif
-            Tags => InternalTags ??= new ConcurrentDictionary<string, string>();
+        public IReadOnlyDictionary<string, string> Tags
+            => InternalTags ??= new ConcurrentDictionary<string, string>();
 
         /// <summary>
         /// Creates a scope with the specified options
diff --git a/src/Sentry/Protocol/BaseScopeExtensions.cs b/src/Sentry/Protocol/BaseScopeExtensions.cs
@@ -191,17 +191,17 @@ public static void SetFingerprint(this BaseScope scope, IEnumerable<string>? fin
         /// <param name="scope">The scope.</param>
         /// <param name="key">The key.</param>
         /// <param name="value">The value.</param>
-        public static void SetExtra(this BaseScope scope, string key, object value)
-            => ((ConcurrentDictionary<string, object>)scope.Extra).AddOrUpdate(key, value, (s, o) => value);
+        public static void SetExtra(this BaseScope scope, string key, object? value)
+            => ((ConcurrentDictionary<string, object?>)scope.Extra).AddOrUpdate(key, value, (s, o) => value);
 
         /// <summary>
         /// Sets the extra key-value pairs to the <see cref="BaseScope"/>.
         /// </summary>
         /// <param name="scope">The scope.</param>
         /// <param name="values">The values.</param>
-        public static void SetExtras(this BaseScope scope, IEnumerable<KeyValuePair<string, object>> values)
+        public static void SetExtras(this BaseScope scope, IEnumerable<KeyValuePair<string, object?>> values)
         {
-            var extra = (ConcurrentDictionary<string, object>)scope.Extra;
+            var extra = (ConcurrentDictionary<string, object?>)scope.Extra;
             foreach (var keyValuePair in values)
             {
                 _ = extra.AddOrUpdate(keyValuePair.Key, keyValuePair.Value, (s, o) => keyValuePair.Value);
@@ -278,7 +278,7 @@ public static void Apply(this BaseScope from, BaseScope to)
             {
                 foreach (var extra in from.Extra)
                 {
-                    _ = ((ConcurrentDictionary<string, object>)to.Extra).TryAdd(extra.Key, extra.Value);
+                    _ = ((ConcurrentDictionary<string, object?>)to.Extra).TryAdd(extra.Key, extra.Value);
                 }
             }
 
diff --git a/src/Sentry/Protocol/Exceptions/SentryException.cs b/src/Sentry/Protocol/Exceptions/SentryException.cs
@@ -13,7 +13,7 @@ public class SentryException
     {
         // Not serialized since not part of the protocol yet.
         // Used by Sentry SDK though to transfer data from Exception.Data to Event.Data when parsing.
-        internal Dictionary<string, object>? InternalData { get; private set; }
+        internal Dictionary<string, object?>? InternalData { get; private set; }
 
         /// <summary>
         /// Exception Type.
@@ -63,6 +63,6 @@ public class SentryException
         /// For this reason this property is not serialized.
         /// The data is moved to the event level on Extra until such support is added
         /// </remarks>
-        public IDictionary<string, object> Data => InternalData ??= new Dictionary<string, object>();
+        public IDictionary<string, object?> Data => InternalData ??= new Dictionary<string, object?>();
     }
 }
diff --git a/src/Sentry/Reflection/AssemblyExtensions.cs b/src/Sentry/Reflection/AssemblyExtensions.cs
@@ -25,7 +25,7 @@ public static SdkVersion GetNameAndVersion(this Assembly asm)
             var name = asmName.Name;
             var version =
                 asm.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion
-                ?? asmName.Version.ToString();
+                ?? asmName?.Version?.ToString();
 
             return new SdkVersion {Name = name, Version = version};
         }
diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
     <PackageId>Sentry</PackageId>
     <AssemblyName>Sentry</AssemblyName>
     <RootNamespace>Sentry</RootNamespace>
@@ -35,4 +35,4 @@
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Sentry/SentryClient.cs b/src/Sentry/SentryClient.cs
@@ -234,15 +234,18 @@ private bool CaptureEnvelope(Envelope envelope)
             catch (Exception e)
             {
                 _options.DiagnosticLogger?.LogError("The BeforeSend callback threw an exception. It will be added as breadcrumb and continue.", e);
-
+                var data = new Dictionary<string, string>
+                {
+                    {"message", e.Message}
+                };
+                if(e.StackTrace is not null)
+                {
+                    data.Add("stackTrace", e.StackTrace);
+                }
                 @event?.AddBreadcrumb(
                     "BeforeSend callback failed.",
                     category: "SentryClient",
-                    data: new Dictionary<string, string>
-                    {
-                        {"message", e.Message},
-                        {"stackTrace", e.StackTrace}
-                    },
+                    data: data,
                     level: BreadcrumbLevel.Error);
             }
 
diff --git a/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs b/test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs
diff --git a/test/Sentry.Tests/Protocol/BaseScopeExtensionsTests.cs b/test/Sentry.Tests/Protocol/BaseScopeExtensionsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ protected override void Append(LoggingEvent loggingEvent)`
`127`	`127`	`_ = Hub.CaptureEvent(evt);`
`128`	`128`	`}`
`129`	`129`
`130`		`- private static IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperties(LoggingEvent loggingEvent)`
	`130`	`+ private static IEnumerable<KeyValuePair<string, object?>> GetLoggingEventProperties(LoggingEvent loggingEvent)`
`131`	`131`	`{`
`132`	`132`	`var properties = loggingEvent.GetProperties();`
`133`	`133`	`if (properties == null)`
`@@ -144,7 +144,7 @@ private static IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperti`
`144`	`144`	`if (value != null`
`145`	`145`	`&& (!(value is string stringValue) \|\| !string.IsNullOrWhiteSpace(stringValue)))`
`146`	`146`	`{`
`147`		`- yield return new KeyValuePair<string, object>(key, value);`
	`147`	`+ yield return new KeyValuePair<string, object?>(key, value);`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`}`
`@@ -154,38 +154,38 @@ private static IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperti`
`154`	`154`	`{`
`155`	`155`	`if (!string.IsNullOrEmpty(locInfo.ClassName))`
`156`	`156`	`{`
`157`		`- yield return new KeyValuePair<string, object>(nameof(locInfo.ClassName), locInfo.ClassName);`
	`157`	`+ yield return new KeyValuePair<string, object?>(nameof(locInfo.ClassName), locInfo.ClassName);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`if (!string.IsNullOrEmpty(locInfo.FileName))`
`161`	`161`	`{`
`162`		`- yield return new KeyValuePair<string, object>(nameof(locInfo.FileName), locInfo.FileName);`
	`162`	`+ yield return new KeyValuePair<string, object?>(nameof(locInfo.FileName), locInfo.FileName);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if (int.TryParse(locInfo.LineNumber, out var lineNumber) && lineNumber != 0)`
`166`	`166`	`{`
`167`		`- yield return new KeyValuePair<string, object>(nameof(locInfo.LineNumber), lineNumber);`
	`167`	`+ yield return new KeyValuePair<string, object?>(nameof(locInfo.LineNumber), lineNumber);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if (!string.IsNullOrEmpty(locInfo.MethodName))`
`171`	`171`	`{`
`172`		`- yield return new KeyValuePair<string, object>(nameof(locInfo.MethodName), locInfo.MethodName);`
	`172`	`+ yield return new KeyValuePair<string, object?>(nameof(locInfo.MethodName), locInfo.MethodName);`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`if (!string.IsNullOrEmpty(loggingEvent.ThreadName))`
`177`	`177`	`{`
`178`		`- yield return new KeyValuePair<string, object>(nameof(loggingEvent.ThreadName), loggingEvent.ThreadName);`
	`178`	`+ yield return new KeyValuePair<string, object?>(nameof(loggingEvent.ThreadName), loggingEvent.ThreadName);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`if (!string.IsNullOrEmpty(loggingEvent.Domain))`
`182`	`182`	`{`
`183`		`- yield return new KeyValuePair<string, object>(nameof(loggingEvent.Domain), loggingEvent.Domain);`
	`183`	`+ yield return new KeyValuePair<string, object?>(nameof(loggingEvent.Domain), loggingEvent.Domain);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`if (loggingEvent.Level != null)`
`187`	`187`	`{`
`188`		`- yield return new KeyValuePair<string, object>("log4net-level", loggingEvent.Level.Name);`
	`188`	`+ yield return new KeyValuePair<string, object?>("log4net-level", loggingEvent.Level.Name);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public void Emit(LogEvent logEvent)`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`- private IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperties(LogEvent logEvent)`
	`139`	`+ private IEnumerable<KeyValuePair<string, object?>> GetLoggingEventProperties(LogEvent logEvent)`
`140`	`140`	`{`
`141`	`141`	`var properties = logEvent.Properties;`
`142`	`142`
`@@ -145,11 +145,11 @@ private IEnumerable<KeyValuePair<string, object>> GetLoggingEventProperties(LogE`
`145`	`145`	`var value = property.Value;`
`146`	`146`	`if (value is ScalarValue scalarValue)`
`147`	`147`	`{`
`148`		`- yield return new KeyValuePair<string, object>(property.Key, scalarValue.Value);`
	`148`	`+ yield return new KeyValuePair<string, object?>(property.Key, scalarValue.Value);`
`149`	`149`	`}`
`150`	`150`	`else if (value != null)`
`151`	`151`	`{`
`152`		`- yield return new KeyValuePair<string, object>(property.Key, value);`
	`152`	`+ yield return new KeyValuePair<string, object?>(property.Key, value);`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,8 @@ protected SentryStackFrame InternalCreateFrame(StackFrame stackFrame, bool deman`
`163`	`163`	`/// Get a <see cref="MethodBase"/> from <see cref="StackFrame"/>.`
`164`	`164`	`/// </summary>`
`165`	`165`	`/// <param name="stackFrame">The <see cref="StackFrame"/></param>.`
`166`		`- protected virtual MethodBase GetMethod(StackFrame stackFrame) => stackFrame.GetMethod();`
	`166`	`+ protected virtual MethodBase? GetMethod(StackFrame stackFrame)`
	`167`	`+ => stackFrame.GetMethod();`
`167`	`168`
`168`	`169`	`private bool IsSystemModuleName(string? moduleName)`
`169`	`170`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void Unregister(IHub hub)`
`27`	`27`	`_hub = null;`
`28`	`28`	`}`
`29`	`29`
`30`		`- internal void HandleProcessExit(object sender, EventArgs e)`
	`30`	`+ internal void HandleProcessExit(object? sender, EventArgs e)`
`31`	`31`	`{`
`32`	`32`	`(_hub as IDisposable)?.Dispose();`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void Unregister(IHub hub)`
`29`	`29`
`30`	`30`	`// Internal for testability`
`31`	`31`	`[HandleProcessCorruptedStateExceptions, SecurityCritical]`
`32`		`- internal void Handle(object sender, UnobservedTaskExceptionEventArgs e)`
	`32`	`+ internal void Handle(object? sender, UnobservedTaskExceptionEventArgs e)`
`33`	`33`	`{`
`34`	`34`	`if (e.Exception != null)`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ private AppDomainAdapter()`
`31`	`31`
`32`	`32`	`public event EventHandler<UnobservedTaskExceptionEventArgs>? UnobservedTaskException;`
`33`	`33`
`34`		`- private void OnProcessExit(object sender, EventArgs e) => ProcessExit?.Invoke(sender, e);`
	`34`	`+ private void OnProcessExit(object? sender, EventArgs e) => ProcessExit?.Invoke(sender, e);`
`35`	`35`
`36`	`36`	`[HandleProcessCorruptedStateExceptions, SecurityCritical]`
`37`	`37`	`private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e) => UnhandledException?.Invoke(this, e);`
`38`	`38`
`39`	`39`	`[HandleProcessCorruptedStateExceptions, SecurityCritical]`
`40`		`- private void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e) => UnobservedTaskException?.Invoke(this, e);`
	`40`	`+ private void OnUnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e) => UnobservedTaskException?.Invoke(this, e);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public async ValueTask FlushAsync(TimeSpan timeout)`
`207`	`207`	`var counter = 0;`
`208`	`208`	`var depth = int.MaxValue;`
`209`	`209`
`210`		`- void EventFlushedCallback(object objProcessed, EventArgs _)`
	`210`	`+ void EventFlushedCallback(object? _, EventArgs __)`
`211`	`211`	`{`
`212`	`212`	`// ReSharper disable once AccessToModifiedClosure`
`213`	`213`	`if (Interlocked.Increment(ref counter) >= depth)`