From 7834bf9a7d9bf665c0fa6363cfb9ae4c2fc2e3ff Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Mon, 19 Jul 2021 12:37:03 -0700
Subject: [PATCH] Fix System.Data.SqlClient dependency version on compat pack

---
 .../Microsoft.Windows.Compatibility.pkgproj          | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
index caa2fc5f2428d4..c1a3f16e19ec1c 100644
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -44,9 +44,6 @@
     <NS21PrereleaseLibraryPackage Include="System.ComponentModel.Composition.Registration" />
     <NS21PrereleaseLibraryPackage Include="System.Reflection.Context" />
 
-    <!-- Packages we don't build in main anymore -->
-    <LibraryPackage Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
-
     <!-- Packages which are inbox in NET6 and don't need to be referenced. -->
     <BeforeNET6LibraryPackage Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
     <BeforeNET6LibraryPackage Include="System.Data.DataSetExtensions" Version="$(SystemDataDataSetExtensionsVersion)" />
@@ -59,7 +56,8 @@
     <BeforeNET6LibraryPackage Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
     <BeforeNET6LibraryPackage Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
 
-    <!-- Service model packages -->
+    <!-- External packages -->
+    <ExternalLibraryPackage Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />  
     <ExternalLibraryPackage Include="System.ServiceModel.Primitives;
                                      System.ServiceModel.Duplex;
                                      System.ServiceModel.Http;
@@ -69,22 +67,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <IndexedDependency Include="@(LibraryPackage);
-                                @(PrereleaseLibraryPackage);
+    <IndexedDependency Include="@(PrereleaseLibraryPackage);
                                 @(NS21PrereleaseLibraryPackage)"
                        TargetFramework="net6.0" />
     <IndexedDependency Include="@(BeforeNET6LibraryPackage);
-                                @(LibraryPackage);
                                 @(PrereleaseLibraryPackage);
                                 @(NS21PrereleaseLibraryPackage)"
                        TargetFramework="netcoreapp3.1" />
     <IndexedDependency Include="@(BeforeNET6LibraryPackage);
-                                @(LibraryPackage);
                                 @(PrereleaseLibraryPackage);
                                 @(NS21PrereleaseLibraryPackage)"
                        TargetFramework="netstandard2.1" />
     <IndexedDependency Include="@(BeforeNET6LibraryPackage);
-                                @(LibraryPackage);
                                 @(PrereleaseLibraryPackage)"
                        TargetFramework="netstandard2.0" />
   </ItemGroup>