Include new packages in nuspec file (#1266)

dotnet · Sep 21, 2021 · 478519b · 478519b
1 parent e653bfe
commit 478519b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 40 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -856,15 +856,11 @@
     <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
     <PackageReference Condition="$(TargetGroup) == 'netcoreapp' " Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
-    <PackageReference Include="System.Threading.Tasks" Version="$(SystemThreadingTasksVersion)" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
     <PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
-    <PackageReference Include="System.Globalization" Version="$(SystemGlobalizationVersion)" />
     <PackageReference Include="System.IO" Version="$(SystemIOVersion)" />
-    <PackageReference Include="System.Xml.ReaderWriter" Version="$(SystemXmlReaderWriterVersion)" />
     <PackageReference Include="System.Resources.ResourceManager" Version="$(SystemResourcesResourceManagerVersion)" />
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
     <PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />

diff --git a/tools/props/Versions.props b/tools/props/Versions.props
@@ -33,16 +33,12 @@
     <SystemConfigurationConfigurationManagerVersion>5.0.0</SystemConfigurationConfigurationManagerVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>5.0.0</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemDiagnosticsPerformanceCounterVersion>5.0.0</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemGlobalizationVersion>4.3.0</SystemGlobalizationVersion>
-    <SystemMemoryVersion>4.5.4</SystemMemoryVersion>
     <SystemResourcesResourceManagerVersion>4.3.0</SystemResourcesResourceManagerVersion>
     <SystemRuntimeCachingVersion>5.0.0</SystemRuntimeCachingVersion>
     <SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
     <SystemSecurityPermissionsVersion>5.0.0</SystemSecurityPermissionsVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <SystemTextEncodingCodePagesVersion>5.0.0</SystemTextEncodingCodePagesVersion>
-    <SystemThreadingTasksVersion>4.3.0</SystemThreadingTasksVersion>
-    <SystemXmlReaderWriterVersion>4.3.1</SystemXmlReaderWriterVersion>
   </PropertyGroup>
   <!-- NetStandard project dependencies -->
   <PropertyGroup>

diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -30,72 +30,88 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
       <group targetFramework="net461">
         <dependency id="Microsoft.Data.SqlClient.SNI" version="4.0.0-preview1.21232.1" />
         <dependency id="Azure.Identity" version="1.3.0" />
-        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
+        <dependency id="System.Buffers" version="4.5.1" />
         <dependency id="System.Configuration.ConfigurationManager" version="5.0.0" exclude="Compile" />
+        <dependency id="System.IO" version="4.3.0" />
         <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
+        <dependency id="System.Security.Cryptography.Algorithms" version="4.3.1" />
+        <dependency id="System.Security.Cryptography.Primitives" version="4.3.0" />
+        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
       </group>
       <group targetFramework="netcoreapp2.1">
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0-preview1.21232.1" exclude="Compile" />
-        <dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Diagnostics.DiagnosticSource" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Configuration.ConfigurationManager" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Runtime.Caching" version="5.0.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
-        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
-      </group>
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0-preview1.21232.1" exclude="Compile" />
         <dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Diagnostics.DiagnosticSource" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Buffers" version="4.5.1" />
         <dependency id="System.Configuration.ConfigurationManager" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="5.0.0" exclude="Compile" />
+        <dependency id="System.IO" version="4.3.0" />
         <dependency id="System.Runtime.Caching" version="5.0.0" exclude="Compile" />
-        <dependency id="Azure.Identity" version="1.3.0" />
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
         <dependency id="System.Text.Encodings.Web" version="4.7.2" />
+        <dependency id="System.Resources.ResourceManager" version="4.3.0" />
+        <dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
+        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
+      </group>
+      <group targetFramework="netcoreapp3.1">
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0-preview1.21232.1" exclude="Compile" />
+        <dependency id="Azure.Identity" version="1.3.0" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
+        <dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Buffers" version="4.5.1" />
+        <dependency id="System.Configuration.ConfigurationManager" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="5.0.0" exclude="Compile" />
+        <dependency id="System.IO" version="4.3.0" />
+        <dependency id="System.Runtime.Caching" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
+        <dependency id="System.Resources.ResourceManager" version="4.3.0" />
+        <dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
+        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0-preview1.21232.1" exclude="Compile" />
-        <dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Buffers" version="4.5.1" exclude="Compile" />
-        <dependency id="System.Memory" version="4.5.4" exclude="Compile" />
-        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Runtime.Caching" version="5.0.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
-        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
+        <dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Buffers" version="4.5.1" />
         <dependency id="System.Configuration.ConfigurationManager" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Runtime.Loader" version="4.3.0" exclude="Compile" />
+        <dependency id="System.IO" version="4.3.0" />
+        <dependency id="System.Runtime.Caching" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
+        <dependency id="System.Runtime.Loader" version="4.3.0" />
+        <dependency id="System.Resources.ResourceManager" version="4.3.0" />
+        <dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
+        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
       <group targetFramework="netstandard2.1">
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="4.0.0-preview1.21232.1" exclude="Compile" />
-        <dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Buffers" version="4.5.1" exclude="Compile" />
-        <dependency id="System.Memory" version="4.5.4" exclude="Compile" />
-        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Runtime.Caching" version="5.0.0" exclude="Compile" />
         <dependency id="Azure.Identity" version="1.3.0" />
-        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
         <dependency id="Microsoft.Identity.Client" version="4.22.0" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" />
+        <dependency id="Microsoft.Win32.Registry" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Buffers" version="4.5.1" />
         <dependency id="System.Configuration.ConfigurationManager" version="5.0.0" exclude="Compile" />
-        <dependency id="System.Runtime.Loader" version="4.3.0" exclude="Compile" />
+        <dependency id="System.IO" version="4.3.0" />
+        <dependency id="System.Runtime.Caching" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Text.Encoding.CodePages" version="5.0.0" exclude="Compile" />
+        <dependency id="System.Text.Encodings.Web" version="4.7.2" />
+        <dependency id="System.Runtime.Loader" version="4.3.0" />
+        <dependency id="System.Resources.ResourceManager" version="4.3.0" />
+        <dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
+        <dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
       </group>
     </dependencies>
     <frameworkAssemblies>