From bb0888265a549e90ea3d23a97f299cc636145f17 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Thu, 27 Apr 2017 05:57:41 -0700
Subject: [PATCH 1/4] Removed comment

---
 test/MusicStore.E2ETests/SmokeTests.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/MusicStore.E2ETests/SmokeTests.cs b/test/MusicStore.E2ETests/SmokeTests.cs
index 42aa741425..4b41bfc95f 100644
--- a/test/MusicStore.E2ETests/SmokeTests.cs
+++ b/test/MusicStore.E2ETests/SmokeTests.cs
@@ -9,7 +9,6 @@ using Xunit.Abstractions;
 
 namespace E2ETests
 {
-    // Uses ports ranging 5001 - 5025.
     // TODO: temporarily disabling these tests as dotnet xunit runner does not support 32-bit yet.
     internal class SmokeTests_X86
     {

From d940c1eb759f32d7f02a36a56faf9ba61a392d99 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Thu, 27 Apr 2017 10:58:24 -0700
Subject: [PATCH 2/4] Updated runtime identifiers

---
 samples/MusicStore/MusicStore.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/MusicStore/MusicStore.csproj b/samples/MusicStore/MusicStore.csproj
index ad16fdd9ef..d40e8d2359 100644
--- a/samples/MusicStore/MusicStore.csproj
+++ b/samples/MusicStore/MusicStore.csproj
@@ -7,7 +7,7 @@
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);DEMO</DefineConstants>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <RuntimeIdentifiers>win7-x86;win7-x64;linux-x64;osx.10.12-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

From f9e9511435d9fe25e6ef80265a658b3b37a4dc50 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Thu, 27 Apr 2017 12:24:45 -0700
Subject: [PATCH 3/4] Upgrade System.Data.SqlClient to 4.4.0-* (#785)

- Addresses "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-*
---
 test/MusicStore.E2ETests/MusicStore.E2ETests.csproj | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index 6d6d625ca6..e26020120f 100644
--- a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -28,7 +28,14 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="System.Data.SqlClient" Version="$(CoreFxVersion)" />
+
+    <!--
+      * 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-*
+    -->
+    <PackageReference Include="System.Data.SqlClient" Version="4.4.0-*" />
+
     <PackageReference Include="System.Xml.XmlDocument" Version="$(CoreFxVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />

From fc45d79606376aab01d7d7f7f1eb4c9c1bf27f3f Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Thu, 27 Apr 2017 12:29:58 -0700
Subject: [PATCH 4/4] Changing the RID back from win-x64 to win7-x64 to
 workaround SQL issue

---
 samples/MusicStore/MusicStore.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/MusicStore/MusicStore.csproj b/samples/MusicStore/MusicStore.csproj
index d40e8d2359..e80661ed84 100644
--- a/samples/MusicStore/MusicStore.csproj
+++ b/samples/MusicStore/MusicStore.csproj
@@ -7,7 +7,7 @@
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);DEMO</DefineConstants>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64;linux-x64;osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>