Skip to content

Commit 070ec72

Browse files
teo-tsirpanisteo-tsirpanis
authored
Remove redundant NuGet package references. (#1849)
1 parent af0a376 commit 070ec72

File tree

7 files changed

+5
-38
lines changed

7 files changed

+5
-38
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@
950950
</EmbeddedResource>
951951
</ItemGroup>
952952
<ItemGroup>
953-
<PackageReference Condition="'$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
953+
<PackageReference Condition="$(TargetGroup) == 'netstandard' and '$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
954954
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
955955
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
956956
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
@@ -965,12 +965,10 @@
965965
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
966966
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
967967
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
968-
<PackageReference Include="System.IO" Version="$(SystemIOVersion)" />
969-
<PackageReference Include="System.Resources.ResourceManager" Version="$(SystemResourcesResourceManagerVersion)" />
970-
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
968+
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Buffers" Version="$(SystemBuffersVersion)" />
971969
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
972970
<PackageReference Condition="$(TargetGroup) == 'netstandard'" Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
973-
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
971+
<PackageReference Condition="$(TargetGroup) == 'netstandard'" Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
974972
<PackageReference Condition="$(BuildForRelease) == 'true'" Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="All" />
975973
</ItemGroup>
976974
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

-9
Original file line numberDiff line numberDiff line change
@@ -709,12 +709,6 @@
709709
<PackageReference Include="System.Text.Encodings.Web">
710710
<Version>$(SystemTextEncodingsWebVersion)</Version>
711711
</PackageReference>
712-
<PackageReference Include="System.Security.Cryptography.Algorithms">
713-
<Version>$(SystemSecurityCryptographyAlgorithmsVersion)</Version>
714-
</PackageReference>
715-
<PackageReference Include="System.Security.Cryptography.Primitives">
716-
<Version>$(SystemSecurityCryptographyPrimitivesVersion)</Version>
717-
</PackageReference>
718712
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
719713
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
720714
<PrivateAssets>All</PrivateAssets>
@@ -735,9 +729,6 @@
735729
<PackageReference Include="System.Buffers">
736730
<Version>$(SystemBuffersVersion)</Version>
737731
</PackageReference>
738-
<PackageReference Include="System.IO">
739-
<Version>$(SystemIOVersion)</Version>
740-
</PackageReference>
741732
</ItemGroup>
742733
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
743734
<Import Project="$(NetFxSource)tools\targets\GenerateResourceStringsSource.targets" />

‎src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,6 @@
321321
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
322322
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
323323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
324-
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
325-
<PackageReference Include="System.Net.Sockets" Version="$(SystemNetSocketsVersion)" />
326324
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtVersion)" />
327325
<PackageReference Condition="'$(TargetGroup)'=='netfx'" Include="Microsoft.SqlServer.Types" Version="$(MicrosoftSqlServerTypesVersion)" />
328326
<PackageReference Condition="'$(TargetGroup)'=='netcoreapp'" Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotnetRemoteExecutorVersion)" />

‎src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
</ItemGroup>
2323
<ItemGroup>
2424
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
25-
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
2625
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
2726
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
2827
</ItemGroup>

‎src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/Microsoft.DotNet.XUnitExtensions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</ItemGroup>
4747
<ItemGroup>
4848
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
49-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationVersion)" />
49+
<PackageReference Condition="$(TargetGroup) == 'netfx'" Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationVersion)" />
5050
<PackageReference Include="xunit" Version="$(XunitVersion)" />
5151
<PackageReference Include="xunit.runner.visualstudio" Version="$(xunitrunnervisualstudioVersion)" />
5252
<PackageReference Include="xunit.runner.console" Version="$(XunitVersion)" />

‎tools/props/Versions.props

