Skip to content

Remove packages config + SNI version revised #428

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

Merged
cheenamalhotra merged 1 commit into from
Feb 13, 2020
Merged

Remove packages config + SNI version revised #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion 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,6 +339,12 @@
</COMReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Security.Cryptography.Algorithms">
<Version>$(SystemSecurityCryptographyAlgorithmsVersion)</Version>
</PackageReference>
<PackageReference Include="System.Security.Cryptography.Primitives">
<Version>$(SystemSecurityCryptographyPrimitivesVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
</PackageReference>
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.

4 changes: 3 additions & 1 deletion tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
</PropertyGroup>
<!-- NetFx project dependencies -->
<PropertyGroup>
<MicrosoftDataSqlClientSniVersion>1.1.*</MicrosoftDataSqlClientSniVersion>
<MicrosoftDataSqlClientSniVersion>[1.1.0,1.2.0)</MicrosoftDataSqlClientSniVersion>
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
</PropertyGroup>
<!-- NetFx and NetCore project dependencies -->
<PropertyGroup>
Expand Down
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 @@ -27,7 +27,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<tags>sqlclient microsoft.data.sqlclient</tags>
<dependencies>
<group targetFramework="net46">
<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="4.7.1" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
Expand Down