Skip to content

Commit 4bba056

Browse files
ckadlubackadluba
committed
Update SqlClient to 3.0.0 to fix vulnerability
Issue GHSA-5crp-9r3c-p9vr Found by using dotnet list package --vulnerable --include-transitive.
1 parent 8d0d6b1 commit 4bba056

File tree

4 files changed

+33
-89
lines changed

4 files changed

+33
-89
lines changed

‎sample/AppConfigDemo/AppConfigDemo.csproj

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -35,46 +35,10 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Microsoft.Data.SqlClient, Version=1.13.20136.2, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
40-
</Reference>
4138
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\Microsoft.Extensions.Primitives.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Microsoft.Identity.Client, Version=4.45.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\Microsoft.Identity.Client.4.45.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\Microsoft.IdentityModel.Abstractions.6.21.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.21.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
55-
</Reference>
56-
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.6.21.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Microsoft.IdentityModel.Protocols, Version=6.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.6.21.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=6.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.21.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
64-
</Reference>
65-
<Reference Include="Microsoft.IdentityModel.Tokens, Version=6.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.6.21.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
67-
</Reference>
68-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\Serilog.2.9.0\lib\net46\Serilog.dll</HintPath>
73-
</Reference>
39+
<HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
40+
</Reference>
7441
<Reference Include="System" />
75-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
76-
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
77-
</Reference>
7842
<Reference Include="System.Configuration" />
7943
<Reference Include="System.Core" />
8044
<Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -84,19 +48,7 @@
8448
</Reference>
8549
<Reference Include="System.Drawing" />
8650
<Reference Include="System.IdentityModel" />
87-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.21.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.6.21.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
89-
</Reference>
90-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
91-
<HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
92-
</Reference>
9351
<Reference Include="System.Numerics" />
94-
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
95-
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
96-
</Reference>
97-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
99-
</Reference>
10052
<Reference Include="System.Windows.Forms" />
10153
<Reference Include="System.Xml.Linq" />
10254
<Reference Include="System.Data.DataSetExtensions" />
@@ -129,4 +81,4 @@
12981
</PropertyGroup>
13082
<Error Condition="!Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
13183
</Target>
132-
</Project>
84+
</Project>

‎sample/AppConfigDemo/packages.config

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net461" />
4-
<package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net461" />
5-
<package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.4" targetFramework="net461" />
6-
<package id="Microsoft.Extensions.Primitives" version="3.1.4" targetFramework="net461" />
3+
<!--<package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.4" targetFramework="net462" />-->
4+
<package id="Microsoft.Extensions.Primitives" version="3.1.4" targetFramework="net462" />
75
<package id="Microsoft.Identity.Client" version="4.45.0" targetFramework="net462" />
86
<package id="Microsoft.IdentityModel.Abstractions" version="6.21.0" targetFramework="net462" />
97
<package id="Microsoft.IdentityModel.JsonWebTokens" version="6.21.0" targetFramework="net462" />
108
<package id="Microsoft.IdentityModel.Logging" version="6.21.0" targetFramework="net462" />
119
<package id="Microsoft.IdentityModel.Protocols" version="6.21.0" targetFramework="net462" />
1210
<package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.21.0" targetFramework="net462" />
1311
<package id="Microsoft.IdentityModel.Tokens" version="6.21.0" targetFramework="net462" />
14-
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
15-
<package id="Serilog" version="2.9.0" targetFramework="net461" />
16-
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net461" />
17-
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
18-
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
12+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
13+
<package id="Serilog" version="2.9.0" targetFramework="net462" />
14+
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net462" />
15+
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
16+
<package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
1917
<package id="System.IdentityModel.Tokens.Jwt" version="6.21.0" targetFramework="net462" />
20-
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
21-
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
22-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
23-
</packages>
18+
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
19+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
20+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net462" />
21+
</packages>

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
32+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
3333
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -59,30 +59,31 @@
5959
</ItemGroup>
6060

6161
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
62-
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
63-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
64-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
62+
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
63+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.4" />
64+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
6565
<Compile Include="Configuration\Extensions\Microsoft.Extensions.Configuration\**\*.cs" />
6666
<Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />
6767
<Compile Include="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStub.cs" />
6868
</ItemGroup>
69+
6970
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
70-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
71-
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
72-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
73-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
71+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
72+
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
73+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.4" />
74+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
7475
<Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
7576
<Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />
7677
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
7778
<Compile Include="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStub.cs" />
7879
</ItemGroup>
7980

8081
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net472' ">
81-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
82-
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
82+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
83+
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
8384
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.4.0" />
84-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
85-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
85+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.4" />
86+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.4" />
8687
<Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
8788
<Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />
8889
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515

1616
<ItemGroup>
1717
<ProjectReference Include="..\..\src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj" />
18-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
19-
<PackageReference Include="Dapper.StrongName" Version="1.50.5" />
18+
<PackageReference Include="FluentAssertions" Version="6.7.0" />
19+
<PackageReference Include="Dapper.StrongName" Version="2.0.123" />
2020
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
21-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0"/>
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
23-
<PackageReference Include="Moq" Version="4.14.1" />
24-
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
22+
<PackageReference Include="Moq" Version="4.18.2" />
23+
<PackageReference Include="xunit" Version="2.4.2" />
24+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
2525
</ItemGroup>
2626

2727
<ItemGroup>
@@ -42,8 +42,6 @@
4242
<Reference Include="System" />
4343
<Reference Include="System.Transactions" />
4444
<Reference Include="Microsoft.CSharp" />
45-
<PackageReference Include="xunit" Version="2.4.1" />
46-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
4745
<Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
4846
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
4947
<Compile Include="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStubTests.cs" />
@@ -53,8 +51,6 @@
5351
<Reference Include="System" />
5452
<Reference Include="System.Transactions" />
5553
<Reference Include="Microsoft.CSharp" />
56-
<PackageReference Include="xunit" Version="2.4.1" />
57-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
5854
<Compile Remove="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStubTests.cs" />
5955
<Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
6056
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
@@ -68,9 +64,6 @@
6864
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
6965
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
7066
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
71-
<PackageReference Include="xunit" Version="2.4.1" />
72-
<PackageReference Include="xunit.core" Version="2.4.1" />
73-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1"/>
7467
<Compile Remove="Configuration\Extensions\System.Configuration\**\*.cs" />
7568
<Compile Remove="Configuration\Implementations\System.Configuration\**\*.cs" />
7669
<Compile Remove="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStubTests.cs" />

0 commit comments

Comments
 (0)