Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release 1.1] Revert Async changes in SNIPacket to fix deadlock issues + Update SNI Package Reference #425

Merged
merged 3 commits into from
Feb 13, 2020
Merged

[Release 1.1] Revert Async changes in SNIPacket to fix deadlock issues + Update SNI Package Reference #425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6233e4
[Release 1.1] Revert Async changes to SNIPacket to fix deadlock issue…
cheenamalhotra Feb 12, 2020
7124835
No upper bound needed
cheenamalhotra Feb 12, 2020
d0aa486
Update versions range + remove packages.config to avoid duplicated re…
cheenamalhotra Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update versions range + remove packages.config to avoid duplicated re… 
…ferences.
  • Loading branch information
@cheenamalhotra
cheenamalhotra committed Feb 13, 2020
commit d0aa486d3ea49f170d0a240d2409df2e21553afb
9 changes: 7 additions & 2 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
</ItemGroup>
<ItemGroup>
<None Include="Microsoft.Data.SqlClientKey.snk" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="Microsoft\Data\Interop\SNINativeMethodWrapper.cs" />
Expand Down Expand Up @@ -340,8 +339,14 @@
</COMReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Security.Cryptography.Algorithms">
<Version>4.3.1</Version>
</PackageReference>
<PackageReference Include="System.Security.Cryptography.Primitives">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
<Version>1.1.*</Version>
<Version>[1.1.0,1.2.0)</Version>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Client">
<Version>3.0.8</Version>
Expand Down
6 changes: 0 additions & 6 deletions src/Microsoft.Data.SqlClient/netfx/src/packages.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/specs/Microsoft.Data.SqlClient.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependencies>
<group targetFramework="net46">
<dependency id="System.Data.Common" version="4.3.0" />
<dependency id="Microsoft.Data.SqlClient.sni" version="[1.1.0, )" />
<dependency id="Microsoft.Data.SqlClient.sni" version="[1.1.0,1.2.0)" />
<dependency id="Microsoft.Identity.Client" version="3.0.8" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.5.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.5.0" />
Expand Down