Skip to content

Commit 64dc4d5

Browse files
ckadlubackadluba
authored
Merge pull request #297 from serilog/dev
Creating release 5.5.0
2 parents 5dabed5 + 0fd036f commit 64dc4d5

File tree

85 files changed

+3036
-697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+3036
-697
lines changed

‎CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 5.5.0
2+
* Implemented enhancement #208: use Microsoft.Data.SqliClient for all platforms except net452 to enable Column Encryption (thanks to @mungk for the contribution).
3+
* Fixed issue #290 MissingMethodException with .NET Standard 2.0.
4+
* Added .NET Standard 2.0 sample program.
5+
* Minor bug fixes.
6+
* Completed overall refactoring and added unit tests for all refactored code.
7+
18
# 5.4.0
29
* Added support for Azure Managed Identities for Resources authentication (thanks to @darrenschwarz for the contribution).
310
* New interface using `SinkOptions` parameter. Marked old interfaces obsolete.

‎sample/AppConfigDemo/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dependentAssembly>
2929
<dependentAssembly>
3030
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
31-
<bindingRedirect oldVersion="0.0.0.0-3.1.3.0" newVersion="3.1.3.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.0" />
3232
</dependentAssembly>
3333
<dependentAssembly>
3434
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎sample/AppConfigDemo/AppConfigDemo.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
37-
<HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.3\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
36+
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
37+
<HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\Microsoft.Extensions.Primitives.3.1.3\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
39+
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\Microsoft.Extensions.Primitives.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
4141
</Reference>
4242
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
4343
<HintPath>..\..\packages\Serilog.2.9.0\lib\net46\Serilog.dll</HintPath>

‎sample/AppConfigDemo/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.3" targetFramework="net461" />
4-
<package id="Microsoft.Extensions.Primitives" version="3.1.3" targetFramework="net461" />
3+
<package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.4" targetFramework="net461" />
4+
<package id="Microsoft.Extensions.Primitives" version="3.1.4" targetFramework="net461" />
55
<package id="Serilog" version="2.9.0" targetFramework="net461" />
66
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net461" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />

‎sample/CombinedConfigDemo/CombinedConfigDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎sample/NetStandardDemo/NetStandardDemoApp/NetStandardDemoApp.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<ProjectReference Include="..\NetStandardDemoLib\NetStandardDemoLib.csproj" />
10+
</ItemGroup>
11+
12+
</Project>

‎sample/NetStandardDemo/NetStandardDemoApp/Program.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using System;
2+
using System.Threading;
3+
using NetStandardDemoLib;
4+
using Serilog;
5+
6+
namespace NetStandardDemoApp
7+
{
8+
public static class Program
9+
{
10+
public static void Main()
11+
{
12+
Log.Logger = Initializer.CreateLoggerConfiguration().CreateLogger();
13+
14+
Log.Debug("Getting started");
15+
16+
Log.Information("Hello {Name} from thread {ThreadId}", Environment.GetEnvironmentVariable("USERNAME"), Thread.CurrentThread.ManagedThreadId);
17+
18+
Log.Warning("No coins remain at position {@Position}", new { Lat = 25, Long = 134 });
19+
20+
Log.CloseAndFlush();
21+
}
22+
}
23+
}

‎sample/NetStandardDemo/NetStandardDemoLib/Initializer.cs

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
using System.Collections.ObjectModel;
2+
using System.Data;
3+
using Serilog;
4+
using Serilog.Events;
5+
using Serilog.Sinks.MSSqlServer;
6+
using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
7+
8+
namespace NetStandardDemoLib
9+
{
10+
public static class Initializer
11+
{
12+
private const string _connectionString = "Server=localhost;Database=LogTest;Integrated Security=SSPI;";
13+
private const string _tableName = "LogEvents";
14+
15+
public static LoggerConfiguration CreateLoggerConfiguration()
16+
{
17+
return new LoggerConfiguration()
18+
.Enrich.FromLogContext()
19+
.WriteTo.MSSqlServer(
20+
_connectionString,
21+
new SinkOptions
22+
{
23+
TableName = _tableName,
24+
AutoCreateSqlTable = true
25+
},
26+
sinkOptionsSection: null,
27+
appConfiguration: null,
28+
restrictedToMinimumLevel: LevelAlias.Minimum,
29+
formatProvider: null,
30+
columnOptions: BuildColumnOptions(),
31+
columnOptionsSection: null,
32+
logEventFormatter: null);
33+
34+
}
35+
36+
private static ColumnOptions BuildColumnOptions()
37+
{
38+
var columnOptions = new ColumnOptions
39+
{
40+
TimeStamp =
41+
{
42+
ColumnName = "TimeStampUTC",
43+
ConvertToUtc = true,
44+
},
45+
46+
AdditionalColumns = new Collection<SqlColumn>
47+
{
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" }
54+
}
55+
};
56+
57+
columnOptions.Store.Remove(StandardColumn.Properties);
58+
59+
return columnOptions;
60+
}
61+
}
62+
}

‎sample/NetStandardDemo/NetStandardDemoLib/NetStandardDemoLib.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\..\src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj" />
9+
</ItemGroup>
10+
11+
</Project>

‎sample/WorkerServiceDemo/WorkerServiceDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
9+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
1010
<PackageReference Include="Serilog.Extensions.Hosting" Version="3.0.0" />
1111
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
1212
</ItemGroup>

0 commit comments

Comments
 (0)