Skip to content

Commit fc0acc0

Browse files
mdaiglemdaigle
authored
Drop net6 support (#2927)
* Remove net6 from target frameworks. Drop net6 specific conditions. * Update pipeline, build, and nuspec files. * Drop net6 fromnuspec. * Clean up dll copy. Fix run test cmd file. * Specify netcore version to use for test utilities.
1 parent e6d1da1 commit fc0acc0

25 files changed

+56
-113
lines changed

‎RunPackageReferenceTests.cmd‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,14 @@ call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetCore -p:Refe
1919
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetSt -p:ReferenceType=Package
2020

2121
:: .NET - REFERENCE TYPE "PACKAGE"
22-
23-
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:TargetNetCoreVersion=net6.0
24-
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="AnyCPU" -p:TargetNetCoreVersion=net6.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net6.0-functional-anycpu.xml
25-
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="AnyCPU" -p:TargetNetCoreVersion=net6.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net6.0-manual-anycpu.xml
26-
2722
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:TargetNetCoreVersion=net8.0
2823
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="AnyCPU" -p:TargetNetCoreVersion=net8.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net8.0-functional-anycpu.xml
2924
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="AnyCPU" -p:TargetNetCoreVersion=net8.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net8.0-manual-anycpu.xml
3025

31-
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=x64 -p:TargetNetCoreVersion=net6.0
32-
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="x64" -p:TargetNetCoreVersion=net6.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net6.0-functional-x64.xml
33-
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="x64" -p:TargetNetCoreVersion=net6.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net6.0-manual-x64.xml
34-
3526
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=x64 -p:TargetNetCoreVersion=net8.0
3627
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="x64" -p:TargetNetCoreVersion=net8.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net8.0-functional-x64.xml
3728
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="x64" -p:TargetNetCoreVersion=net8.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net8.0-manual-x64.xml
3829

39-
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=Win32 -p:TargetNetCoreVersion=net6.0
40-
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="Win32" -p:TargetNetCoreVersion=net6.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net6.0-functional-win32.xml
41-
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="Win32" -p:TargetNetCoreVersion=net6.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net6.0-manual-win32.xml
42-
4330
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=Win32 -p:TargetNetCoreVersion=net8.0
4431
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="Win32" -p:TargetNetCoreVersion=net8.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net8.0-functional-win32.xml
4532
call :pauseOnError dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration="Release" -p:TestTargetOS="Windowsnetcoreapp" --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" -p:Platform="Win32" -p:TargetNetCoreVersion=net8.0 -p:ReferenceType=Package -l:trx;LogFileName=..\..\..\..\..\artifacts\Results\package-net8.0-manual-win32.xml

‎RunProjectReferenceTests.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
:: Default target frameworks
44
set netfxVersion=net462
5-
set netcoreVersion=net6.0
5+
set netcoreVersion=net8.0
66

77
:: Accept two parameters for .NET Framework and .NET versions.
88
:: Examples:

‎build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<IsEnabledWindows Condition="'$(TargetsUnix)' == 'true'">false</IsEnabledWindows>
2020
<TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsWindows)' == 'true'">Windows</TestOS>
2121
<TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsUnix)' == 'true'">Unix</TestOS>
22-
<TF Condition="$(TF) == ''">net6.0</TF> <!-- Default Target Framework -->
22+
<TF Condition="$(TF) == ''">net8.0</TF> <!-- Default Target Framework -->
2323
<TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETFramework'">netfx</TFGroup>
2424
<TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETCoreApp'">netcore</TFGroup>
2525
<TargetGroup Condition="'$(TFGroup)' == 'netfx'" >netfx</TargetGroup>

‎eng/pipelines/common/templates/jobs/ci-run-tests-job.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ parameters:
4040
- name: targetFramework
4141
type: string
4242

