Skip to content

Commit d14a064

Browse files
ckadlubackadluba
authored
Merge pull request #257 from ckadluba/refactoring-cleanup-tests
Updated NuGets: Serilog 2.9.0, Serilog.Sinks.PeriodicBatching 2.3.0
2 parents dbd510d + 1c53e76 commit d14a064

File tree

7 files changed

+37
-38
lines changed

7 files changed

+37
-38
lines changed

‎sample/AppConfigDemo/App.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
</dependentAssembly>
2424
<dependentAssembly>
2525
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
26-
<bindingRedirect oldVersion="0.0.0.0-3.1.2.0" newVersion="3.1.2.0" />
26+
<bindingRedirect oldVersion="0.0.0.0-3.1.3.0" newVersion="3.1.3.0" />
27+
</dependentAssembly>
28+
<dependentAssembly>
29+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
30+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
2731
</dependentAssembly>
2832
</assemblyBinding>
2933
</runtime>

‎sample/AppConfigDemo/AppConfigDemo.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,30 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
37-
<HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
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>
3838
</Reference>
39-
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\Microsoft.Extensions.Primitives.3.1.2\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
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>
4141
</Reference>
4242
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\Serilog.2.6.0\lib\net46\Serilog.dll</HintPath>
43+
<HintPath>..\..\packages\Serilog.2.9.0\lib\net46\Serilog.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
46-
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
46+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
47+
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
4848
</Reference>
4949
<Reference Include="System.Configuration" />
5050
<Reference Include="System.Core" />
51-
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\System.Memory.4.5.2\lib\netstandard2.0\System.Memory.dll</HintPath>
51+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System.Numerics" />
55-
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
55+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
5757
</Reference>
5858
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
59+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
6060
</Reference>
6161
<Reference Include="System.Xml.Linq" />
6262
<Reference Include="System.Data.DataSetExtensions" />

‎sample/AppConfigDemo/packages.config

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.2" targetFramework="net461" />
4-
<package id="Microsoft.Extensions.Primitives" version="3.1.2" targetFramework="net461" />
5-
<package id="Serilog" version="2.6.0" targetFramework="net461" />
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" />
5+
<package id="Serilog" version="2.9.0" targetFramework="net461" />
66
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net461" />
7-
<package id="System.Buffers" version="4.4.0" targetFramework="net461" />
8-
<package id="System.Memory" version="4.5.2" targetFramework="net461" />
9-
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
10-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net461" />
7+
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
8+
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
9+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
10+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
1111
</packages>

‎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.2" />
9+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
1010
<PackageReference Include="Serilog.Extensions.Hosting" Version="3.0.0" />
1111
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
1212
</ItemGroup>

‎src/Serilog.Sinks.MSSqlServer/GlobalSuppressions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@
1616
[assembly: SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "Cannot be changed on public classes for backward compatibility reasons.", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer")]
1717
[assembly: SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "Cannot be changed on public classes for backward compatibility reasons.", Scope = "type", Target = "~T:Serilog.Sinks.MSSqlServer.ColumnOptions")]
1818
[assembly: SuppressMessage("Design", "CA1010:Collections should implement generic interface", Justification = "Cannot be changed on public classes for backward compatibility reasons.", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer")]
19-
[assembly: SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Too hard to change. Accepted for now.", Scope = "type", Target = "~T:Serilog.LoggerConfigurationMSSqlServerExtensions")]
2019
[assembly: SuppressMessage("Performance", "CA1822: Member AllowNull does not access instance data and can be marked as static (Shared in VisualBasic)", Justification = "Cannot be changed on public classes for backward compatibility reasons.", Scope = "member", Target = "~P:Serilog.Sinks.MSSqlServer.ColumnOptions.IdColumnOptions.AllowNull")]

‎src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
33-
<PackageReference Include="Serilog" Version="2.5.0" />
34-
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
33+
<PackageReference Include="Serilog" Version="2.9.0" />
34+
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.3.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>
@@ -51,7 +51,7 @@
5151
</ItemGroup>
5252

5353
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
54-
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
54+
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
5555
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
5656
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
5757
<Compile Include="Configuration\Extensions\Microsoft.Extensions.Configuration\**\*.cs" />
@@ -60,7 +60,7 @@
6060

6161
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'net461' ">
6262
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
63-
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
63+
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
6464
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
6565
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
6666
<Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
@@ -79,10 +79,6 @@
7979
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
8080
</ItemGroup>
8181

82-
<ItemGroup>
83-
<None Remove="Configuration\Implementations\Microsoft.Extensions.Configuration\IApplyMicrosoftExtensionsConfiguration.cs" />
84-
</ItemGroup>
85-
8682
<ItemGroup>
8783
<None Include="Configuration\Factories\IMSSqlServerSinkFactory.cs" />
8884
<None Include="Configuration\Factories\MSSqlServerSinkFactory.cs" />

‎test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626

2727
<ItemGroup>
2828
<ProjectReference Include="..\..\src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj" />
29-
<PackageReference Include="FluentAssertions" Version="5.4.1" />
29+
<PackageReference Include="FluentAssertions" Version="5.10.3" />
3030
<PackageReference Include="Dapper.StrongName" Version="1.50.5" />
3131
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
3232
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>
36-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
36+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
3737
<PackageReference Include="Moq" Version="4.13.1" />
3838
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
3939
</ItemGroup>
@@ -49,22 +49,22 @@
4949
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
5050
<Reference Include="System" />
5151
<Reference Include="Microsoft.CSharp" />
52-
<PackageReference Include="xunit" Version="2.4.0" />
53-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
52+
<PackageReference Include="xunit" Version="2.4.1" />
53+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
5454
<Compile Include="Configuration\Extensions\System.Configuration\**\*.cs" />
5555
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
5656
</ItemGroup>
5757

5858
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
5959
<PackageReference Include="System.Collections" Version="4.3.0" />
6060
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
61-
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
61+
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
6262
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
6363
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
6464
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
65-
<PackageReference Include="xunit" Version="2.4.0" />
66-
<PackageReference Include="xunit.core" Version="2.4.0" />
67-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
65+
<PackageReference Include="xunit" Version="2.4.1" />
66+
<PackageReference Include="xunit.core" Version="2.4.1" />
67+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
6868
<PrivateAssets>all</PrivateAssets>
6969
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
7070
</PackageReference>

0 commit comments

Comments
 (0)