Skip to content

Commit 402553f

Browse files
cheenamalhotracheenamalhotra
committed
Switch to Central Package Management
1 parent 2772a8c commit 402553f

19 files changed

+217
-210
lines changed

‎src/Directory.Packages.props

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<!-- NetFx project dependencies -->
6+
<ItemGroup>
7+
<PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="6.0.2" />
8+
<PackageVersion Include="System.Buffers" Version="4.5.1" />
9+
<PackageVersion Include="System.Memory" Version="4.5.5" />
10+
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
11+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
12+
<PackageVersion Include="System.Data.Common" Version="4.3.0" />
13+
</ItemGroup>
14+
<!-- NetFx and NetCore project dependencies -->
15+
<ItemGroup>
16+
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
17+
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
19+
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.7.1" />
20+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.7.1" />
21+
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
22+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
23+
</ItemGroup>
24+
<!-- NetCore project dependencies -->
25+
<ItemGroup>
26+
<PackageVersion Include="Microsoft.Data.SqlClient.SNI.runtime" Version="6.0.2" />
27+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
28+
<PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
29+
</ItemGroup>
30+
<!-- AKV Provider project dependencies -->
31+
<ItemGroup>
32+
<PackageVersion Include="Azure.Core" Version="[1.44.1,2.0.0)" />
33+
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="[4.7.0,5.0.0)" />
34+
</ItemGroup>
35+
<!-- Test Project Dependencies -->
36+
<ItemGroup>
37+
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
38+
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
39+
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25164.6" />
40+
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25164.6" />
41+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
42+
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
43+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
44+
<PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="172.52.0" />
45+
<PackageVersion Include="Microsoft.SqlServer.Types" Version="10.50.1600.1" />
46+
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
47+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
48+
<PackageVersion Include="System.Data.Odbc" Version="8.0.1" />
49+
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
50+
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
51+
<PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
52+
<PackageVersion Include="xunit" Version="2.9.2" />
53+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
54+
</ItemGroup>
55+
</Project>

