Skip to content

Commit d8d462a

Browse files
committed
Fix ReSharper/Rider inspection warnings
The `serilog-settings-configuration.sln.DotSettings` file defines many custom inspection severities as error rendering the solution with many red squiggly lines when opened in Rider or in Visual Studio with ReSharper.
1 parent ca71216 commit d8d462a

File tree

5 files changed

+26
-40
lines changed

5 files changed

+26
-40
lines changed

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Reflection;
5-
using System.Runtime.CompilerServices;
65
using System.Text.RegularExpressions;
76

87
using Microsoft.Extensions.Configuration;

src/Serilog.Settings.Configuration/Settings/Configuration/ObjectArgumentValue.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ bool TryCreateContainer(out object result)
8888

8989
var configurationElements = _section.GetChildren().ToArray();
9090
result = Activator.CreateInstance(toType);
91-
91+
9292
for (int i = 0; i < configurationElements.Length; ++i)
9393
{
9494
var argumentValue = ConfigurationReader.GetArgumentValue(configurationElements[i], _configurationAssemblies);
9595
var value = argumentValue.ConvertTo(elementType, resolutionContext);
96-
addMethod.Invoke(result, new object[] { value });
96+
addMethod.Invoke(result, new[] { value });
9797
}
9898

9999
return true;
@@ -164,7 +164,7 @@ where gr.All(z => z.argumentBindResult.success)
164164
{
165165
return false;
166166
}
167-
167+
168168
var ctorArguments = new List<Expression>();
169169
foreach (var argumentValue in ctor.ArgumentValues)
170170
{

test/Serilog.Settings.Configuration.Tests/DllScanningAssemblyFinderTests.cs

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,20 @@
1-
using System;
1+
#if PRIVATE_BIN
2+
using System;
23
using System.IO;
4+
#endif
35

46
using Xunit;
57

68
using Serilog.Settings.Configuration.Assemblies;
79

810
namespace Serilog.Settings.Configuration.Tests
911
{
10-
public class DllScanningAssemblyFinderTests : IDisposable
12+
public class DllScanningAssemblyFinderTests
1113
{
1214
const string BinDir1 = "bin1";
1315
const string BinDir2 = "bin2";
1416
const string BinDir3 = "bin3";
1517

16-
readonly string _privateBinPath;
17-
18-
public DllScanningAssemblyFinderTests()
19-
{
20-
var d1 = GetOrCreateDirectory(BinDir1);
21-
var d2 = GetOrCreateDirectory(BinDir2);
22-
var d3 = GetOrCreateDirectory(BinDir3);
23-
24-
_privateBinPath = $"{d1.Name};{d2.FullName};{d3.Name}";
25-
26-
DirectoryInfo GetOrCreateDirectory(string name)
27-
=> Directory.Exists(name) ? new DirectoryInfo(name) : Directory.CreateDirectory(name);
28-
}
29-
30-
public void Dispose()
31-
{
32-
Directory.Delete(BinDir1, true);
33-
Directory.Delete(BinDir2, true);
34-
Directory.Delete(BinDir3, true);
35-
}
36-
3718
[Fact]
3819
public void ShouldProbeCurrentDirectory()
3920
{
@@ -45,6 +26,13 @@ public void ShouldProbeCurrentDirectory()
4526
[Fact]
4627
public void ShouldProbePrivateBinPath()
4728
{
29+
var d1 = GetOrCreateDirectory(BinDir1);
30+
var d2 = GetOrCreateDirectory(BinDir2);
31+
var d3 = GetOrCreateDirectory(BinDir3);
32+
33+
DirectoryInfo GetOrCreateDirectory(string name)
34+
=> Directory.Exists(name) ? new DirectoryInfo(name) : Directory.CreateDirectory(name);
35+
4836
File.Copy("testdummies.dll", $"{BinDir1}/customSink1.dll", true);
4937
File.Copy("testdummies.dll", $"{BinDir2}/customSink2.dll", true);
5038
File.Copy("testdummies.dll", $"{BinDir3}/thirdpartydependency.dll", true);
@@ -53,7 +41,7 @@ public void ShouldProbePrivateBinPath()
5341
new AppDomainSetup
5442
{
5543
ApplicationBase = AppDomain.CurrentDomain.BaseDirectory,
56-
PrivateBinPath = _privateBinPath
44+
PrivateBinPath = $"{d1.Name};{d2.FullName};{d3.Name}"
5745
});
5846

5947
try
@@ -63,6 +51,9 @@ public void ShouldProbePrivateBinPath()
6351
finally
6452
{
6553
AppDomain.Unload(ad);
54+
Directory.Delete(BinDir1, true);
55+
Directory.Delete(BinDir2, true);
56+
Directory.Delete(BinDir3, true);
6657
}
6758

6859
static void DoTestInner()

test/Serilog.Settings.Configuration.Tests/LoggerConfigurationExtensionsTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void ReadFromConfigurationSectionReadsFromAnArbitrarySection()
2424
LogEvent evt = null;
2525

2626
var json = @"{
27-
""NotSerilog"": {
27+
""NotSerilog"": {
2828
""Properties"": {
2929
""App"": ""Test""
3030
}
@@ -53,12 +53,12 @@ public void ReadFromConfigurationSectionReadsFromAnArbitrarySection()
5353
public void ReadFromConfigurationSectionThrowsWhenTryingToCallConfigurationMethodWithIConfigurationParam()
5454
{
5555
var json = @"{
56-
""NotSerilog"": {
56+
""NotSerilog"": {
5757
""Using"": [""TestDummies""],
5858
""WriteTo"": [{
5959
""Name"": ""DummyWithConfiguration"",
6060
""Args"": {}
61-
}]
61+
}]
6262
}
6363
}";
6464

@@ -84,20 +84,20 @@ public void ReadFromConfigurationSectionThrowsWhenTryingToCallConfigurationMetho
8484
public void ReadFromConfigurationDoesNotThrowWhenTryingToCallConfigurationMethodWithIConfigurationParam()
8585
{
8686
var json = @"{
87-
""NotSerilog"": {
87+
""NotSerilog"": {
8888
""Using"": [""TestDummies""],
8989
""WriteTo"": [{
9090
""Name"": ""DummyWithConfiguration"",
9191
""Args"": {}
92-
}]
92+
}]
9393
}
9494
}";
9595

9696
var config = new ConfigurationBuilder()
9797
.AddJsonString(json)
9898
.Build();
9999

100-
var exception = new LoggerConfiguration()
100+
_ = new LoggerConfiguration()
101101
.ReadFrom.Configuration(config, "NotSerilog")
102102
.CreateLogger();
103103

@@ -108,12 +108,12 @@ public void ReadFromConfigurationDoesNotThrowWhenTryingToCallConfigurationMethod
108108
public void ReadFromConfigurationSectionDoesNotThrowWhenTryingToCallConfigurationMethodWithOptionalIConfigurationParam()
109109
{
110110
var json = @"{
111-
""NotSerilog"": {
111+
""NotSerilog"": {
112112
""Using"": [""TestDummies""],
113113
""WriteTo"": [{
114114
""Name"": ""DummyWithOptionalConfiguration"",
115115
""Args"": {}
116-
}]
116+
}]
117117
}
118118
}";
119119

test/TestDummies/DummyThreadIdEnricher.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ namespace TestDummies
55
{
66
public class DummyThreadIdEnricher : ILogEventEnricher
77
{
8-
static DummyThreadIdEnricher()
9-
{
10-
}
11-
128
public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
139
{
1410
logEvent.AddPropertyIfAbsent(propertyFactory

0 commit comments

Comments
 (0)