Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop net6 support #2927

Merged
merged 8 commits into from
Oct 31, 2024
Merged
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
13 changes: 0 additions & 13 deletions RunPackageReferenceTests.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,14 @@ call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetCore -p:Refe
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetSt -p:ReferenceType=Package

:: .NET - REFERENCE TYPE "PACKAGE"

call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:TargetNetCoreVersion=net6.0
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
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

call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:TargetNetCoreVersion=net8.0
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
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

call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=x64 -p:TargetNetCoreVersion=net6.0
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
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

call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=x64 -p:TargetNetCoreVersion=net8.0
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
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

call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=Win32 -p:TargetNetCoreVersion=net6.0
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
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

call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:ReferenceType=Package -p:Platform=Win32 -p:TargetNetCoreVersion=net8.0
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
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
Expand Down
2 changes: 1 addition & 1 deletion RunProjectReferenceTests.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:: Default target frameworks
set netfxVersion=net462
set netcoreVersion=net6.0
set netcoreVersion=net8.0

:: Accept two parameters for .NET Framework and .NET versions.
:: Examples:
Expand Down
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<IsEnabledWindows Condition="'$(TargetsUnix)' == 'true'">false</IsEnabledWindows>
<TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsWindows)' == 'true'">Windows</TestOS>
<TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsUnix)' == 'true'">Unix</TestOS>
<TF Condition="$(TF) == ''">net6.0</TF> <!-- Default Target Framework -->
<TF Condition="$(TF) == ''">net8.0</TF> <!-- Default Target Framework -->
<TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETFramework'">netfx</TFGroup>
<TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETCoreApp'">netcore</TFGroup>
<TargetGroup Condition="'$(TFGroup)' == 'netfx'" >netfx</TargetGroup>
Expand Down Expand Up @@ -187,7 +187,7 @@

<Target Name="RunManualTests">
<!-- Windows -->
<Exec ConsoleToMsBuild="true" Command="$(DotnetPath)dotnet test &quot;@(ManualTestsProj)&quot; -p:Configuration=$(Configuration) -p:Target$(TFGroup)Version=$(TF) -p:ReferenceType=$(ReferenceType) --no-build -l &quot;console;verbosity=normal&quot; --collect &quot;Code coverage&quot; -p:TestSet=$(TestSet) --results-directory $(ResultsDirectory) -p:TestTargetOS=Windows$(TargetGroup) --filter &quot;category!=non$(TargetGroup)tests&amp;category!=failing&amp;category!=nonwindowstests&quot; &quot;--logger:trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)&quot;" Condition="'$(IsEnabledWindows)' == 'true'"/>

Check failure on line 190 in build.proj

View check run for this annotation

Azure Pipelines / CI-SqlClient (Win22_Azure_Sql net8_0_AnyCPU_ManagedSNI_3)

build.proj#L190

