Skip to content

Commit e0b1406

Browse files
JonathanMagnanJonathanMagnan
committed
Update Microsoft.Data.SqlClient
1 parent 91b6e9a commit e0b1406

File tree

3 files changed

+38
-11
lines changed

3 files changed

+38
-11
lines changed

‎EntityFrameworkExtras.EFCore3.Tests/App.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
2121
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
2222
</dependentAssembly>
23+
<dependentAssembly>
24+
<assemblyIdentity name="Microsoft.Data.SqlClient" publicKeyToken="23ec7fc2d6eaa4a5" culture="neutral" />
25+
<bindingRedirect oldVersion="0.0.0.0-2.0.20168.4" newVersion="2.0.20168.4" />
26+
</dependentAssembly>
2327
</assemblyBinding>
2428
</runtime>
2529
</configuration>

‎EntityFrameworkExtras.EFCore3.Tests/EntityFrameworkExtras.EFCore3.Tests.csproj

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
<Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
4242
<HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.0\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Microsoft.Data.SqlClient, Version=1.0.19269.1, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Microsoft.Data.SqlClient.1.0.19269.1\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
46-
<Private>True</Private>
44+
<Reference Include="Microsoft.Data.SqlClient, Version=2.0.20168.4, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Microsoft.Data.SqlClient.2.1.7\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
4746
</Reference>
4847
<Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
4948
<HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
@@ -91,8 +90,23 @@
9190
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
9291
<HintPath>..\packages\Microsoft.Extensions.Primitives.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
9392
</Reference>
94-
<Reference Include="Microsoft.Identity.Client, Version=3.0.8.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
95-
<HintPath>..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll</HintPath>
93+
<Reference Include="Microsoft.Identity.Client, Version=4.21.1.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Microsoft.Identity.Client.4.21.1\lib\net461\Microsoft.Identity.Client.dll</HintPath>
95+
</Reference>
96+
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.6.8.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
98+
</Reference>
99+
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.8.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
101+
</Reference>
102+
<Reference Include="Microsoft.IdentityModel.Protocols, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103+
<HintPath>..\packages\Microsoft.IdentityModel.Protocols.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
104+
</Reference>
105+
<Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106+
<HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
107+
</Reference>
108+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.6.8.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
96110
</Reference>
97111
<Reference Include="nunit.framework">
98112
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
@@ -124,6 +138,9 @@
124138
</Reference>
125139
<Reference Include="System.Drawing" />
126140
<Reference Include="System.IdentityModel" />
141+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
142+
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.6.8.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
143+
</Reference>
127144
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
128145
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
129146
</Reference>
@@ -174,12 +191,12 @@
174191
</ItemGroup>
175192
<Import Project="..\EntityFrameworkExtras.Tests.Shared\EntityFrameworkExtras.Tests.Shared.projitems" Label="Shared" />
176193
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
177-
<Import Project="..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
194+
<Import Project="..\packages\Microsoft.Data.SqlClient.SNI.2.1.1\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.2.1.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
178195
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
179196
<PropertyGroup>
180197
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
181198
</PropertyGroup>
182-
<Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.1.0.19235.1\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
199+
<Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.2.1.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.2.1.1\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
183200
</Target>
184201
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
185202
Other similar extension points exist, see Microsoft.Common.targets.

‎EntityFrameworkExtras.EFCore3.Tests/packages.config

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net48" />
44
<package id="Microsoft.Bcl.HashCode" version="1.1.0" targetFramework="net48" />
5-
<package id="Microsoft.Data.SqlClient" version="1.1.4" targetFramework="net48" />
6-
<package id="Microsoft.Data.SqlClient.SNI" version="1.0.19235.1" targetFramework="net48" />
5+
<package id="Microsoft.Data.SqlClient" version="2.1.7" targetFramework="net48" />
6+
<package id="Microsoft.Data.SqlClient.SNI" version="2.1.1" targetFramework="net48" />
77
<package id="Microsoft.EntityFrameworkCore" version="3.1.0" targetFramework="net48" />
88
<package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.0" targetFramework="net48" />
99
<package id="Microsoft.EntityFrameworkCore.Analyzers" version="3.1.0" targetFramework="net48" />
@@ -20,14 +20,20 @@
2020
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.0" targetFramework="net48" />
2121
<package id="Microsoft.Extensions.Options" version="3.1.0" targetFramework="net48" />
2222
<package id="Microsoft.Extensions.Primitives" version="3.1.0" targetFramework="net48" />
23-
<package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net48" />
23+
<package id="Microsoft.Identity.Client" version="4.21.1" targetFramework="net48" />
24+
<package id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" targetFramework="net48" />
25+
<package id="Microsoft.IdentityModel.Logging" version="6.8.0" targetFramework="net48" />
26+
<package id="Microsoft.IdentityModel.Protocols" version="6.8.0" targetFramework="net48" />
27+
<package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" targetFramework="net48" />
28+
<package id="Microsoft.IdentityModel.Tokens" version="6.8.0" targetFramework="net48" />
2429
<package id="NUnit" version="2.6.3" targetFramework="net40" />
2530
<package id="System.Buffers" version="4.4.0" targetFramework="net48" />
2631
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net48" />
2732
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net48" />
2833
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net48" />
2934
<package id="System.Data.Common" version="4.3.0" targetFramework="net48" />
3035
<package id="System.Diagnostics.DiagnosticSource" version="4.7.0" targetFramework="net48" />
36+
<package id="System.IdentityModel.Tokens.Jwt" version="6.8.0" targetFramework="net48" />
3137
<package id="System.Memory" version="4.5.3" targetFramework="net48" />
3238
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net48" />
3339
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net48" />

0 commit comments

Comments
 (0)