43+
- name: netcoreVersionTestUtils
44+
type: string
45+
4346
- name: enableX86Test
4447
type: boolean
4548
default: false
@@ -164,6 +167,7 @@ jobs:
164167
- template: ../steps/configure-sql-server-step.yml@self # configure SQL Server
165168
parameters:
166169
operatingSystem: ${{ parameters.operatingSystem }}
170+
netcoreVersionTestUtils: ${{ parameters.netcoreVersionTestUtils }}
167171
${{ if parameters.configProperties.instanceName }}:
168172
instanceName: ${{ parameters.configProperties.instanceName }}
169173
${{ if parameters.configProperties.user }}:
@@ -182,8 +186,6 @@ jobs:
182186
SQLAliasName: ${{ parameters.configProperties.SQLAliasName }}
183187
${{ if parameters.configProperties.SQLAliasPort }}:
184188
SQLAliasPort: ${{ parameters.configProperties.SQLAliasPort }}
185-
${{ if parameters.configProperties.targetNetCoreVersion }}:
186-
targetNetCoreVersion: ${{ parameters.configProperties.targetNetCoreVersion }}
187189
${{ if parameters.configProperties.databaseName }}:
188190
databaseName: ${{ parameters.configProperties.databaseName }}
189191
${{ if parameters.configProperties.enableLocalDB }}:

‎eng/pipelines/common/templates/stages/ci-run-tests-stage.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ stages:
5454
configProperties: ${{ config.value.configProperties }}
5555
prebuildSteps: ${{ parameters.prebuildSteps }}
5656
targetFramework: ${{ targetFramework }}
57+
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
5758
testSet: ${{ testSet }}
5859
${{ each codeCoveTF in config.value.codeCovTargetFrameworks }}:
5960
${{ if eq(codeCoveTF, targetFramework) }}:
@@ -81,6 +82,7 @@ stages:
8182
useManagedSNI: ${{ useManagedSNI }}
8283
prebuildSteps: ${{ parameters.prebuildSteps }}
8384
targetFramework: ${{ targetFramework }}
85+
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
8486
testSet: ${{ testSet }}
8587
${{ each codeCoveTF in config.value.codeCovTargetFrameworks }}:
8688
${{ if eq(codeCoveTF, targetFramework) }}:

‎eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ parameters:
77
- name: password
88
type: string
99
default: $(password)
10-
11-
- name: targetNetCoreVersion
12-
type: string
13-
default: $(MainTargetNetCoreVersion)
1410

1511
- name: condition
1612
type: string
@@ -19,8 +15,6 @@ parameters:
1915
steps:
2016
# Linux only steps
2117
- bash: |
22-
echo ${{parameters.targetNetCoreVersion }}
23-
2418
sudo systemctl stop mssql-server
2519
2620
# Password for the SA user (required)

‎eng/pipelines/common/templates/steps/configure-sql-server-step.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ parameters:
5858
type: string
5959
default: $(password)
6060

61-
- name: targetNetCoreVersion
61+
- name: netcoreVersionTestUtils
6262
type: string
63-
default: $(MainTargetNetCoreVersion)
6463

6564
- name: databaseName
6665
type: string
@@ -93,19 +92,18 @@ steps:
9392
- template: configure-sql-server-linux-step.yml@self
9493
parameters:
9594
password: ${{parameters.password}}
96-
targetNetCoreVersion: ${{parameters.targetNetCoreVersion}}
9795

9896
# Common steps
9997
- task: DotNetCoreCLI@2
10098
displayName: 'Build Ext Utilities'
10199
inputs:
102-
arguments: '-f ${{parameters.targetNetCoreVersion }}'
100+
arguments: '-f ${{parameters.netcoreVersionTestUtils }}'
103101
workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities
104102
retryCountOnTaskFailure: 1
105103

