Skip to content

Commit f13d162

Browse files
ckadlubackadluba
committed
* Fixed issue 290 MissingMethodException with .NET Standard 2.0
* Fixed NetStandardDemo
1 parent 4fdd6d0 commit f13d162

File tree

3 files changed

+15
-30
lines changed

3 files changed

+15
-30
lines changed

‎sample/NetStandardDemo/NetStandardDemoApp/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public static void Main()
1616
Log.Information("Hello {Name} from thread {ThreadId}", Environment.GetEnvironmentVariable("USERNAME"), Thread.CurrentThread.ManagedThreadId);
1717

1818
Log.Warning("No coins remain at position {@Position}", new { Lat = 25, Long = 134 });
19+
20+
Log.CloseAndFlush();
1921
}
2022
}
2123
}

‎sample/NetStandardDemo/NetStandardDemoLib/Initializer.cs

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public static class Initializer
1414

1515
public static LoggerConfiguration CreateLoggerConfiguration()
1616
{
17-
// Error MissingMethodException
1817
return new LoggerConfiguration()
1918
.Enrich.FromLogContext()
2019
.WriteTo.MSSqlServer(
@@ -24,30 +23,14 @@ public static LoggerConfiguration CreateLoggerConfiguration()
2423
TableName = _tableName,
2524
AutoCreateSqlTable = true
2625
},
27-
appConfiguration: null,
2826
sinkOptionsSection: null,
27+
appConfiguration: null,
2928
restrictedToMinimumLevel: LevelAlias.Minimum,
3029
formatProvider: null,
3130
columnOptions: BuildColumnOptions(),
3231
columnOptionsSection: null,
3332
logEventFormatter: null);
3433

35-
// Works
36-
//return new LoggerConfiguration()
37-
// .Enrich.FromLogContext()
38-
// .WriteTo.MSSqlServer(
39-
// _connectionString,
40-
// tableName: _tableName,
41-
// appConfiguration: null,
42-
// restrictedToMinimumLevel: LevelAlias.Minimum,
43-
// batchPostingLimit: MSSqlServerSink.DefaultBatchPostingLimit,
44-
// period: null,
45-
// formatProvider: null,
46-
// autoCreateSqlTable: true,
47-
// columnOptions: BuildColumnOptions(),
48-
// columnOptionsSection: null,
49-
// schemaName: MSSqlServerSink.DefaultSchemaName,
50-
// logEventFormatter: null);
5134
}
5235

5336
private static ColumnOptions BuildColumnOptions()
@@ -62,12 +45,12 @@ private static ColumnOptions BuildColumnOptions()
6245

6346
AdditionalColumns = new Collection<SqlColumn>
6447
{
65-
new SqlColumn { DataType = SqlDbType.NChar, ColumnName = "MachineName" },
66-
new SqlColumn { DataType = SqlDbType.NChar, ColumnName = "ProcessName" },
67-
new SqlColumn { DataType = SqlDbType.NChar, ColumnName = "ThreadId" },
68-
new SqlColumn { DataType = SqlDbType.NChar, ColumnName = "CallerName" },
69-
new SqlColumn { DataType = SqlDbType.NChar, ColumnName = "SourceFile" },
70-
new SqlColumn { DataType = SqlDbType.NChar, ColumnName = "LineNumber" }
48+
new SqlColumn { DataType = SqlDbType.NVarChar, ColumnName = "MachineName" },
49+
new SqlColumn { DataType = SqlDbType.NVarChar, ColumnName = "ProcessName" },
50+
new SqlColumn { DataType = SqlDbType.NVarChar, ColumnName = "ThreadId" },
51+
new SqlColumn { DataType = SqlDbType.NVarChar, ColumnName = "CallerName" },
52+
new SqlColumn { DataType = SqlDbType.NVarChar, ColumnName = "SourceFile" },
53+
new SqlColumn { DataType = SqlDbType.NVarChar, ColumnName = "LineNumber" }
7154
}
7255
};
7356

