Skip to content
Open
Show file tree
Hide file tree
Changes from all 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 @@ -32,7 +32,6 @@
<ItemGroup>
<PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
<PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
<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 @@ -42,15 +42,11 @@
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
<Compile Include="Microsoft.Data.SqlClient.NetStandard.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSniRuntimeVersion)" />
<!-- Enable the project reference for debugging purposes. -->
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -963,12 +963,10 @@
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSniRuntimeVersion)" />
<!-- Enable the project reference for debugging purposes. -->
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
<PackageReference Condition="$(TargetGroup) == 'netcoreapp' " Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
<!--
Azure.Core is explicitly referenced to avoid a transitive dependency on
a vulnerable version via Azure.Identity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,5 @@
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -723,8 +723,6 @@
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

<!-- For compilation targeting .NET Framework using .NET SDKs. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<Reference Condition="'$(TargetGroup)'=='netfx'" Include="System.Transactions" />
<PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
</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 @@ -329,7 +329,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(AddOnsPath)AzureKeyVaultProvider\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
Expand All @@ -338,7 +337,6 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
<PackageReference Condition="'$(TargetGroup)'=='netfx'" Include="Microsoft.SqlServer.Types" Version="$(MicrosoftSqlServerTypesVersion)" />
<PackageReference Condition="'$(TargetGroup)'!='netfx'" Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
<PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
</ItemGroup>

<!-- Ensure SNI DLLs are made available for .NET Framework project reference builds. -->
Expand Down
58 changes: 31 additions & 27 deletions tools/props/Versions.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!-- MDS NuGet Package Version Information -->
<PropertyGroup>
<MdsVersionDefault>5.1.8</MdsVersionDefault>
<BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
Expand All @@ -12,6 +14,8 @@
<NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">$(MdsVersionDefault)-dev</NugetPackageVersion>
<Version>$(NugetPackageVersion)</Version>
</PropertyGroup>

<!-- MSS NuGet Package Version Information -->
<PropertyGroup>
<!-- This version section corresponds to version info of Microsoft.SqlServer.Server Assembly. -->
<!-- Should only be changed in future when a non-backwards compatible driver is released. -->
Expand All @@ -21,68 +25,68 @@
<SqlServerPackageVersion Condition="'$(SqlServerPackageVersion)' == ''">1.0.0-dev</SqlServerPackageVersion>
<SqlServerLibVersion>$(SqlServerPackageVersion)</SqlServerLibVersion>
</PropertyGroup>
<!-- NetFx project dependencies -->

<!-- AKV NuGet Package Version Information -->
<PropertyGroup>
<MicrosoftDataSqlClientSniVersion>5.1.2</MicrosoftDataSqlClientSniVersion>
<TestAKVProviderVersion>$(NugetPackageVersion)</TestAKVProviderVersion>
<TestMicrosoftDataSqlClientVersion>$(NugetPackageVersion)</TestMicrosoftDataSqlClientVersion>
</PropertyGroup>
<!-- NetFx and NetCore project dependencies -->

<!-- Common Dependencies - Shared by multiple driver or test projects-->
<PropertyGroup>
<AzureCoreVersion>1.41.0</AzureCoreVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved from line 58 unchanged.

<AzureIdentityVersion>1.12.1</AzureIdentityVersion>
<MicrosoftIdentityClientVersion>4.76.0</MicrosoftIdentityClientVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.35.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<MicrosoftIdentityModelJsonWebTokensVersion>6.35.0</MicrosoftIdentityModelJsonWebTokensVersion>
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
<SystemTextEncodingsWebVersion>6.0.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.11</SystemTextJsonVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>6.35.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved from line 32 unchanged.

<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated from 4.5.1 -> 4.6.1

</PropertyGroup>
<!-- NetCore project dependencies -->

<!-- MDS NetFx project dependencies -->
<PropertyGroup>
<MicrosoftDataSqlClientSniVersion>5.1.2</MicrosoftDataSqlClientSniVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved from line 26 unchanged.

</PropertyGroup>

<!-- MDS NetCore and NetStandard shared project dependencies -->
<PropertyGroup>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftDataSqlClientSniRuntimeVersion>5.1.2</MicrosoftDataSqlClientSniRuntimeVersion>
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsPerformanceCounterVersion>6.0.1</SystemDiagnosticsPerformanceCounterVersion>
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved from line 42 unchanged.

