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

---
 build/dependencies.props                            | 8 ++++++++
 test/MusicStore.E2ETests/MusicStore.E2ETests.csproj | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 69e9d6b700..148a63f4ad 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,6 +3,14 @@
     <AspNetCoreVersion>2.0.0-preview1-*</AspNetCoreVersion>
     <AspNetIntegrationTestingVersion>0.4.0-*</AspNetIntegrationTestingVersion>
     <AspNetCoreModuleVersion>1.0.0-*</AspNetCoreModuleVersion>
+
+    <!--
+      * 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>
     <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
diff --git a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index e26020120f..07aaf35120 100644
--- a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -30,11 +30,11 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
 
     <!--
-      * 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)" />
 
     <PackageReference Include="System.Xml.XmlDocument" Version="$(CoreFxVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />