Skip to content

Fix System.Data.SqlClient dependency version on compat pack #55956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
safern merged 1 commit into from
Jul 20, 2021
Merged

Fix System.Data.SqlClient dependency version on compat pack #55956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand All @@ -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;
Expand All @@ -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>
Expand Down