‎src/Serilog.Sinks.MSSqlServer/Configuration/Extensions/Microsoft.Extensions.Configuration/LoggerConfigurationMSSqlServerExtensions.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public static LoggerConfiguration MSSqlServer(
7878
return loggerConfiguration.MSSqlServer(
7979
connectionString: connectionString,
8080
sinkOptions: sinkOptions,
81-
appConfiguration: appConfiguration,
8281
sinkOptionsSection: null,
82+
appConfiguration: appConfiguration,
8383
restrictedToMinimumLevel: restrictedToMinimumLevel,
8484
formatProvider: formatProvider,
8585
columnOptions: columnOptions,
@@ -96,8 +96,8 @@ public static LoggerConfiguration MSSqlServer(
9696
/// <param name="loggerConfiguration">The logger configuration.</param>
9797
/// <param name="connectionString">The connection string to the database where to store the events.</param>
9898
/// <param name="sinkOptions">Supplies additional settings for the sink</param>
99-
/// <param name="appConfiguration">Additional application-level configuration. Required if connectionString is a name.</param>
10099
/// <param name="sinkOptionsSection">A config section defining additional settings for the sink</param>
100+
/// <param name="appConfiguration">Additional application-level configuration. Required if connectionString is a name.</param>
101101
/// <param name="restrictedToMinimumLevel">The minimum log event level required in order to write an event to the sink.</param>
102102
/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
103103
/// <param name="columnOptions">An externally-modified group of column settings</param>
@@ -109,8 +109,8 @@ public static LoggerConfiguration MSSqlServer(
109109
this LoggerSinkConfiguration loggerConfiguration,
110110
string connectionString,
111111
SinkOptions sinkOptions = null,
112-
IConfiguration appConfiguration = null,
113112
IConfigurationSection sinkOptionsSection = null,
113+
IConfiguration appConfiguration = null,
114114
LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
115115
IFormatProvider formatProvider = null,
116116
ColumnOptions columnOptions = null,
@@ -170,8 +170,8 @@ public static LoggerConfiguration MSSqlServer(
170170
return loggerAuditSinkConfiguration.MSSqlServer(
171171
connectionString: connectionString,
172172
sinkOptions: sinkOptions,
173-
appConfiguration: appConfiguration,
174173
sinkOptionsSection: null,
174+
appConfiguration: appConfiguration,
175175
restrictedToMinimumLevel: restrictedToMinimumLevel,
176176
formatProvider: formatProvider,
177177
columnOptions: columnOptions,
@@ -185,8 +185,8 @@ public static LoggerConfiguration MSSqlServer(
185185
/// <param name="loggerAuditSinkConfiguration">The logger configuration.</param>
186186
/// <param name="connectionString">The connection string to the database where to store the events.</param>
187187
/// <param name="sinkOptions">Supplies additional settings for the sink</param>
188-
/// <param name="appConfiguration">Additional application-level configuration. Required if connectionString is a name.</param>
189188
/// <param name="sinkOptionsSection">A config section defining additional settings for the sink</param>
189+
/// <param name="appConfiguration">Additional application-level configuration. Required if connectionString is a name.</param>
190190
/// <param name="restrictedToMinimumLevel">The minimum log event level required in order to write an event to the sink.</param>
191191
/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
192192
/// <param name="columnOptions">An externally-modified group of column settings</param>
@@ -198,8 +198,8 @@ public static LoggerConfiguration MSSqlServer(
198198
this LoggerAuditSinkConfiguration loggerAuditSinkConfiguration,
199199
string connectionString,
200200
SinkOptions sinkOptions = null,
201-
IConfiguration appConfiguration = null,
202201
IConfigurationSection sinkOptionsSection = null,
202+
IConfiguration appConfiguration = null,
203203
LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
204204
IFormatProvider formatProvider = null,
205205
ColumnOptions columnOptions = null,

0 commit comments

Comments
 (0)