diff --git a/RunPackageReferenceTests.cmd b/RunPackageReferenceTests.cmd index fa503f905e..4813c182ce 100644 --- a/RunPackageReferenceTests.cmd +++ b/RunPackageReferenceTests.cmd @@ -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 diff --git a/RunProjectReferenceTests.cmd b/RunProjectReferenceTests.cmd index ee4a8bca9a..1fcc31de76 100644 --- a/RunProjectReferenceTests.cmd +++ b/RunProjectReferenceTests.cmd @@ -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: diff --git a/build.proj b/build.proj index 607b687188..92c323c544 100644 --- a/build.proj +++ b/build.proj @@ -19,7 +19,7 @@ false Windows Unix - net6.0 + net8.0 netfx netcore netfx diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml index 4aaba4c71e..dc2df0c3ef 100644 --- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml +++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml @@ -40,6 +40,9 @@ parameters: - name: targetFramework type: string + - name: netcoreVersionTestUtils + type: string + - name: enableX86Test type: boolean default: false @@ -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 }}: @@ -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 }}: diff --git a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml index 536812acf0..888927d1df 100644 --- a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml +++ b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml @@ -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) }}: @@ -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) }}: diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml index 2976c83939..2d224d156c 100644 --- a/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml +++ b/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml @@ -7,10 +7,6 @@ parameters: - name: password type: string default: $(password) - - - name: targetNetCoreVersion - type: string - default: $(MainTargetNetCoreVersion) - name: condition type: string @@ -19,8 +15,6 @@ parameters: steps: # Linux only steps - bash: | - echo ${{parameters.targetNetCoreVersion }} - sudo systemctl stop mssql-server # Password for the SA user (required) diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-step.yml index a7cb066d31..b8c2856522 100644 --- a/eng/pipelines/common/templates/steps/configure-sql-server-step.yml +++ b/eng/pipelines/common/templates/steps/configure-sql-server-step.yml @@ -58,9 +58,8 @@ parameters: type: string default: $(password) - - name: targetNetCoreVersion + - name: netcoreVersionTestUtils type: string - default: $(MainTargetNetCoreVersion) - name: databaseName type: string @@ -93,13 +92,12 @@ 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 @@ -107,5 +105,5 @@ steps: 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 diff --git a/eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml b/eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml index faf54fc24d..d418302ce2 100644 --- a/eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml +++ b/eng/pipelines/common/templates/steps/copy-dlls-for-test-step.yml @@ -26,7 +26,6 @@ parameters: type: object default: - net462 - - net6.0 - net8.0 - name: product diff --git a/eng/pipelines/common/templates/steps/prepare-test-db-step.yml b/eng/pipelines/common/templates/steps/prepare-test-db-step.yml index 8597a0c9e5..145c7482e1 100644 --- a/eng/pipelines/common/templates/steps/prepare-test-db-step.yml +++ b/eng/pipelines/common/templates/steps/prepare-test-db-step.yml @@ -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 diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml index 62ffe6dd12..ade70542b9 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-core.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml @@ -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 - name: buildPlatforms displayName: 'Build Platforms on Windows' @@ -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' @@ -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 @@ -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 @@ -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) @@ -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 }} @@ -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 }} @@ -201,6 +209,7 @@ stages: SQLRootPath: $(SQL22RootPath) instanceName: $(NamedInstance) + # Azure SQL Server - Windows windows_azure_sql: pool: ${{parameters.defaultPoolName }} @@ -208,6 +217,7 @@ stages: 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 }} @@ -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 }} @@ -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 }} @@ -290,6 +302,7 @@ stages: images: Ubuntu20_Sql22: ADO-UB20-SQL22 TargetFrameworks: ${{parameters.targetFrameworksLinux }} + netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }} buildPlatforms: [AnyCPU] testSets: ${{parameters.testSets }} useManagedSNI: [true] @@ -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] @@ -341,6 +355,7 @@ stages: images: Ubuntu20_Enclave_Sql19: ADO-UB20-Sql22 TargetFrameworks: ${{parameters.targetFrameworksLinux }} + netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }} buildPlatforms: [AnyCPU] testSets: [AE] useManagedSNI: [true] @@ -371,6 +386,7 @@ stages: images: MacOS12_Azure_Sql: macOS-12 TargetFrameworks: ${{parameters.targetFrameworksLinux }} + netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }} buildPlatforms: [AnyCPU] testSets: ${{parameters.testSets }} useManagedSNI: [true] diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml index 20c2102f23..4a32ffa51e 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml @@ -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' @@ -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' diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml index c1ce940d69..09cc33a4d5 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml @@ -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' @@ -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' diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml index d9e100f635..122281e083 100644 --- a/eng/pipelines/libraries/ci-build-variables.yml +++ b/eng/pipelines/libraries/ci-build-variables.yml @@ -12,7 +12,7 @@ variables: - name: buildNumber value: '$(Build.BuildNumber)' - name: TFNetCore - value: 'net6.0' + value: 'net8.0' - name: SQLTarget value: 'localhost' - name: NugetPackageVersion diff --git a/eng/pipelines/libraries/mds-validation-variables.yml b/eng/pipelines/libraries/mds-validation-variables.yml index 667f56aa6a..8964b08ac9 100644 --- a/eng/pipelines/libraries/mds-validation-variables.yml +++ b/eng/pipelines/libraries/mds-validation-variables.yml @@ -17,7 +17,7 @@ variables: - name: expectedFolderNames value: lib,ref,runtimes - name: expectedDotnetVersions - value: net462,net6.0,net8.0 + value: net462,net8.0 - name: Database value: Northwind - name: platform diff --git a/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props b/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props index d0bf4f7757..aa51d600f1 100644 --- a/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props @@ -17,7 +17,7 @@ net462 - net6.0 + net8.0 @@ -34,7 +34,7 @@ - net6.0;net8.0 + net8.0 net462 diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj index 004d2cf11b..79eeb74356 100644 --- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj @@ -1,7 +1,7 @@  false - net6.0;net8.0 + net8.0 $(ObjFolder)$(Configuration)\$(AssemblyName)\ref\ $(BinFolder)$(Configuration)\$(AssemblyName)\ref\ $(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 08e07b1989..306d9eacdf 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -1,7 +1,7 @@  Microsoft.Data.SqlClient - net8.0;net6.0 + net8.0 Microsoft.Data.SqlClient is not supported on this platform. $(OS) true @@ -16,8 +16,8 @@ $(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml true Core $(BaseProduct) - true - $(NoWarn);IL2026;IL2057;IL2072;IL2075 + true + $(NoWarn);IL2026;IL2057;IL2072;IL2075 diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj index 344f86ff89..a5e25db563 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj @@ -1,6 +1,6 @@ - net6.0;net8.0;net462 + net8.0;net462 true diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props index 12c7957a23..84447e5480 100644 --- a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props @@ -17,7 +17,7 @@ net462 - net6.0 + net8.0 diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj index 27d8d6643b..4ae4cba91c 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj @@ -73,7 +73,7 @@ - + @@ -260,7 +260,7 @@ - + diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj index 07e16ee318..4678c54c10 100644 --- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj @@ -2,7 +2,7 @@ Exe PerformanceTests - net6.0;net8.0 + net8.0 false Debug;Release; $(ObjFolder)$(Configuration).$(Platform).$(AssemblyName) diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj index 9f170f2c5b..044e9bb8c1 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj +++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net8.0 + net8.0 Microsoft.Data.SqlClient.ExtUtilities.Runner diff --git a/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj b/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj index 1087c6e3e7..dd8e477405 100644 --- a/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj +++ b/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj @@ -2,7 +2,7 @@ Exe - net472;net6.0;net8.0 + net472;net8.0 true MSBuildSdk false diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index e618df5c89..6fe22b06a9 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -48,16 +48,6 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - - - - - - - @@ -72,10 +62,6 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - @@ -90,9 +76,6 @@ When using NuGet 3.x this package requires at least version 3.4. - - - @@ -128,23 +111,6 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - - - - - - - - - - - - - - @@ -154,11 +120,5 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - - - diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec index 5c89d24276..eb9b007d96 100644 --- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec +++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec @@ -36,12 +36,6 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti - - - - - - @@ -68,15 +62,5 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti - - - - - - - - - -