feat: stop to build and run tests for .NET 6.0 (#1247)

Seddryck · Dec 1, 2024 · 5fad363 · 5fad363
1 parent 67ce5ba
commit 5fad363
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 63 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
 
 	<PropertyGroup>
         <LangVersion>12.0</LangVersion>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<Platform>AnyCPU</Platform>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>

diff --git a/DubUrl.Adomd/DubUrl.Adomd.csproj b/DubUrl.Adomd/DubUrl.Adomd.csproj
@@ -2,11 +2,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AnalysisServices.AdomdClient.NetCore.retail.amd64" Version="19.84.1" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Management" Version="8.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="System.Management" Version="9.0.0" />
   </ItemGroup>
 

diff --git a/DubUrl.Extensions.Testing/DubUrl.Extensions.Testing.csproj b/DubUrl.Extensions.Testing/DubUrl.Extensions.Testing.csproj
@@ -1,14 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
+  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />

diff --git a/DubUrl.Extensions/DubUrl.Extensions.csproj b/DubUrl.Extensions/DubUrl.Extensions.csproj
@@ -1,16 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
+  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />

diff --git a/DubUrl.OleDb/DubUrl.OleDb.csproj b/DubUrl.OleDb/DubUrl.OleDb.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Data.OleDb" Version="8.0.1" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
+  <ItemGroup>
     <PackageReference Include="System.Data.OleDb" Version="9.0.0" />
   </ItemGroup>
 

diff --git a/DubUrl.QA/DubUrl.QA.csproj b/DubUrl.QA/DubUrl.QA.csproj
@@ -98,27 +98,10 @@
     <PackageReference Include="NReco.PrestoAdo" Version="1.1.0" />
     <PackageReference Include="SingleStoreConnector" Version="1.1.4" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Data.Odbc" Version="8.0.1" />
-    <PackageReference Include="System.Data.OleDb" Version="8.0.1" />
-    <PackageReference Include="MySqlConnector" Version="2.3.7" />
-    <PackageReference Include="Npgsql" Version="8.0.5" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="System.Data.Odbc" Version="9.0.0" />
     <PackageReference Include="System.Data.OleDb" Version="9.0.0" />
     <PackageReference Include="MySqlConnector" Version="2.4.0" />
     <PackageReference Include="Npgsql" Version="9.0.1" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />

diff --git a/DubUrl.Testing/DubUrl.Testing.csproj b/DubUrl.Testing/DubUrl.Testing.csproj
@@ -15,15 +15,6 @@
     <PackageReference Include="SingleStoreConnector" Version="1.1.4" />
     <PackageReference Include="Snowflake.Data" Version="4.2.0" />
     <PackageReference Include="Teradata.Client.Provider" Version="20.0.3" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Management" Version="8.0.0" />
-    <PackageReference Include="Npgsql" Version="8.0.5" />
-    <PackageReference Include="MySqlConnector" Version="2.3.7" />
-    <PackageReference Include="System.Data.Odbc" Version="8.0.1" />
-    <PackageReference Include="System.Data.OleDb" Version="8.0.1" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
     <PackageReference Include="System.Management" Version="9.0.0" />
     <PackageReference Include="Npgsql" Version="9.0.1" />
     <PackageReference Include="MySqlConnector" Version="2.4.0" />

diff --git a/appveyor.yml b/appveyor.yml
@@ -76,7 +76,7 @@ test_script:
 
 - pwsh: |
       $force = ($env:APPVEYOR_REPO_BRANCH -eq "main") #Valid for a Pull Request or a Commit on main
-      & .\DubUrl.QA\deploy-test-harness.ps1 -force:$force -config "Release" -frameworks @("net6.0", "net8.0", "net9.0") -exclude @("CockRoach", "Drill", "Trino", "PowerBIDesktop", "SsasMultdim", "SsasTabular", "SingleStore", "CrateDB")
+      & .\DubUrl.QA\deploy-test-harness.ps1 -force:$force -config "Release" -frameworks @("net8.0", "net9.0") -exclude @("CockRoach", "Drill", "Trino", "PowerBIDesktop", "SsasMultdim", "SsasTabular", "SingleStore", "CrateDB")
       if ($lastexitcode -gt 0) {
         throw "At least one of the test-suite was not successful. Build stopped."
       }

diff --git a/generate-adomd-info.ps1 b/generate-adomd-info.ps1
@@ -18,7 +18,7 @@ If(Test-Path -LiteralPath $destinationPath\$destinationFile -PathType leaf) {
 
 $assemblyPath = "DubUrl.Adomd\bin"
 Set-Location $assemblyPath
-$dllfile = "net6.0\DubUrl.Adomd.dll"
+$dllfile = "net8.0\DubUrl.Adomd.dll"
 
 If ((-not (Test-Path -Path "Release\$dllfile")) -or ("Release\$dllfile".CreationTime -lt "Debug\$dllfile".CreationTime)) {
     $directory = "Debug"    

diff --git a/generate-adonet-info.ps1 b/generate-adonet-info.ps1
@@ -18,7 +18,7 @@ If(Test-Path -LiteralPath $destinationPath\$destinationFile -PathType leaf) {
 
 $assemblyPath = "DubUrl.Core\bin"
 Set-Location $assemblyPath
-$dllfile = "net6.0\DubUrl.dll"
+$dllfile = "net8.0\DubUrl.dll"
 
 If ((-not (Test-Path -Path "Release\$dllfile")) -or ("Release\$dllfile".CreationTime -lt "Debug\$dllfile".CreationTime)) {
     $directory = "Debug"    

diff --git a/generate-odbc-driver-info.ps1 b/generate-odbc-driver-info.ps1
@@ -18,7 +18,7 @@ If(Test-Path -LiteralPath $destinationPath\$destinationFile -PathType leaf) {
 
 $assemblyPath = "DubUrl.Core\bin"
 Set-Location $assemblyPath
-$dllfile = "net6.0\DubUrl.dll"
+$dllfile = "net8.0\DubUrl.dll"
 
 If ((-not (Test-Path -Path "Release\$dllfile")) -or ("Release\$dllfile".CreationTime -lt "Debug\$dllfile".CreationTime)) {
     $directory = "Debug"    

diff --git a/generate-oledb-provider-info.ps1 b/generate-oledb-provider-info.ps1
@@ -17,15 +17,15 @@ If(Test-Path -LiteralPath $destinationPath\$destinationFile -PathType leaf) {
 
 $assemblyPath = "DubUrl.QA\bin"
 Set-Location $assemblyPath
-$dllfile = "net6.0\DubUrl.OleDb.dll"
+$dllfile = "net8.0\DubUrl.OleDb.dll"
 
 If ((-not (Test-Path -Path "Release\$dllfile")) -or ("Release\$dllfile".CreationTime -lt "Debug\$dllfile".CreationTime)) {
     $directory = "Debug"    
 } else {
     $directory = "Release"   
 }
 
-Add-Type -Path "$directory\net6.0\Antlr4.StringTemplate.dll"
+Add-Type -Path "$directory\net8.0\Antlr4.StringTemplate.dll"
 Add-Type -Path "$directory\$dllfile"