Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="$(AzureSecurityKeyVaultKeysVersion)" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
Comment thread
mdaigle marked this conversation as resolved.
</ItemGroup>

<Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,6 @@
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
</ItemGroup>
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
<Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
<PrivateAssets>All</PrivateAssets>
Expand All @@ -45,7 +44,6 @@
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
Comment thread
mdaigle marked this conversation as resolved.
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
</ItemGroup>

<Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
<PrivateAssets>All</PrivateAssets>
Expand All @@ -887,7 +886,6 @@
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
Comment thread
mdaigle marked this conversation as resolved.
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
</ItemGroup>
<Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />
<Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
<PackageReference Condition="'$(TargetGroup)'=='netfx'" Include="Microsoft.SqlServer.Types" Version="$(MicrosoftSqlServerTypesVersion)" />
<PackageReference Condition="'$(TargetGroup)'=='netcoreapp'" Include="Microsoft.SqlServer.Types" Version="$(MicrosoftSqlServerTypesVersionNet)" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
<PackageReference Include="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@
<PackageReference Condition="'$(TargetGroup)'=='netcoreapp'" Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotnetRemoteExecutorVersion)" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
</ItemGroup>
<ItemGroup>
<ContentWithTargetPath Condition="'$(TargetGroup)'=='netfx' AND $(ReferenceType)=='Project'" Include="$(BinFolder)$(Configuration).AnyCPU\Microsoft.Data.SqlClient\netfx\$(TargetFramework)\*SNI*.dll">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="$(MicrosoftSqlServerSqlManagementObjectsVersion)" />
<!--
Explicitly reference the latest published MDS 5.1.x version here to avoid
Comment thread
paulmedynski marked this conversation as resolved.
an older version (5.1.5) being included transitively by
SqlManagementObjects. The older version brings in a vulnerable version of
System.Formats.Asn1
-->
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.8" />
Comment thread
paulmedynski marked this conversation as resolved.

<ProjectReference Include="../Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="$(AzureSecurityKeyVaultKeysVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
</ItemGroup>
</Project>
24 changes: 9 additions & 15 deletions tools/props/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,16 @@
<!-- NetFx project dependencies -->
<PropertyGroup>
<MicrosoftDataSqlClientSniVersion>6.0.2</MicrosoftDataSqlClientSniVersion>
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
<SystemTextJsonVersion>8.0.6</SystemTextJsonVersion>
</PropertyGroup>
<!-- NetFx and NetCore project dependencies -->
<PropertyGroup>
<AzureIdentityVersion>1.14.2</AzureIdentityVersion>
<MicrosoftBclCryptographyVersion>8.0.0</MicrosoftBclCryptographyVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftIdentityModelJsonWebTokensVersion>7.5.0</MicrosoftIdentityModelJsonWebTokensVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>7.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<MicrosoftIdentityModelJsonWebTokensVersion>7.7.1</MicrosoftIdentityModelJsonWebTokensVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>7.7.1</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.1</SystemSecurityCryptographyPkcsVersion>
Comment thread
mdaigle marked this conversation as resolved.
</PropertyGroup>
Expand All @@ -47,31 +45,27 @@
</PropertyGroup>
<!-- AKV Provider project dependencies -->
<PropertyGroup>
<AzureCoreVersion>[1.47.1,2.0.0)</AzureCoreVersion>
<AzureSecurityKeyVaultKeysVersion>[4.7.0,5.0.0)</AzureSecurityKeyVaultKeysVersion>
<AzureCoreVersion>1.47.1</AzureCoreVersion>
<AzureSecurityKeyVaultKeysVersion>4.7.0</AzureSecurityKeyVaultKeysVersion>
</PropertyGroup>
<!-- Test Project Dependencies -->
<PropertyGroup>
<BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
<MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25164.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25164.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsHosting>8.0.1</MicrosoftExtensionsHosting>
<MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.12.0</MicrosoftNETTestSdkVersion>
Comment thread
paulmedynski marked this conversation as resolved.
<MicrosoftSqlServerSqlManagementObjectsVersion>172.52.0</MicrosoftSqlServerSqlManagementObjectsVersion>
<MicrosoftSqlServerTypesVersion>10.50.1600.1</MicrosoftSqlServerTypesVersion>
<MicrosoftSqlServerTypesVersionNet>160.1000.6</MicrosoftSqlServerTypesVersionNet>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion>13.0.4</NewtonsoftJsonVersion>
<SystemDataOdbcVersion>8.0.1</SystemDataOdbcVersion>
<SystemFormatsAsn1Version>6.0.1</SystemFormatsAsn1Version>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemServiceProcessServiceControllerVersion>8.0.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingCodePagesVersion>6.0.0</SystemTextEncodingCodePagesVersion>
<XunitVersion>2.9.2</XunitVersion>
<XunitVersion>2.9.3</XunitVersion>
<XunitrunnervisualstudioVersion>2.8.2</XunitrunnervisualstudioVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
3 changes: 1 addition & 2 deletions tools/props/VersionsNet9OrLater.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- NET 9 target framework dependencies -->
<PropertyGroup>
<MicrosoftBclCryptographyVersion>9.0.4</MicrosoftBclCryptographyVersion>
<MicrosoftExtensionsCachingMemoryVersion>9.0.4</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsCachingMemoryVersion>9.0.11</MicrosoftExtensionsCachingMemoryVersion>
<SystemSecurityCryptographyPkcsVersion>9.0.4</SystemSecurityCryptographyPkcsVersion>
<SystemConfigurationConfigurationManagerVersion>9.0.4</SystemConfigurationConfigurationManagerVersion>
</PropertyGroup>
Expand Down
22 changes: 9 additions & 13 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,34 +30,30 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependencies>
<group targetFramework="net462">
<dependency id="Azure.Identity" version="1.14.2" />
Comment thread
paulmedynski marked this conversation as resolved.
Outdated
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
<dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
<dependency id="System.Buffers" version="4.5.1" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
<dependency id="System.Buffers" version="4.6.1" />
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1"/>
Comment thread
paulmedynski marked this conversation as resolved.
<dependency id="System.Text.Encodings.Web" version="8.0.0" />
<dependency id="System.Text.Json" version="8.0.5" />
<dependency id="System.Text.Json" version="8.0.6" />
Comment thread
paulmedynski marked this conversation as resolved.
</group>
<group targetFramework="net8.0">
<dependency id="Azure.Identity" version="1.14.2" />
<dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
<dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1"/>
</group>
<group targetFramework="net9.0">
<dependency id="Azure.Identity" version="1.14.2" />
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.11" exclude="Compile" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" exclude="Compile" />
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
<dependencies>
<group targetFramework="net462">
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
<dependency id="Azure.Core" version="1.47.1" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
</group>
<group targetFramework="net8.0">
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
<dependency id="Azure.Core" version="1.47.1" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
</group>
<group targetFramework="net9.0">
<dependency id="Microsoft.Data.SqlClient" version="[6.0.1,6.1.0)" />
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" />
<dependency id="Azure.Core" version="1.47.1" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.11" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
Loading