From 231b25f7873a5deb8bcaa1d62dbeaa3c24b80e2e Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <v-chmalh@microsoft.com>
Date: Thu, 13 Feb 2020 10:55:22 -0800
Subject: [PATCH] Remove packages config + SNI version revised

---
 .../netfx/src/Microsoft.Data.SqlClient.csproj              | 7 ++++++-
 src/Microsoft.Data.SqlClient/netfx/src/packages.config     | 6 ------
 tools/props/Versions.props                                 | 4 +++-
 tools/specs/Microsoft.Data.SqlClient.nuspec                | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient/netfx/src/packages.config

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 273812e690..bdeb3cc6c0 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -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" />
@@ -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>
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/packages.config b/src/Microsoft.Data.SqlClient/netfx/src/packages.config
deleted file mode 100644
index fe599d2346..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net46" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
-  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net46" />
-</packages>
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 566ab3b34e..84f11ff682 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -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>
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 5520b7f48c..d3d1ac7677 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -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" />