<SystemRuntimeCachingVersion>6.0.0</SystemRuntimeCachingVersion>
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityPermissionsVersion>6.0.0</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingCodePagesVersion>6.0.0</SystemTextEncodingCodePagesVersion>
</PropertyGroup>
<!-- NetStandard project dependencies -->

<!-- MDS NetStandard project dependencies -->
<PropertyGroup>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved from line 40 unchanged.

<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved from line 47 unchanged.

</PropertyGroup>

<!-- AKV Provider project dependencies -->
<PropertyGroup>
<AzureCoreVersion>1.41.0</AzureCoreVersion>
<AzureSecurityKeyVaultKeysVersion>4.6.0</AzureSecurityKeyVaultKeysVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.3</MicrosoftExtensionsCachingMemoryVersion>
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
</PropertyGroup>
<!-- Test Project Dependencies -->

<!-- Test project dependencies -->
<PropertyGroup>
<MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
<MicrosoftNETTestSdkVersion>17.12.0</MicrosoftNETTestSdkVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemDataOdbcVersion>6.0.1</SystemDataOdbcVersion>
<NewtonsoftJsonVersion>13.0.4</NewtonsoftJsonVersion>
<SystemDataOdbcVersion>6.0.2</SystemDataOdbcVersion>
<SystemFormatsAsn1Version>6.0.1</SystemFormatsAsn1Version>
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
<XunitVersion>2.9.3</XunitVersion>
<xunitrunnervisualstudioVersion>2.8.2</xunitrunnervisualstudioVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25555.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXunitExtensionsVersion>11.0.0-beta.25476.3</MicrosoftDotNetXunitExtensionsVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>2.0.8</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftSqlServerSqlManagementObjectsVersion>172.52.0</MicrosoftSqlServerSqlManagementObjectsVersion>
<MicrosoftSqlServerTypesVersion>10.50.1600.1</MicrosoftSqlServerTypesVersion>
<BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
<MicrosoftExtensionsHostingVersion>6.0.1</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHostingVersion>8.0.1</MicrosoftExtensionsHostingVersion>
<MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNetFrameworkReferenceAssembliesVersion>
</PropertyGroup>
<PropertyGroup>
<TestAKVProviderVersion>$(NugetPackageVersion)</TestAKVProviderVersion>
<TestMicrosoftDataSqlClientVersion>$(NugetPackageVersion)</TestMicrosoftDataSqlClientVersion>
</PropertyGroup>
</Project>
10 changes: 2 additions & 8 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="Microsoft.Identity.Client" version="4.76.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
<dependency id="System.Buffers" version="4.5.1" />
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
<dependency id="System.Text.Json" version="6.0.11" />
<dependency id="System.Buffers" version="4.6.1" />
</group>
<group targetFramework="net6.0">
<!--
Expand All @@ -55,12 +53,10 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.1" exclude="Compile" />
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
<dependency id="System.Security.Permissions" version="6.0.0" />
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
</group>
<group targetFramework="netstandard2.0">
<!--
Expand All @@ -75,15 +71,14 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
<dependency id="Microsoft.SqlServer.Server" version="1.0.0"/>
<dependency id="Microsoft.Win32.Registry" version="5.0.0" />
<dependency id="System.Buffers" version="4.5.1" />
<dependency id="System.Buffers" version="4.6.1" />
<dependency id="System.Configuration.ConfigurationManager" version="6.0.1" exclude="Compile" />
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
<dependency id="System.Runtime.Loader" version="4.3.0" />
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" />
<dependency id="System.Security.Permissions" version="6.0.0" />
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
</group>
<group targetFramework="netstandard2.1">
<!--
Expand All @@ -105,7 +100,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Security.Permissions" version="6.0.0" />
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
<dependency id="System.Text.Encoding.CodePages" version="6.0.0" exclude="Compile" />
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,18 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
<group targetFramework="net462">
<dependency id="Microsoft.Data.SqlClient" version="[5.1.3,5.2.0)" />
<dependency id="Azure.Core" version="1.41.0" />
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.6.0" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.3" />
</group>
<group targetFramework="net6.0">
<dependency id="Microsoft.Data.SqlClient" version="[5.1.3,5.2.0)" />
<dependency id="Azure.Core" version="1.41.0" />
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.6.0" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.3" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Microsoft.Data.SqlClient" version="[5.1.3,5.2.0)" />
<dependency id="Azure.Core" version="1.41.0" />
<dependency id="System.Text.Encodings.Web" version="6.0.1" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.6.0" />
<dependency id="Microsoft.Extensions.Caching.Memory" version="6.0.3" />
</group>
Expand Down
Loading