+1-8
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
</PropertyGroup>
2121
<!-- NetFx project dependencies -->
2222
<PropertyGroup>
23-
<MicrosoftDataSqlClientSniVersion>5.1.0-preview2.22311.2</MicrosoftDataSqlClientSniVersion>
24-
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
25-
<SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
23+
<MicrosoftDataSqlClientSniVersion>5.1.0-preview2.22311.2</MicrosoftDataSqlClientSniVersion>
2624
</PropertyGroup>
2725
<!-- NetFx and NetCore project dependencies -->
2826
<PropertyGroup>
@@ -31,7 +29,6 @@
3129
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.24.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
3230
<MicrosoftIdentityModelJsonWebTokensVersion>6.24.0</MicrosoftIdentityModelJsonWebTokensVersion>
3331
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
34-
<SystemIOVersion>4.3.0</SystemIOVersion>
3532
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
3633
<MicrosoftSourceLinkGitHubVersion>1.1.0</MicrosoftSourceLinkGitHubVersion>
3734
</PropertyGroup>
@@ -43,7 +40,6 @@
4340
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
4441
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
4542
<SystemDiagnosticsPerformanceCounterVersion>6.0.1</SystemDiagnosticsPerformanceCounterVersion>
46-
<SystemResourcesResourceManagerVersion>4.3.0</SystemResourcesResourceManagerVersion>
4743
<SystemRuntimeCachingVersion>6.0.0</SystemRuntimeCachingVersion>
4844
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
4945
<SystemSecurityPermissionsVersion>6.0.0</SystemSecurityPermissionsVersion>
@@ -67,10 +63,7 @@
6763
<MicrosoftNETTestSdkVersion>17.3.2</MicrosoftNETTestSdkVersion>
6864
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
6965
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
70-
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
71-
<SystemDataOdbcVersion21>4.5.0</SystemDataOdbcVersion21>
7266
<SystemDataOdbcVersion>6.0.1</SystemDataOdbcVersion>
73-
<SystemNetSocketsVersion>4.3.0</SystemNetSocketsVersion>
7467
<SystemIdentityModelTokensJwtVersion>6.24.0</SystemIdentityModelTokensJwtVersion>
7568
<XunitVersion>2.4.2</XunitVersion>
7669
<xunitrunnervisualstudioVersion>2.4.5</xunitrunnervisualstudioVersion>

‎tools/specs/Microsoft.Data.SqlClient.nuspec

-12
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
3535
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.24.0" />
3636
<dependency id="System.Buffers" version="4.5.1" />
3737
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
38-
<dependency id="System.IO" version="4.3.0" />
3938
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
40-
<dependency id="System.Security.Cryptography.Algorithms" version="4.3.1" />
41-
<dependency id="System.Security.Cryptography.Primitives" version="4.3.0" />
4239
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
4340
</group>
4441
<group targetFramework="net6.0">
@@ -48,15 +45,11 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
4845
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.24.0" />
4946
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.24.0" />
5047
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
51-
<dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
52-
<dependency id="System.Buffers" version="4.5.1" />
5348
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
5449
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.0" exclude="Compile" />
55-
<dependency id="System.IO" version="4.3.0" />
5650
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
5751
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
5852
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
59-
<dependency id="System.Resources.ResourceManager" version="4.3.0" />
6053
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
6154
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
6255
</group>
@@ -70,12 +63,10 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
7063
<dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
7164
<dependency id="System.Buffers" version="4.5.1" />
7265
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
73-
<dependency id="System.IO" version="4.3.0" />
7466
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
7567
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
7668
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
7769
<dependency id="System.Runtime.Loader" version="4.3.0" />
78-
<dependency id="System.Resources.ResourceManager" version="4.3.0" />
7970
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
8071
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
8172
</group>
@@ -87,14 +78,11 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
8778
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.24.0" />
8879
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
8980
<dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
90-
<dependency id="System.Buffers" version="4.5.1" />
9181
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
92-
<dependency id="System.IO" version="4.3.0" />
9382
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
9483
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
9584
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
9685
<dependency id="System.Runtime.Loader" version="4.3.0" />
97-
<dependency id="System.Resources.ResourceManager" version="4.3.0" />
9886
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
9987
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
10088
</group>

0 commit comments

Comments
 (0)