Skip to content

Commit fd16c6d

Browse files
paulmedynskipaulmedynski
authored
[7.0] Fix package dependency versions (#3614)
1 parent 3b53eac commit fd16c6d

8 files changed

+140
-105
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,23 +158,13 @@ dotnet_code_quality.CA2100.excluded_type_names_with_derived_types = Microsoft.Da
158158
dotnet_diagnostic.xUnit1031.severity=none
159159
dotnet_diagnostic.xUnit1030.severity=none
160160

161-
[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
162-
indent_size = 2
163-
164-
# Xml build files
165-
[*.builds]
166-
indent_size = 2
167-
168161
# Xml files
169-
[*.{xml,stylecop,resx,ruleset}]
170-
indent_size = 2
171-
172-
# Xml config files
173-
[*.{props,targets,config,nuspec}]
162+
[*.{xml,csproj,stylecop,resx,ruleset,props,targets,config,nuspec}]
174163
indent_size = 2
175164

176165
# Shell scripts
177166
[*.sh]
178167
end_of_line = lf
168+
179169
[*.{cmd, bat}]
180170
end_of_line = crlf

‎eng/pipelines/common/templates/steps/publish-symbols-step.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ parameters:
1212

1313
- name: publishSymbols
1414
type: string
15-
default: '$(PublishSymbols)'
1615

1716
- name: symbolsVersion
1817
type: string

‎eng/pipelines/dotnet-sqlclient-signing-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
3838
- name: 'debug'
3939
displayName: 'Enable debug output'
4040
type: boolean
41-
default: true
41+
default: false
4242

4343
- name: publishSymbols
4444
displayName: 'Publish symbols'

‎eng/pipelines/steps/compound-nuget-pack-step.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,3 @@ steps:
5656
-Version ${{ parameters.packageVersion }}
5757
-OutputDirectory ${{ parameters.outputDirectory }}
5858
-Properties "COMMITID=$(Build.SourceVersion);Configuration=${{ parameters.buildConfiguration }};ReferenceType=${{ parameters.referenceType }}"
59-

‎src/Directory.Packages.props‎

Lines changed: 109 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,112 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
</PropertyGroup>
6-
<!-- NetFx project dependencies -->
7-
<ItemGroup>
8-
<PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="6.0.2" />
9-
<PackageVersion Include="System.Buffers" Version="4.5.1" />
10-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
11-
<PackageVersion Include="System.Memory" Version="4.5.5" />
12-
<PackageVersion Include="System.Data.Common" Version="4.3.0" />
13-
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
14-
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
15-
</ItemGroup>
16-
<!-- NetFx and NetCore project dependencies -->
17-
<ItemGroup>
18-
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
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-
</ItemGroup>
23-
<!-- NetCore project dependencies -->
24-
<ItemGroup>
25-
<PackageVersion Include="Microsoft.Data.SqlClient.SNI.runtime" Version="6.0.2" />
26-
<PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
27-
</ItemGroup>
28-
<!-- AKV Provider project dependencies -->
29-
<ItemGroup>
30-
<PackageVersion Include="Azure.Core" Version="[1.47.1,2.0.0)" />
31-
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="[4.7.0,5.0.0)" />
32-
</ItemGroup>
33-
<!-- Test Project Dependencies -->
34-
<ItemGroup>
35-
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
36-
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
37-
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25164.6" />
38-
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25164.6" />
39-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
40-
<PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="172.76.0" />
41-
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
42-
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
43-
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
44-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
45-
<PackageVersion Include="System.Data.Odbc" Version="8.0.1" />
46-
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
47-
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
48-
<PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
49-
<PackageVersion Include="xunit" Version="2.9.2" />
50-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
51-
<PackageVersion Include="xunit.runner.console" Version="2.9.2" />
52-
</ItemGroup>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
7+
<!-- ===================================================================== -->
8+
<!-- Shared Dependencies -->
9+
10+
<!-- Published -->
11+
<ItemGroup>
12+
<!-- MDS and AKV -->
13+
<PackageVersion Include="Azure.Core" Version="1.47.1" />
14+
</ItemGroup>
15+
16+
<!-- Published - Target Framework Specific Dependencies -->
17+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
18+
<!-- MDS and AKV -->
19+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
20+
</ItemGroup>
21+
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
22+
<!-- MDS and AKV -->
23+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
24+
</ItemGroup>
25+
26+
<!-- Internal -->
27+
<ItemGroup>
28+
<!-- MDS and AKV Tests -->
29+
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
30+
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
31+
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25164.6" />
32+
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25164.6" />
33+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
34+
<PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="172.76.0" />
35+
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
36+
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
37+
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
38+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
39+
<PackageVersion Include="System.Data.Odbc" Version="8.0.1" />
40+
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
41+
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
42+
<PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
43+
<PackageVersion Include="xunit" Version="2.9.2" />
44+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
45+
<PackageVersion Include="xunit.runner.console" Version="2.9.2" />
46+
</ItemGroup>
47+
48+
<!-- Internal - Target Framework Specific Dependencies -->
49+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
50+
<!-- MDS and AKV Tests -->
51+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
52+
</ItemGroup>
53+
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
54+
<!-- MDS and AKV Tests -->
55+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
56+
</ItemGroup>
57+
58+
<!-- ===================================================================== -->
59+
<!-- MDS Dependencies -->
60+
61+
<!-- Common Dependencies (.NET and .NET Framework) -->
62+
<ItemGroup>
63+
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
64+
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.7.1" />
65+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.7.1" />
66+
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
67+
</ItemGroup>
68+
69+
<!-- Common Target Framework Specific Dependencies -->
70+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
71+
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.5" />
72+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
73+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.5" />
74+
<PackageVersion Include="System.Text.Json" Version="9.0.5" />
75+
</ItemGroup>
76+
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
77+
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
78+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
79+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
80+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
81+
</ItemGroup>
82+
83+
<!-- .NET Dependencies -->
84+
<ItemGroup>
85+
<PackageVersion Include="Microsoft.Data.SqlClient.SNI.runtime" Version="6.0.2" />
86+
<PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
87+
</ItemGroup>
88+
89+
<!-- .NET Framework Dependencies -->
90+
<ItemGroup>
91+
<PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="6.0.2" />
92+
<PackageVersion Include="System.Buffers" Version="4.5.1" />
93+
<PackageVersion Include="System.Data.Common" Version="4.3.0" />
94+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
95+
<PackageVersion Include="System.Memory" Version="4.5.5" />
96+
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
97+
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
98+
</ItemGroup>
99+
100+
<!-- =================================================================== -->
101+
<!-- AKV Dependencies -->
102+
103+
<ItemGroup>
104+
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.7.0" />
105+
</ItemGroup>
106+
107+
<!-- =================================================================== -->
108+
<!-- MSS Dependencies -->
109+
110+
<!-- None -->
53111

54-
<!-- Target framework specific dependencies -->
55-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
56-
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.5" />
57-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
58-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
59-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
60-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.5" />
61-
<PackageVersion Include="System.Text.Json" Version="9.0.5" />
62-
</ItemGroup>
63-
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
64-
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
65-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
66-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
67-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
68-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
69-
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
70-
</ItemGroup>
71112
</Project>

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<dependency id="System.Buffers" version="4.5.1" />
4040
<dependency id="System.Data.Common" version="4.3.0" />
4141
<dependency id="System.Diagnostics.DiagnosticSource" version="8.0.1" />
42+
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
4243
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
4344
<dependency id="System.Text.Encodings.Web" version="8.0.0" />
4445
<dependency id="System.Text.Json" version="8.0.5" />
@@ -53,33 +54,36 @@
5354
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
5455
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
5556
<dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
57+
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
5658
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
5759
<dependency id="System.Text.Json" version="8.0.5" />
5860
</group>
5961
<group targetFramework="net9.0">
6062
<dependency id="Azure.Core" version="1.47.1" />
6163
<dependency id="Azure.Identity" version="1.14.2" />
62-
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
64+
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.5" />
6365
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
64-
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
66+
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.5" exclude="Compile" />
6567
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
6668
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
6769
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
68-
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" exclude="Compile" />
69-
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.4" />
70+
<dependency id="System.Configuration.ConfigurationManager" version="9.0.5" exclude="Compile" />
71+
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
72+
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.5" />
7073
<dependency id="System.Text.Json" version="9.0.5" />
7174
</group>
7275
<group targetFramework="netstandard2.0">
7376
<dependency id="Azure.Core" version="1.47.1" />
7477
<dependency id="Azure.Identity" version="1.14.2" />
75-
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.4" />
78+
<dependency id="Microsoft.Bcl.Cryptography" version="9.0.5" />
7679
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
77-
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" exclude="Compile" />
80+
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.5" exclude="Compile" />
7881
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" />
7982
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" />
8083
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
81-
<dependency id="System.Configuration.ConfigurationManager" version="9.0.4" exclude="Compile" />
82-
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.4" />
84+
<dependency id="System.Configuration.ConfigurationManager" version="9.0.5" exclude="Compile" />
85+
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
86+
<dependency id="System.Security.Cryptography.Pkcs" version="9.0.5" />
8387
<dependency id="System.Text.Json" version="9.0.5" />
8488
</group>
8589
</dependencies>

‎tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,17 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
2525
<tags>sqlclient microsoft.data.sqlclient azurekeyvaultprovider akvprovider alwaysencrypted</tags>
2626
<dependencies>
2727
<group targetFramework="net462">
28-
<dependency id="Microsoft.Data.SqlClient" version="[6.1.1,7.0.0)" />
29-
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
30-
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
28+
<dependency id="Microsoft.Data.SqlClient" version="(6.2,7.1)" />
29+
<dependency id="Azure.Core" version="1.47.1" />
30+
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
3131
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3232
</group>
3333
<group targetFramework="net8.0">
34-
<dependency id="Microsoft.Data.SqlClient" version="[6.1.1,7.0.0)" />
35-
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
36-
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
34+
<dependency id="Microsoft.Data.SqlClient" version="(6.2,7.1)" />
35+
<dependency id="Azure.Core" version="1.47.1" />
36+
<dependency id="Azure.Security.KeyVault.Keys" version="4.7.0" />
3737
<dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" />
3838
</group>
39-
<group targetFramework="net9.0">
40-
<dependency id="Microsoft.Data.SqlClient" version="[6.1.1,7.0.0)" />
41-
<dependency id="Azure.Core" version="[1.47.1,2.0.0)" />
42-
<dependency id="Azure.Security.KeyVault.Keys" version="[4.7.0,5.0.0)" />
43-
<dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.4" />
44-
</group>
4539
</dependencies>
4640
<frameworkAssemblies>
4741
<frameworkAssembly assemblyName="mscorlib" targetFramework="net462" />
@@ -68,5 +62,13 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
6862
<file src="..\..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
6963

7064
<file src="..\..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\AzureKeyVaultProvider\net8.0\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="lib\net8.0\" exclude="" />
71-
</files>
65+
66+
<!--
67+
GOTCHA: Even though we target .NET 9.0 and build DLLs for it, we do not
68+
publish them! AKV doesn't actually use any .NET 9.0 specific features,
69+
so we don't need to publish DLLs. Apps targeting .NET 9.0 will happily
70+
use the AKV .NET 8.0 DLLs.
71+
-->
72+
73+
</files>
7274
</package>

‎tools/targets/add-ons/GenerateAKVProviderNugetPackage.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<Message Text="Setting NugetPackageVersion to $(NugetPackageVersion)" />
88
<Exec Command="powershell.exe -NonInteractive -executionpolicy Unrestricted ^
99
-command &quot;&amp;$(ToolsDir)scripts\downloadLatestNuget.ps1 -nugetDestPath '$(NuGetRoot)'&quot;" />
10-
<Exec Command="$(NuGetCmd) pack $(ToolsDir)specs\add-ons\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec -Version $(NugetPackageVersion) -Symbols -SymbolPackageFormat snupkg -OutputDirectory $(PackagesDir) -properties Configuration=$(Configuration);" />
10+
<Exec Command="$(NuGetCmd) pack $(ToolsDir)specs\add-ons\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec -Version $(NugetPackageVersion) -Symbols -SymbolPackageFormat snupkg -OutputDirectory $(PackagesDir) -properties Configuration=$(Configuration);ReferenceType=$(ReferenceType)" />
1111
</Target>
1212
</Project>

0 commit comments

Comments
 (0)