Skip to content

Commit dec7e69

Browse files
committed
- Added back a few packages specifically for .NET Framework and Standard 2.0.
- Removed some unused packages. - Removed .NET 10 targets from CI pipeline runs.
1 parent 0575bf2 commit dec7e69

File tree

9 files changed

+28
-20
lines changed

9 files changed

+28
-20
lines changed

Directory.Packages.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<PackageVersion Include="Azure.Identity" Version="1.16.0" />
6262
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
6363
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.14.0" />
64-
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
6564
</ItemGroup>
6665
<!-- Common Target Framework Specific Dependencies -->
6766
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
@@ -83,10 +82,9 @@
8382
<ItemGroup>
8483
<PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="6.0.2" />
8584
<PackageVersion Include="System.Buffers" Version="4.6.1" />
86-
<PackageVersion Include="System.Data.Common" Version="4.3.0" />
8785
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
8886
<PackageVersion Include="System.Memory" Version="4.6.3" />
89-
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
87+
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
9088
<PackageVersion Include="System.Text.Json" Version="8.0.6" />
9189
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
9290
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />

eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,27 @@ parameters:
128128
#
129129
# These are _not_ the target frameworks to build the driver packages for.
130130
#
131+
# Note: We are excluding .NET 10.0 here to avoid consuming too many resources
132+
# during PR pipeline runs, and until we update our 1ES images to include
133+
# Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10.
134+
#
131135
- name: targetFrameworks
132136
displayName: Target Frameworks on Windows
133137
type: object
134-
default: [net462, net8.0, net9.0, net10.0]
138+
default: [net462, net8.0, net9.0]
135139

136140
# The target frameworks to build and run tests for on Unix.
137141
#
138142
# These are _not_ the target frameworks to build the driver packages for.
139143
#
144+
# Note: We are excluding .NET 10.0 here to avoid consuming too many resources
145+
# during PR pipeline runs, and until we update our 1ES images to include
146+
# Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10.
147+
#
140148
- name: targetFrameworksUnix
141149
displayName: Target Frameworks on Unix
142150
type: object
143-
default: [net8.0, net9.0, net10.0]
151+
default: [net8.0, net9.0]
144152

145153
- name: testSets
146154
displayName: Test Sets

eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,27 @@ parameters:
128128
#
129129
# These are _not_ the target frameworks to build the driver packages for.
130130
#
131+
# Note: We are excluding .NET 10.0 here to avoid consuming too many resources
132+
# during PR pipeline runs, and until we update our 1ES images to include
133+
# Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10.
134+
#
131135
- name: targetFrameworks
132136
displayName: Target Frameworks on Windows
133137
type: object
134-
default: [net462, net8.0, net9.0, net10.0]
138+
default: [net462, net8.0, net9.0]
135139

136140
# The target frameworks to build and run tests for on Unix.
137141
#
138142
# These are _not_ the target frameworks to build the driver packages for.
139143
#
144+
# Note: We are excluding .NET 10.0 here to avoid consuming too many resources
145+
# during PR pipeline runs, and until we update our 1ES images to include
146+
# Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10.
147+
#
140148
- name: targetFrameworksUnix
141149
displayName: Target Frameworks on Unix
142150
type: object
143-
default: [net8.0, net9.0, net10.0]
151+
default: [net8.0, net9.0]
144152

145153
- name: testSets
146154
displayName: Test Sets

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
<PackageReference Include="Microsoft.SqlServer.Server" />
4343
<PackageReference Include="System.Configuration.ConfigurationManager" />
4444
<PackageReference Include="System.Security.Cryptography.Pkcs" />
45-
4645
</ItemGroup>
4746

48-
<!-- netstandard dependencies -->
49-
<ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp'">
47+
<!-- .NET Standard 2.0 dependencies -->
48+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
49+
<PackageReference Include="System.Text.Json" />
5050
<PackageReference Include="System.Threading.Channels" />
5151
</ItemGroup>
5252

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@
4343
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
4444
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
4545
<PackageReference Include="System.Buffers" />
46-
<PackageReference Include="System.Data.Common" />
4746
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
47+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
4848
<PackageReference Include="System.Security.Cryptography.Pkcs" />
49-
<PackageReference Include="System.Text.Encodings.Web" />
5049
<PackageReference Include="System.Text.Json" />
5150
<PackageReference Include="System.Threading.Channels" />
5251
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,8 +1061,8 @@
10611061
<PackageReference Include="System.Buffers" />
10621062
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
10631063
<PackageReference Include="System.Memory" />
1064+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
10641065
<PackageReference Include="System.Security.Cryptography.Pkcs" />
1065-
<PackageReference Include="System.Text.Encodings.Web" />
10661066
<PackageReference Include="System.Text.Json" />
10671067
<PackageReference Include="System.ValueTuple" />
10681068
<PackageReference Include="System.Threading.Channels" />

src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<!-- References that only apply to net462 -->
2222
<Reference Include="System.Configuration" />
2323
<Reference Include="System.Transactions" />
24-
<PackageReference Include="System.Data.Common" />
2524
<PackageReference Include="System.ValueTuple" />
2625
<PackageReference Include="System.Threading.Channels" />
2726
</ItemGroup>

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
9-
10-
<!--
11-
Transitive dependencies with vulnerabilities, so we explicitly ask for
12-
non-vulnerable versions.
13-
-->
149
</ItemGroup>
1510
<ItemGroup>
1611
<ProjectReference Include="../Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />

tools/specs/Microsoft.Data.SqlClient.nuspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<dependency id="System.Buffers" version="4.6.1" />
4040
<dependency id="System.Diagnostics.DiagnosticSource" version="8.0.1" />
4141
<dependency id="System.Memory" version="4.6.3" />
42+
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
4243
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
43-
<dependency id="System.Text.Encodings.Web" version="8.0.0" />
4444
<dependency id="System.Text.Json" version="8.0.6" />
4545
<dependency id="System.Threading.Channels" version="8.0.0" />
4646
<dependency id="System.ValueTuple" version="4.6.1" />
@@ -80,6 +80,7 @@
8080
<dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
8181
<dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
8282
<dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
83+
<dependency id="System.Text.Json" version="8.0.6" />
8384
<dependency id="System.Threading.Channels" version="8.0.0" />
8485
</group>
8586
</dependencies>

0 commit comments

Comments
 (0)