Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove some redundant GetTypeInfo #1942

Merged
merged 1 commit into from
Aug 1, 2023
Merged

remove some redundant GetTypeInfo #1942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/Serilog.Tests/LoggerConfigurationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public void DestructuringIsPossibleForSystemTypeDerivedProperties()

var logger = new LoggerConfiguration()
.Destructure.With(new ProjectedDestructuringPolicy(
canApply: t => typeof(Type).GetTypeInfo().IsAssignableFrom(t.GetTypeInfo()),
canApply: t => typeof(Type).IsAssignableFrom(t),
projection: o => ((Type)o).AssemblyQualifiedName!))
.WriteTo.Sink(sink)
.CreateLogger();
Expand Down
4 changes: 2 additions & 2 deletions test/Serilog.Tests/MethodOverloadConventionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ static void VerifyMethodSignature(MethodInfo method, bool hasExceptionArg = fals
{
Assert.Equal($"T{i}", genericTypeArgs[i].Name);

var genericConstraints = genericTypeArgs[i].GetTypeInfo().GetGenericParameterConstraints();
var genericConstraints = genericTypeArgs[i].GetGenericParameterConstraints();

Assert.Empty(genericConstraints);
Assert.Equal($"propertyValue{i}", parameters[index].Name);
Expand All @@ -947,7 +947,7 @@ static void VerifyMethodSignature(MethodInfo method, bool hasExceptionArg = fals

Assert.Equal("T", genericTypeArg.Name);

var genericConstraints = genericTypeArg.GetTypeInfo().GetGenericParameterConstraints();
var genericConstraints = genericTypeArg.GetGenericParameterConstraints();

Assert.Empty(genericConstraints);
Assert.Equal("propertyValue", parameters[index].Name);
Expand Down
4 changes: 2 additions & 2 deletions test/Serilog.Tests/Settings/CallableConfigurationMethodFinderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ namespace Serilog.Tests.Settings;

public class CallableConfigurationMethodFinderTests
{
static readonly Assembly SerilogAssembly = typeof(Log).GetTypeInfo().Assembly;
static readonly Assembly TestDummiesAssembly = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly;
static readonly Assembly SerilogAssembly = typeof(Log).Assembly;
static readonly Assembly TestDummiesAssembly = typeof(DummyLoggerConfigurationExtensions).Assembly;

[Fact]
public void FindsSinkSpecificConfigurationMethods()
Expand Down
34 changes: 17 additions & 17 deletions test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void SinksAreConfigured()
{
var settings = new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:DummyRollingFile.pathFormat"] = "C:\\"
};

Expand All @@ -114,7 +114,7 @@ public void AuditSinksAreConfigured()
{
var settings = new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["audit-to:DummyRollingFile.pathFormat"] = "C:\\"
};

Expand Down Expand Up @@ -243,7 +243,7 @@ public void LoggingLevelSwitchIsPassedToSinks()
{
["level-switch:$switch1"] = "Information",
["minimum-level:controlled-by"] = "$switch1",
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:DummyWithLevelSwitch.controlLevelSwitch"] = "$switch1"
};

Expand Down Expand Up @@ -274,7 +274,7 @@ public void ReferencingAnUndeclaredSwitchInSinkThrows()
{
["level-switch:$switch1"] = "Information",
["minimum-level:controlled-by"] = "$switch1",
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:DummyWithLevelSwitch.controlLevelSwitch"] = "$switch2"
};

Expand All @@ -294,7 +294,7 @@ public void LoggingLevelSwitchCanBeUsedForMinimumLevelOverrides()
["minimum-level"] = "Debug",
["level-switch:$specificSwitch"] = "Warning",
["minimum-level:override:System"] = "$specificSwitch",
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:DummyWithLevelSwitch.controlLevelSwitch"] = "$specificSwitch"
};

Expand Down Expand Up @@ -332,7 +332,7 @@ public void SinksWithAbstractParamsAreConfiguredWithTypeName()
{
var settings = new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:DummyConsole.theme"] = "Serilog.Tests.Support.CustomConsoleTheme, Serilog.Tests"
};

Expand All @@ -351,7 +351,7 @@ public void SinksAreConfiguredWithStaticMember()
{
var settings = new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:DummyConsole.theme"] = "TestDummies.Console.Themes.ConsoleThemes::Theme1, TestDummies"
};

Expand Down Expand Up @@ -445,7 +445,7 @@ public void DestructuringWithCustomExtensionMethodIsApplied()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["destructure:WithDummyHardCodedString.hardCodedString"] = "hardcoded"
})
.WriteTo.Sink(new DelegatingSink(e => evt = e))
Expand Down Expand Up @@ -503,7 +503,7 @@ public void DestructuringWithIsAppliedWithCustomDestructuringPolicy()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["destructure:With.policy"] = typeof(DummyReduceVersionToMajorPolicy).AssemblyQualifiedName!
})
.WriteTo.Sink(new DelegatingSink(e => evt = e))
Expand All @@ -523,7 +523,7 @@ public void WriteToSinkIsAppliedWithCustomSink()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:Sink.sink"] = typeof(DummyRollingFileSink).AssemblyQualifiedName!
})
.CreateLogger();
Expand All @@ -540,7 +540,7 @@ public void WriteToSinkIsAppliedWithCustomSinkAndMinimumLevel()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["write-to:Sink.sink"] = typeof(DummyRollingFileSink).AssemblyQualifiedName!,
["write-to:Sink.restrictedToMinimumLevel"] = "Warning"
})
Expand All @@ -559,7 +559,7 @@ public void WriteToSinkIsAppliedWithCustomSinkAndLevelSwitch()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["level-switch:$switch1"] = "Warning",
["write-to:Sink.sink"] = typeof(DummyRollingFileSink).AssemblyQualifiedName!,
["write-to:Sink.levelSwitch"] = "$switch1"
Expand All @@ -579,7 +579,7 @@ public void AuditToSinkIsAppliedWithCustomSink()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["audit-to:Sink.sink"] = typeof(DummyRollingFileSink).AssemblyQualifiedName!
})
.CreateLogger();
Expand All @@ -596,7 +596,7 @@ public void AuditToSinkIsAppliedWithCustomSinkAndMinimumLevel()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["audit-to:Sink.sink"] = typeof(DummyRollingFileSink).AssemblyQualifiedName!,
["audit-to:Sink.restrictedToMinimumLevel"] = "Warning"
})
Expand All @@ -615,7 +615,7 @@ public void AuditToSinkIsAppliedWithCustomSinkAndLevelSwitch()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["level-switch:$switch1"] = "Warning",
["audit-to:Sink.sink"] = typeof(DummyRollingFileSink).AssemblyQualifiedName!,
["audit-to:Sink.levelSwitch"] = "$switch1"
Expand All @@ -636,7 +636,7 @@ public void EnrichWithIsAppliedWithCustomEnricher()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["enrich:With.enricher"] = typeof(DummyThreadIdEnricher).AssemblyQualifiedName!
})
.WriteTo.Sink(new DelegatingSink(e => evt = e))
Expand All @@ -655,7 +655,7 @@ public void FilterWithIsAppliedWithCustomFilter()
var log = new LoggerConfiguration()
.ReadFrom.KeyValuePairs(new Dictionary<string, string>
{
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).GetTypeInfo().Assembly.FullName!,
["using:TestDummies"] = typeof(DummyLoggerConfigurationExtensions).Assembly.FullName!,
["filter:With.filter"] = typeof(DummyAnonymousUserFilter).AssemblyQualifiedName!
})
.WriteTo.Sink(new DelegatingSink(e => evt = e))
Expand Down