‎src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1717
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1818
</PropertyGroup>
19-
<!--Generating Strong Name-->
19+
<!--Generating Strong Name-->
2020
<PropertyGroup Condition="'$(CDP_BUILD_TYPE)'=='Official'">
2121
<SignAssembly>true</SignAssembly>
2222
<KeyFile>$(SigningKeyPath)</KeyFile>
@@ -30,16 +30,16 @@
3030
<ItemGroup>
3131
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
3232
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
33-
</ItemGroup>
33+
</ItemGroup>
3434
<ItemGroup>
3535
<ProjectReference Condition="'$(TargetGroup)'=='netcoreapp' AND !$(ReferenceType.Contains('Package'))" Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" />
3636
<ProjectReference Condition="'$(TargetGroup)'=='netfx' AND !$(ReferenceType.Contains('Package'))" Include="$(NetFxSource)src\Microsoft.Data.SqlClient.csproj" />
3737
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Data.SqlClient" Version="$(TestMicrosoftDataSqlClientVersion)" />
3838
</ItemGroup>
3939
<ItemGroup>
40-
<PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
41-
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
42-
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="$(AzureSecurityKeyVaultKeysVersion)" />
43-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
40+
<PackageReference Include="Azure.Core" />
41+
<PackageReference Include="System.Text.Encodings.Web" />
42+
<PackageReference Include="Azure.Security.KeyVault.Keys" />
43+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
4444
</ItemGroup>
45-
</Project>
45+
</Project>

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,31 @@
1010
<TargetGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">netcoreapp</TargetGroup>
1111
<Platforms>AnyCPU;x64;x86</Platforms>
1212
</PropertyGroup>
13-
<!--Generating Strong Name-->
14-
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
13+
<!--Generating Strong Name-->
14+
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
1515
<SignAssembly>true</SignAssembly>
1616
<KeyFile>$(SigningKeyPath)</KeyFile>
1717
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
1818
</PropertyGroup>
1919
<PropertyGroup Condition="$(CDP_BUILD_TYPE)!=Official">
2020
<AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
2121
</PropertyGroup>
22-
2322
<ItemGroup>
2423
<Compile Include="Microsoft.Data.SqlClient.cs" />
2524
<Compile Include="Microsoft.Data.SqlClient.Manual.cs" />
2625
<Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.cs" />
2726
<Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.NetCoreApp.cs" />
2827
</ItemGroup>
2928
<ItemGroup>
30-
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
31-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
32-
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
33-
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
34-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
35-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
36-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
37-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
38-
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
29+
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
30+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
31+
<PackageReference Include="Microsoft.SqlServer.Server" />
32+
<PackageReference Include="Azure.Identity" />
33+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
34+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
35+
<PackageReference Include="System.Configuration.ConfigurationManager" />
36+
<PackageReference Include="System.Security.Cryptography.Pkcs" />
37+
<PackageReference Include="Microsoft.Bcl.Cryptography" />
3938
</ItemGroup>
40-
4139
<Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />
4240
</Project>

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

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1818
<Product>Core $(BaseProduct)</Product>
1919
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
20-
<NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
20+
<NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
2121
<RootNamespace />
2222
</PropertyGroup>
2323
<!--Generating Strong Name-->
@@ -35,7 +35,7 @@
3535
<ItemGroup>
3636
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
3737
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
38-
</ItemGroup>
38+
</ItemGroup>
3939
<!-- Contains common items shared between Unix and Windows -->
4040
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
4141
<Compile Include="$(CommonSourceRoot)\Interop\Common\Sni\SniErrors.cs">
@@ -178,7 +178,7 @@
178178
</Compile>
179179
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
180180
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
181-
</Compile>
181+
</Compile>
182182
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ApplicationIntent.cs">
183183
<Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
184184
</Compile>
@@ -535,7 +535,7 @@
535535
</Compile>
536536
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDbColumn.cs">
537537
<Link>Microsoft\Data\SqlClient\SqlDbColumn.cs</Link>
538-
</Compile>
538+
</Compile>
539539
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs">
540540
<Link>Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs</Link>
541541
</Compile>
@@ -725,7 +725,6 @@
725725
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
726726
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
727727
</Compile>
728-
729728
<Compile Include="Common\System\NotImplemented.cs" />
730729
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
731730
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
@@ -760,7 +759,6 @@
760759
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />
761760
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
762761
</ItemGroup>
763-
764762
<!-- Windows only -->
765763
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
766764
<Compile Include="$(CommonSourceRoot)\Interop\Windows\Handles\SafeLibraryHandle.netcore.cs">
@@ -901,13 +899,11 @@
901899
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs">
902900
<Link>Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs</Link>
903901
</Compile>
904-
905902
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Windows.cs" />
906903
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Windows.cs" />
907904
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
908905
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" />
909906
</ItemGroup>
910-
911907
<!-- Unix only -->
912908
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
913909
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
@@ -928,7 +924,6 @@
928924
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs">
929925
<Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.Unix.cs</Link>
930926
</Compile>
931-
932927
<Compile Include="Microsoft\Data\Sql\SqlDataSourceEnumerator.Unix.cs" />
933928
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Unix.cs" />
934929
<Compile Include="Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.Unix.cs" />
@@ -937,7 +932,6 @@
937932
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
938933
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />
939934
</ItemGroup>
940-
941935
<!-- Resources -->
942936
<ItemGroup>
943937
<Compile Include="$(CommonSourceRoot)Resources\StringsHelper.cs">
@@ -964,20 +958,19 @@
964958
<LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
965959
</EmbeddedResource>
966960
</ItemGroup>
967-
968961
<!-- Package References Etc -->
969962
<ItemGroup>
970-
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
971-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
963+
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
964+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
972965
<!-- Enable the project reference for debugging purposes. -->
973966
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
974-
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
975-
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
976-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
977-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
978-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
979-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
980-
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
967+
<PackageReference Include="Microsoft.SqlServer.Server" />
968+
<PackageReference Include="Azure.Identity" />
969+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
970+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
971+
<PackageReference Include="System.Configuration.ConfigurationManager" />
972+
<PackageReference Include="System.Security.Cryptography.Pkcs" />
973+
<PackageReference Include="Microsoft.Bcl.Cryptography" />
981974
</ItemGroup>
982975
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
983976
<Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<PropertyGroup>
33
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
44
<TargetFramework>net462</TargetFramework>
5-
<IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
5+
<IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
66
<OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
77
<DocumentationFile>$(OutputPath)\Microsoft.Data.SqlClient.xml</DocumentationFile>
88
<Product>Framework $(BaseProduct)</Product>
9-
<Configurations>Debug;Release;</Configurations>
9+
<Configurations>Debug;Release</Configurations>
1010
</PropertyGroup>
11-
<!--Generating Strong Name-->
11+
<!--Generating
12+
Strong Name-->
1213
<PropertyGroup Condition="$(CDP_BUILD_TYPE)==Official">
1314
<SignAssembly>true</SignAssembly>
1415
<KeyFile>$(SigningKeyPath)</KeyFile>
@@ -32,22 +33,20 @@
3233
<Reference Include="System.Transactions" />
3334
</ItemGroup>
3435
<ItemGroup>
35-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
36-
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
36+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
37+
<PackageReference Include="System.Text.Encodings.Web" />
3738
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
38-
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
3939
<PrivateAssets>All</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>
42-
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
43-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
44-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
45-
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
46-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
47-
<PackageReference Include="System.Data.Common" Version="$(SystemDataCommonVersion)" />
48-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
49-
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="$(MicrosoftBclCryptographyVersion)" />
42+
<PackageReference Include="Azure.Identity" />
43+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
44+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
45+
<PackageReference Include="System.Buffers" />
46+
<PackageReference Include="System.Text.Json" />
47+
<PackageReference Include="System.Data.Common" />
48+
<PackageReference Include="System.Security.Cryptography.Pkcs" />
49+
<PackageReference Include="Microsoft.Bcl.Cryptography" />
5050
</ItemGroup>
51-
5251
<Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />
5352
</Project>

0 commit comments

Comments
 (0)