106104
- task: DotNetCoreCLI@2
107105
displayName: 'Create Test Database ${{parameters.databaseName }}'
108106
inputs:
109107
command: run
110-
arguments: '-f ${{parameters.targetNetCoreVersion }} -- "CreateDatabase" ${{parameters.databaseName }} '
108+
arguments: '-f ${{parameters.netcoreVersionTestUtils }} -- "CreateDatabase" ${{parameters.databaseName }} '
111109
workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities

‎eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ parameters:
2626
type: object
2727
default:
2828
- net462
29-
- net6.0
3029
- net8.0
3130

3231
- name: product

‎eng/pipelines/common/templates/steps/prepare-test-db-step.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ parameters:
1010

1111
- name: targetFramework
1212
type: string
13-
default: net6.0
13+
default: net8.0
1414

1515
steps:
1616
- task: DotNetCoreCLI@2
1717
displayName: 'Build Ext Utilities'
1818
inputs:
19+
command: build
1920
arguments: '-f ${{parameters.targetFramework }}'
2021
workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities
2122
- task: DotNetCoreCLI@2

‎eng/pipelines/dotnet-sqlclient-ci-core.yml‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@ parameters: # parameters are shown up in ADO UI in a build queue time
1212
- name: targetFrameworks
1313
displayName: 'Target Frameworks on Windows'
1414
type: object
15-
default: [net462, net6.0, net8.0]
15+
default: [net462, net8.0]
1616

1717
- name: targetFrameworksLinux
1818
displayName: 'Target Frameworks on Non-Windows'
1919
type: object
20-
default: [net6.0, net8.0]
20+
default: [net8.0]
21+
22+
- name: netcoreVersionTestUtils
23+
displayName: 'Netcore Version for Test Utilities'
24+
type: object
25+
default: net8.0
2126

2227
- name: buildPlatforms
2328
displayName: 'Build Platforms on Windows'
@@ -39,7 +44,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
3944
- name: codeCovTargetFrameworks
4045
displayName: 'Code Coverage Target Frameworks'
4146
type: object
42-
default: [net462, net6.0]
47+
default: [net462, net8.0]
4348

4449
- name: buildType
4550
displayName: 'Build Type'
@@ -107,7 +112,8 @@ stages:
107112
hostedPool: false # whether the pool is hosted or not
108113
images: # list of images to run tests on
109114
Win22_Sql19: ADO-MMS22-SQL19 # stage display name: image name from the pool
110-
TargetFrameworks: ${{parameters.targetFrameworks }} #[net462, net6.0, net8.0] # list of target frameworks to run
115+
TargetFrameworks: ${{parameters.targetFrameworks }} #[net462, net8.0] # list of target frameworks to run
116+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
111117
buildPlatforms: ${{parameters.buildPlatforms }}
112118
testSets: ${{parameters.testSets }} # [1, 2, 3] # list of test sets to run
113119
useManagedSNI: ${{parameters.useManagedSNI }} # can be used for .NET Core only tests on Windows: [false, true], [false] or [true] values are allowed
@@ -131,7 +137,7 @@ stages:
131137
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
132138
AliasName: $(SQLAliasName)
133139
# extra config properties
134-
x86TestTargetFrameworks: [net6.0] # target frameworks should run tests on x86 as well
140+
x86TestTargetFrameworks: [net8.0] # target frameworks should run tests on x86 as well
135141
SQLRootPath: $(SQL19RootPath)
136142
enableLocalDB: true
137143
# instanceName: default: MSSQLSERVER
@@ -143,7 +149,6 @@ stages:
143149
# x86AliasRegistryPath: default: $(x86AliasRegistryPath)
144150
# SQLAliasName: default: $(SQLAliasName)
145151
# SQLAliasPort: default: $(SQLAliasPort)
146-
# targetNetCoreVersion: default: $(MainTargetNetCoreVersion)
147152
# databaseName: default: Northwind
148153
# localDbAppName: default: $(LocalDbAppName)
149154
# localDbSharedInstanceName: default: $(LocalDbSharedInstanceName)
@@ -154,6 +159,7 @@ stages:
154159
images:
155160
Win22_Sql22: ADO-MMS22-SQL22
156161
TargetFrameworks: ${{parameters.targetFrameworks }}
162+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
157163
buildPlatforms: ${{parameters.buildPlatforms }}
158164
testSets: ${{parameters.testSets }}
159165
useManagedSNI: ${{parameters.useManagedSNI }}
@@ -181,11 +187,13 @@ stages:
181187
SQLRootPath: $(SQL22RootPath)
182188
enableLocalDB: true
183189

190+
184191
windows_sql_22_named_instance:
185192
pool: ${{parameters.defaultPoolName }}
186193
images:
187194
Win22_Sql22_named_instance: ADO-MMS22-SQL22-WITH-NAMED-INSTANCE
188195
TargetFrameworks: ${{parameters.targetFrameworks }}
196+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
189197
buildPlatforms: ${{parameters.buildPlatforms }}
190198
testSets: ${{parameters.testSets }}
191199
useManagedSNI: ${{parameters.useManagedSNI }}
@@ -201,13 +209,15 @@ stages:
201209
SQLRootPath: $(SQL22RootPath)
202210
instanceName: $(NamedInstance)
203211

212+
204213
# Azure SQL Server - Windows
205214
windows_azure_sql:
206215
pool: ${{parameters.defaultPoolName }}
207216
images:
208217
Win22_Azure_Sql: ADO-MMS22-SQL19
209218
win11_Azure_Sql: ADO-CI-Win11
210219
TargetFrameworks: ${{parameters.targetFrameworks }}
220+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
211221
buildPlatforms: ${{parameters.buildPlatforms }}
212222
testSets: ${{parameters.testSets }}
213223
useManagedSNI: ${{parameters.useManagedSNI }}
@@ -234,6 +244,7 @@ stages:
234244
images:
235245
Win22_Azure_ARM64_Sql: ADO-WIN11-ARM64
236246
TargetFrameworks: ${{parameters.targetFrameworks }}
247+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
237248
buildPlatforms: ${{parameters.buildPlatforms }}
238249
testSets: ${{parameters.testSets }}
239250
useManagedSNI: ${{parameters.useManagedSNI }}
@@ -260,6 +271,7 @@ stages:
260271
images:
261272
Win22_Enclave_Sql19: ADO-MMS22-SQL19
262273
TargetFrameworks: ${{parameters.targetFrameworks }}
274+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
263275
buildPlatforms: ${{parameters.buildPlatforms }}
264276
testSets: [AE]
265277
useManagedSNI: ${{parameters.useManagedSNI }}
@@ -290,6 +302,7 @@ stages:
290302
images:
291303
Ubuntu20_Sql22: ADO-UB20-SQL22
292304
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
305+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
293306
buildPlatforms: [AnyCPU]
294307
testSets: ${{parameters.testSets }}
295308
useManagedSNI: [true]
@@ -315,6 +328,7 @@ stages:
315328
images:
316329
Ubuntu20_Azure_Sql: ADO-UB20-Sql22
317330
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
331+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
318332
buildPlatforms: [AnyCPU]
319333
testSets: ${{parameters.testSets }}
320334
useManagedSNI: [true]
@@ -341,6 +355,7 @@ stages:
341355
images:
342356
Ubuntu20_Enclave_Sql19: ADO-UB20-Sql22
343357
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
358+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
344359
buildPlatforms: [AnyCPU]
345360
testSets: [AE]
346361
useManagedSNI: [true]
@@ -371,6 +386,7 @@ stages:
371386
images:
372387
MacOS12_Azure_Sql: macOS-12
373388
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
389+
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
374390
buildPlatforms: [AnyCPU]
375391
testSets: ${{parameters.testSets }}
376392
useManagedSNI: [true]

0 commit comments

Comments
 (0)