From db517803c8ef05b3961c7a976ae52c1b0c292ec5 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Wed, 3 May 2017 11:30:51 -0700
Subject: [PATCH] Move System.Data.SqlClient version from csproj to
 dependencies.props (#293)

---
 build/dependencies.props                                  | 8 ++++++++
 .../Microsoft.Extensions.Caching.SqlConfig.Tools.csproj   | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 3db1eba0a2..cf961b6939 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,6 +1,14 @@
 <Project>
   <PropertyGroup>
     <AspNetCoreVersion>2.0.0-preview1-*</AspNetCoreVersion>
+
+    <!--
+      * Use 4.4.0-* instead of $(CoreFxVersion) to address "SqlClient fails with netcoreapp2.0 on Win7/Server2008"
+        * https://github.com/dotnet/corefx/issues/18406
+      * Revert if and when $(CoreFxVersion) is upgraded to 4.4.0-*
+    -->
+    <SqlClientVersion>4.4.0-*</SqlClientVersion>
+
     <CoreFxVersion>4.3.0</CoreFxVersion>
     <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
     <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
index fc1b331e7d..8fed872aac 100644
--- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
+++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
@@ -21,11 +21,11 @@
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
 
     <!--
-      * Use 4.4.0-* instead of $(CoreFxVersion) to address "SqlClient fails with netcoreapp2.0 on Win7/Server2008"
+      * Use $(SqlClientVersion) instead of $(CoreFxVersion) to address "SqlClient fails with netcoreapp2.0 on Win7/Server2008"
         * https://github.com/dotnet/corefx/issues/18406
-      * Revert if and when $(CoreFxVersion) is upgraded to 4.4.0-*
+      * Revert if and when $(CoreFxVersion) is upgraded to match $(SqlClientVersion)
     -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.0-*" />
+    <PackageReference Include="System.Data.SqlClient" Version="$(SqlClientVersion)" />
   </ItemGroup>
 
 </Project>