build.proj(190,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetcoreVersion=net8.0 -p:ReferenceType=Project --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=3 --results-directory TestResults -p:TestTargetOS=Windowsnetcoreapp --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetcoreapp-3"" exited with code 1.

Check failure on line 190 in build.proj

View check run for this annotation

Azure Pipelines / CI-SqlClient

build.proj#L190

build.proj(190,5): Error MSB3073: The command "dotnet test "src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" -p:Configuration=Release -p:TargetnetcoreVersion=net8.0 -p:ReferenceType=Project --no-build -l "console;verbosity=normal" --collect "Code coverage" -p:TestSet=3 --results-directory TestResults -p:TestTargetOS=Windowsnetcoreapp --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests" "--logger:trx;LogFilePrefix=Manual-Windowsnetcoreapp-3"" exited with code 1.
<!-- Unix -->
<Exec ConsoleToMsBuild="true" Command="$(DotnetPath)dotnet test &quot;@(ManualTestsProj)&quot; -p:Configuration=$(Configuration) -p:TargetNetCoreVersion=$(TF) -p:ReferenceType=$(ReferenceType) --no-build -l &quot;console;verbosity=normal&quot; --collect &quot;Code coverage&quot; -p:TestSet=$(TestSet) --results-directory $(ResultsDirectory) -p:TestTargetOS=Unixnetcoreapp --filter &quot;category!=nonnetcoreapptests&amp;category!=failing&amp;category!=nonlinuxtests&amp;category!=nonuaptests&quot; &quot;--logger:trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)&quot;" Condition="'$(IsEnabledWindows)' != 'true'"/>
</Target>
Expand Down
6 changes: 4 additions & 2 deletions eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ parameters:
- name: targetFramework
type: string

- name: netcoreVersionTestUtils
type: string

- name: enableX86Test
type: boolean
default: false
Expand Down Expand Up @@ -164,6 +167,7 @@ jobs:
- template: ../steps/configure-sql-server-step.yml@self # configure SQL Server
parameters:
operatingSystem: ${{ parameters.operatingSystem }}
netcoreVersionTestUtils: ${{ parameters.netcoreVersionTestUtils }}
${{ if parameters.configProperties.instanceName }}:
instanceName: ${{ parameters.configProperties.instanceName }}
${{ if parameters.configProperties.user }}:
Expand All @@ -182,8 +186,6 @@ jobs:
SQLAliasName: ${{ parameters.configProperties.SQLAliasName }}
${{ if parameters.configProperties.SQLAliasPort }}:
SQLAliasPort: ${{ parameters.configProperties.SQLAliasPort }}
${{ if parameters.configProperties.targetNetCoreVersion }}:
targetNetCoreVersion: ${{ parameters.configProperties.targetNetCoreVersion }}
${{ if parameters.configProperties.databaseName }}:
databaseName: ${{ parameters.configProperties.databaseName }}
${{ if parameters.configProperties.enableLocalDB }}:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ stages:
configProperties: ${{ config.value.configProperties }}
prebuildSteps: ${{ parameters.prebuildSteps }}
targetFramework: ${{ targetFramework }}
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
testSet: ${{ testSet }}
${{ each codeCoveTF in config.value.codeCovTargetFrameworks }}:
${{ if eq(codeCoveTF, targetFramework) }}:
Expand Down Expand Up @@ -81,6 +82,7 @@ stages:
useManagedSNI: ${{ useManagedSNI }}
prebuildSteps: ${{ parameters.prebuildSteps }}
targetFramework: ${{ targetFramework }}
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
testSet: ${{ testSet }}
${{ each codeCoveTF in config.value.codeCovTargetFrameworks }}:
${{ if eq(codeCoveTF, targetFramework) }}:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ parameters:
- name: password
type: string
default: $(password)

- name: targetNetCoreVersion
type: string
default: $(MainTargetNetCoreVersion)

- name: condition
type: string
Expand All @@ -19,8 +15,6 @@ parameters:
steps:
# Linux only steps
- bash: |
echo ${{parameters.targetNetCoreVersion }}

sudo systemctl stop mssql-server

# Password for the SA user (required)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ parameters:
type: string
default: $(password)

- name: targetNetCoreVersion
- name: netcoreVersionTestUtils
type: string
default: $(MainTargetNetCoreVersion)

- name: databaseName
type: string
Expand Down Expand Up @@ -93,19 +92,18 @@ steps:
- template: configure-sql-server-linux-step.yml@self
parameters:
password: ${{parameters.password}}
targetNetCoreVersion: ${{parameters.targetNetCoreVersion}}

# Common steps
- task: DotNetCoreCLI@2
displayName: 'Build Ext Utilities'
inputs:
arguments: '-f ${{parameters.targetNetCoreVersion }}'
arguments: '-f ${{parameters.netcoreVersionTestUtils }}'
workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities
retryCountOnTaskFailure: 1

- task: DotNetCoreCLI@2
displayName: 'Create Test Database ${{parameters.databaseName }}'
inputs:
command: run
arguments: '-f ${{parameters.targetNetCoreVersion }} -- "CreateDatabase" ${{parameters.databaseName }} '
arguments: '-f ${{parameters.netcoreVersionTestUtils }} -- "CreateDatabase" ${{parameters.databaseName }} '
workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ parameters:
type: object
default:
- net462
- net6.0
- net8.0

- name: product
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ parameters:

- name: targetFramework
type: string
default: net6.0
default: net8.0

steps:
- task: DotNetCoreCLI@2
displayName: 'Build Ext Utilities'
inputs:
command: build
arguments: '-f ${{parameters.targetFramework }}'
workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities
- task: DotNetCoreCLI@2
Expand Down
28 changes: 22 additions & 6 deletions eng/pipelines/dotnet-sqlclient-ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@ parameters: # parameters are shown up in ADO UI in a build queue time
- name: targetFrameworks
displayName: 'Target Frameworks on Windows'
type: object
default: [net462, net6.0, net8.0]
default: [net462, net8.0]

- name: targetFrameworksLinux
displayName: 'Target Frameworks on Non-Windows'
type: object
default: [net6.0, net8.0]
default: [net8.0]

- name: netcoreVersionTestUtils
displayName: 'Netcore Version for Test Utilities'
type: object
default: net8.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This version is set here, but passed down through to the test util project compilation. Trying to keep this at the highest level possible so that it's easy to bump in the future without digging down in the individual jobs.


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

- name: buildType
displayName: 'Build Type'
Expand Down Expand Up @@ -107,7 +112,8 @@ stages:
hostedPool: false # whether the pool is hosted or not
images: # list of images to run tests on
Win22_Sql19: ADO-MMS22-SQL19 # stage display name: image name from the pool
TargetFrameworks: ${{parameters.targetFrameworks }} #[net462, net6.0, net8.0] # list of target frameworks to run
TargetFrameworks: ${{parameters.targetFrameworks }} #[net462, net8.0] # list of target frameworks to run
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: ${{parameters.testSets }} # [1, 2, 3] # list of test sets to run
useManagedSNI: ${{parameters.useManagedSNI }} # can be used for .NET Core only tests on Windows: [false, true], [false] or [true] values are allowed
Expand All @@ -131,7 +137,7 @@ stages:
LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
AliasName: $(SQLAliasName)
# extra config properties
x86TestTargetFrameworks: [net6.0] # target frameworks should run tests on x86 as well
x86TestTargetFrameworks: [net8.0] # target frameworks should run tests on x86 as well
SQLRootPath: $(SQL19RootPath)
enableLocalDB: true
# instanceName: default: MSSQLSERVER
Expand All @@ -143,7 +149,6 @@ stages:
# x86AliasRegistryPath: default: $(x86AliasRegistryPath)
# SQLAliasName: default: $(SQLAliasName)
# SQLAliasPort: default: $(SQLAliasPort)
# targetNetCoreVersion: default: $(MainTargetNetCoreVersion)
# databaseName: default: Northwind
# localDbAppName: default: $(LocalDbAppName)
# localDbSharedInstanceName: default: $(LocalDbSharedInstanceName)
Expand All @@ -154,6 +159,7 @@ stages:
images:
Win22_Sql22: ADO-MMS22-SQL22
TargetFrameworks: ${{parameters.targetFrameworks }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: ${{parameters.testSets }}
useManagedSNI: ${{parameters.useManagedSNI }}
Expand Down Expand Up @@ -181,11 +187,13 @@ stages:
SQLRootPath: $(SQL22RootPath)
enableLocalDB: true


windows_sql_22_named_instance:
pool: ${{parameters.defaultPoolName }}
images:
Win22_Sql22_named_instance: ADO-MMS22-SQL22-WITH-NAMED-INSTANCE
TargetFrameworks: ${{parameters.targetFrameworks }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: ${{parameters.testSets }}
useManagedSNI: ${{parameters.useManagedSNI }}
Expand All @@ -201,13 +209,15 @@ stages:
SQLRootPath: $(SQL22RootPath)
instanceName: $(NamedInstance)


# Azure SQL Server - Windows
windows_azure_sql:
pool: ${{parameters.defaultPoolName }}
images:
Win22_Azure_Sql: ADO-MMS22-SQL19
win11_Azure_Sql: ADO-CI-Win11
TargetFrameworks: ${{parameters.targetFrameworks }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: ${{parameters.testSets }}
useManagedSNI: ${{parameters.useManagedSNI }}
Expand All @@ -234,6 +244,7 @@ stages:
images:
Win22_Azure_ARM64_Sql: ADO-WIN11-ARM64
TargetFrameworks: ${{parameters.targetFrameworks }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: ${{parameters.testSets }}
useManagedSNI: ${{parameters.useManagedSNI }}
Expand All @@ -260,6 +271,7 @@ stages:
images:
Win22_Enclave_Sql19: ADO-MMS22-SQL19
TargetFrameworks: ${{parameters.targetFrameworks }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: [AE]
useManagedSNI: ${{parameters.useManagedSNI }}
Expand Down Expand Up @@ -290,6 +302,7 @@ stages:
images:
Ubuntu20_Sql22: ADO-UB20-SQL22
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: [AnyCPU]
testSets: ${{parameters.testSets }}
useManagedSNI: [true]
Expand All @@ -315,6 +328,7 @@ stages:
images:
Ubuntu20_Azure_Sql: ADO-UB20-Sql22
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: [AnyCPU]
testSets: ${{parameters.testSets }}
useManagedSNI: [true]
Expand All @@ -341,6 +355,7 @@ stages:
images:
Ubuntu20_Enclave_Sql19: ADO-UB20-Sql22
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: [AnyCPU]
testSets: [AE]
useManagedSNI: [true]
Expand Down Expand Up @@ -371,6 +386,7 @@ stages:
images:
MacOS12_Azure_Sql: macOS-12
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: [AnyCPU]
testSets: ${{parameters.testSets }}
useManagedSNI: [true]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
- name: targetFrameworks
displayName: 'Target Frameworks on Windows'
type: object
default: [net462, net6.0, net8.0]
default: [net462, net8.0]

- name: targetFrameworksLinux
displayName: 'Target Frameworks on Non-Windows'
type: object
default: [net6.0, net8.0]
default: [net8.0]

- name: buildPlatforms
displayName: 'Build Platforms on Windows'
Expand All @@ -72,7 +72,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
- name: codeCovTargetFrameworks
displayName: 'Code Coverage Target Frameworks'
type: object
default: [net462, net6.0]
default: [net462, net8.0]

- name: buildType
displayName: 'Build Type'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ parameters: # parameters are shown up in ADO UI in a build queue time
- name: targetFrameworks
displayName: 'Target Frameworks on Windows'
type: object
default: [net462, net6.0, net8.0]
default: [net462, net8.0]

- name: targetFrameworksLinux
displayName: 'Target Frameworks on Non-Windows'
type: object
default: [net6.0, net8.0]
default: [net8.0]

- name: buildPlatforms
displayName: 'Build Platforms on Windows'
Expand All @@ -64,7 +64,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
- name: codeCovTargetFrameworks
displayName: 'Code Coverage Target Frameworks'
type: object
default: [net462, net6.0]
default: [net462, net8.0]

- name: buildType
displayName: 'Build Type'
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/ci-build-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variables:
- name: buildNumber
value: '$(Build.BuildNumber)'
- name: TFNetCore
value: 'net6.0'
value: 'net8.0'
- name: SQLTarget
value: 'localhost'
- name: NugetPackageVersion
Expand Down
Loading
Loading