Timerix/DTLib.Demystifier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix null inLazyInitializer.EnsureInitialized func (#182)

Browse Source 
In net the the nullability of the LazyInitializer.EnsureInitialized func has been clarified. It can no longer return a null

and fixed some typos
This commit is contained in:
Simon Cropp 2021-11-10 01:44:14 +11:00 committed by GitHub
parent df196f8c1f
commit 0eaebeb2d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ben.Demystifier/Ben.Demystifier.csproj
View File

@ -19,7 +19,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;net45</TargetFrameworks> <TargetFrameworks>netstandard2.1;netstandard2.0;net45;net6</TargetFrameworks>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<PackageIcon>icon.png</PackageIcon> <PackageIcon>icon.png</PackageIcon>

2
src/Ben.Demystifier/EnhancedStackTrace.Frames.cs
View File

@ -605,7 +605,7 @@ namespace System.Diagnostics
{ {
var customAttribs = parameter.GetCustomAttributes(inherit: false); var customAttribs = parameter.GetCustomAttributes(inherit: false);
var tupleNameAttribute = customAttribs.OfType<Attribute>().FirstOrDefault(a => a.IsTupleElementNameAttribue()); var tupleNameAttribute = customAttribs.OfType<Attribute>().FirstOrDefault(a => a.IsTupleElementNameAttribute());
var tupleNames = tupleNameAttribute?.GetTransformerNames(); var tupleNames = tupleNameAttribute?.GetTransformerNames();

14
src/Ben.Demystifier/Internal/ReflectionHelper.cs
View File

@ -12,7 +12,7 @@ namespace System.Diagnostics.Internal
/// </summary> /// </summary>
public static class ReflectionHelper public static class ReflectionHelper
{ {
private static PropertyInfo? tranformerNamesLazyPropertyInfo; private static PropertyInfo? transformerNamesLazyPropertyInfo;
/// <summary> /// <summary>
/// Returns true if the <paramref name="type"/> is a value tuple type. /// Returns true if the <paramref name="type"/> is a value tuple type.
@ -26,10 +26,10 @@ namespace System.Diagnostics.Internal
/// Returns true if the given <paramref name="attribute"/> is of type <code>TupleElementNameAttribute</code>. /// Returns true if the given <paramref name="attribute"/> is of type <code>TupleElementNameAttribute</code>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// To avoid compile-time depencency hell with System.ValueTuple, this method uses reflection and not checks statically that /// To avoid compile-time dependency hell with System.ValueTuple, this method uses reflection and not checks statically that
/// the given <paramref name="attribute"/> is <code>TupleElementNameAttribute</code>. /// the given <paramref name="attribute"/> is <code>TupleElementNameAttribute</code>.
/// </remarks> /// </remarks>
public static bool IsTupleElementNameAttribue(this Attribute attribute) public static bool IsTupleElementNameAttribute(this Attribute attribute)
{ {
var attributeType = attribute.GetType(); var attributeType = attribute.GetType();
return attributeType.Namespace == "System.Runtime.CompilerServices" && return attributeType.Namespace == "System.Runtime.CompilerServices" &&
@ -40,12 +40,12 @@ namespace System.Diagnostics.Internal
/// Returns 'TransformNames' property value from a given <paramref name="attribute"/>. /// Returns 'TransformNames' property value from a given <paramref name="attribute"/>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// To avoid compile-time depencency hell with System.ValueTuple, this method uses reflection /// To avoid compile-time dependency hell with System.ValueTuple, this method uses reflection
/// instead of casting the attribute to a specific type. /// instead of casting the attribute to a specific type.
/// </remarks> /// </remarks>
public static IList<string>? GetTransformerNames(this Attribute attribute) public static IList<string>? GetTransformerNames(this Attribute attribute)
{ {
Debug.Assert(attribute.IsTupleElementNameAttribue()); Debug.Assert(attribute.IsTupleElementNameAttribute());
var propertyInfo = GetTransformNamesPropertyInfo(attribute.GetType()); var propertyInfo = GetTransformNamesPropertyInfo(attribute.GetType());
return propertyInfo?.GetValue(attribute) as IList<string>; return propertyInfo?.GetValue(attribute) as IList<string>;
@ -54,9 +54,9 @@ namespace System.Diagnostics.Internal
private static PropertyInfo? GetTransformNamesPropertyInfo(Type attributeType) private static PropertyInfo? GetTransformNamesPropertyInfo(Type attributeType)
{ {
#pragma warning disable 8634 #pragma warning disable 8634
return LazyInitializer.EnsureInitialized(ref tranformerNamesLazyPropertyInfo, return LazyInitializer.EnsureInitialized(ref transformerNamesLazyPropertyInfo,
#pragma warning restore 8634 #pragma warning restore 8634
() => attributeType.GetProperty("TransformNames", BindingFlags.Instance | BindingFlags.Public)); () => attributeType.GetProperty("TransformNames", BindingFlags.Instance | BindingFlags.Public)!);
} }
} }
} }