diff --git a/Build/install-dependencies.ps1 b/Build/install-dependencies.ps1 index cae7a153..8a83d109 100644 --- a/Build/install-dependencies.ps1 +++ b/Build/install-dependencies.ps1 @@ -16,9 +16,8 @@ $ErrorActionPreference = 'Stop' . (Join-Path $PSScriptRoot 'scripts/Invoke-InstallModule.ps1') if ('.net' -in $List) { - Invoke-InstallDotNet -Version '6.0.422' Invoke-InstallDotNet -Version '8.0.403' - Invoke-InstallDotNet -Version '9.0.100-rc.2.24474.11' + Invoke-InstallDotNet -Version '9.0.300' $version = (Get-Content -Raw (Join-Path $PSScriptRoot '../Sources/global.json') | ConvertFrom-Json).sdk.version Invoke-InstallDotNet -Version $version diff --git a/Build/show-powershell-images.ps1 b/Build/show-powershell-images.ps1 index 4b3eb013..46635e66 100644 --- a/Build/show-powershell-images.ps1 +++ b/Build/show-powershell-images.ps1 @@ -29,6 +29,7 @@ function Get-ShortVersion { } } +# https://learn.microsoft.com/en-us/powershell/scripting/install/powershell-support-lifecycle (Invoke-RestMethod -Uri 'https://mcr.microsoft.com/v2/powershell/tags/list').tags ` | Where-Object { ($_ -Like '[0-9]*') -or ($_ -Like 'preview-[0-9]*') } ` | Get-ShortVersion ` diff --git a/Build/tasks/build-tasks.ps1 b/Build/tasks/build-tasks.ps1 index f77e9709..2a7ba632 100644 --- a/Build/tasks/build-tasks.ps1 +++ b/Build/tasks/build-tasks.ps1 @@ -30,7 +30,7 @@ task Initialize { repositoryCommitId = git rev-parse HEAD } - $script:frameworks = 'net472', 'net6.0', 'net8.0', 'net9.0' + $script:frameworks = 'net472', 'net8.0', 'net9.0' $script:databases = 'MsSql', 'PgSql', 'MySql' Write-Output "PackageVersion: $($settings.version)" @@ -209,8 +209,7 @@ task PsCoreTest { task SdkToolTest { $images = $( - 'sqldatabase/dotnet_pwsh:6.0-sdk' - , 'sqldatabase/dotnet_pwsh:8.0-sdk' + 'sqldatabase/dotnet_pwsh:8.0-sdk' , 'sqldatabase/dotnet_pwsh:9.0-sdk') $builds = @() @@ -230,8 +229,7 @@ task SdkToolTest { task NetRuntimeLinuxTest { $testCases = $( - @{ targetFramework = 'net6.0'; image = 'sqldatabase/dotnet_pwsh:6.0-runtime' } - , @{ targetFramework = 'net8.0'; image = 'sqldatabase/dotnet_pwsh:8.0-runtime' } + @{ targetFramework = 'net8.0'; image = 'sqldatabase/dotnet_pwsh:8.0-runtime' } , @{ targetFramework = 'net9.0'; image = 'sqldatabase/dotnet_pwsh:9.0-runtime' } ) diff --git a/Build/tasks/build-tasks.unit-test.ps1 b/Build/tasks/build-tasks.unit-test.ps1 index 8a0c2213..02e1593d 100644 --- a/Build/tasks/build-tasks.unit-test.ps1 +++ b/Build/tasks/build-tasks.unit-test.ps1 @@ -5,7 +5,7 @@ param( $Sources, [Parameter(Mandatory)] - [ValidateSet('net472', 'net6.0', 'net8.0', 'net9.0')] + [ValidateSet('net472', 'net8.0', 'net9.0')] [string] $Framework ) diff --git a/Build/tasks/create-images-tasks.ps1 b/Build/tasks/create-images-tasks.ps1 index c47b62c0..ce6cdeb4 100644 --- a/Build/tasks/create-images-tasks.ps1 +++ b/Build/tasks/create-images-tasks.ps1 @@ -1,8 +1,6 @@ task . ` - BuildDotnetSdk60 ` - , BuildDotnetSdk80 ` + BuildDotnetSdk80 ` , BuildDotnetSdk90 ` - , BuildDotnetRuntime60 ` , BuildDotnetRuntime80 ` , BuildDotnetRuntime90 ` , BuildMsSqlDatabase ` @@ -46,28 +44,6 @@ task BuildMySqlDatabase { } } -task BuildDotnetSdk60 { - $dockerfile = Join-Path $context 'image-dotnet-sdk-6.0.dockerfile' - exec { - docker build ` - --pull ` - -f $dockerfile ` - -t sqldatabase/dotnet_pwsh:6.0-sdk ` - . - } -} - -task BuildDotnetRuntime60 { - $dockerfile = Join-Path $context 'image-dotnet-runtime-6.0.dockerfile' - exec { - docker build ` - --pull ` - -f $dockerfile ` - -t sqldatabase/dotnet_pwsh:6.0-runtime ` - . - } -} - task BuildDotnetSdk80 { $dockerfile = Join-Path $context 'image-dotnet-sdk-8.0.dockerfile' exec { diff --git a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/index.json b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/index.json index d63f2af1..b6e462b8 100644 --- a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/index.json +++ b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/readme.md b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/readme.md index f7e312e8..47fe2a3e 100644 --- a/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/readme.md @@ -3,7 +3,7 @@ Dapper.StrongName [2.1.35](https://www.nuget.org/packages/Dapper.StrongName/2.1. Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [Apache-2.0](../../../../licenses/apache-2.0) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/index.json index bc919733..0db0515f 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/readme.md index 7de8fb96..593c3552 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/readme.md @@ -3,7 +3,7 @@ Microsoft.CodeCoverage [17.11.1](https://www.nuget.org/packages/Microsoft.CodeCo Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/index.json index 0f1de614..f6f189ee 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ], diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/readme.md index 1b421d98..ae1cd763 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/readme.md @@ -3,7 +3,7 @@ Microsoft.NET.Test.Sdk [17.11.1](https://www.nuget.org/packages/Microsoft.NET.Te Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/index.json index 8f6ecd0f..d596a506 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ], diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/readme.md index 11ce8d2c..486fdc56 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.objectmodel/17.11.1/readme.md @@ -3,7 +3,7 @@ Microsoft.TestPlatform.ObjectModel [17.11.1](https://www.nuget.org/packages/Micr Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/index.json index 411fef24..662b9fe5 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ], diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/readme.md index de55a3e5..75e21d54 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.testplatform.testhost/17.11.1/readme.md @@ -3,7 +3,7 @@ Microsoft.TestPlatform.TestHost [17.11.1](https://www.nuget.org/packages/Microso Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json index 4e386c7c..ced5c32c 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md index 3d1852f3..9d35db4c 100644 --- a/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/microsoft.win32.registry/4.7.0/readme.md @@ -3,7 +3,7 @@ Microsoft.Win32.Registry [4.7.0](https://www.nuget.org/packages/Microsoft.Win32. Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json index 291317a2..7f834269 100644 --- a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json +++ b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md index d8320c5b..e0806101 100644 --- a/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/netstandard.library/2.0.3/readme.md @@ -3,7 +3,7 @@ NETStandard.Library [2.0.3](https://www.nuget.org/packages/NETStandard.Library/2 Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json index a4ed5dec..59dea0a6 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md index 8d1dd0c5..f0a689ea 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.1/readme.md @@ -3,7 +3,7 @@ Newtonsoft.Json [13.0.1](https://www.nuget.org/packages/Newtonsoft.Json/13.0.1) Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json index a4ed5dec..59dea0a6 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md index 9fff0922..cc53d78b 100644 --- a/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/newtonsoft.json/13.0.3/readme.md @@ -3,7 +3,7 @@ Newtonsoft.Json [13.0.3](https://www.nuget.org/packages/Newtonsoft.Json/13.0.3) Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/index.json b/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/index.json index fcdca83a..9966d0d0 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/index.json +++ b/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/readme.md b/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/readme.md index 8b33ec0b..df98e399 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/nunit/4.2.2/readme.md @@ -3,7 +3,7 @@ NUnit [4.2.2](https://www.nuget.org/packages/NUnit/4.2.2) Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/index.json b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/index.json index 8ed0b292..e3c8f763 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/readme.md b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/readme.md index edd0dcda..623c6d6c 100644 --- a/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/nunit3testadapter/4.6.0/readme.md @@ -3,7 +3,7 @@ NUnit3TestAdapter [4.6.0](https://www.nuget.org/packages/NUnit3TestAdapter/4.6.0 Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/index.json b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/index.json index e9821c0a..595ebebf 100644 --- a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/index.json +++ b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/readme.md b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/readme.md index 407408d6..ef2db195 100644 --- a/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/stylecop.analyzers.unstable/1.2.0.556/readme.md @@ -3,7 +3,7 @@ StyleCop.Analyzers.Unstable [1.2.0.556](https://www.nuget.org/packages/StyleCop. Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/index.json b/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/index.json index 2d58a1ca..6d42c438 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/readme.md b/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/readme.md index ce340c58..0d8fe9e9 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.buffers/4.5.1/readme.md @@ -3,7 +3,7 @@ System.Buffers [4.5.1](https://www.nuget.org/packages/System.Buffers/4.5.1) Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/index.json b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/index.json index 2694fe37..792a53f6 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/readme.md b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/readme.md index f694b1c1..07021428 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.data.sqlclient/4.8.6/readme.md @@ -3,7 +3,7 @@ System.Data.SqlClient [4.8.6](https://www.nuget.org/packages/System.Data.SqlClie Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/index.json b/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/index.json index 510c37f0..3120b45c 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/readme.md b/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/readme.md index cab44d4e..a58a556f 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.memory/4.5.5/readme.md @@ -3,7 +3,7 @@ System.Memory [4.5.5](https://www.nuget.org/packages/System.Memory/4.5.5) Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/index.json index 8c318844..84f43d90 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/readme.md index 49b63f2b..2c8c81db 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.numerics.vectors/4.5.0/readme.md @@ -3,7 +3,7 @@ System.Numerics.Vectors [4.5.0](https://www.nuget.org/packages/System.Numerics.V Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json index a7679e35..74b716b7 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md index efbcba96..8db8d172 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.reflection.metadata/1.6.0/readme.md @@ -3,7 +3,7 @@ System.Reflection.Metadata [1.6.0](https://www.nuget.org/packages/System.Reflect Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/index.json b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/index.json index dca11fc4..ab4c7bca 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/readme.md b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/readme.md index b1a8df78..013bef7d 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/4.5.3/readme.md @@ -3,7 +3,7 @@ System.Runtime.CompilerServices.Unsafe [4.5.3](https://www.nuget.org/packages/Sy Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/index.json index ffe6811e..8561e78c 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/readme.md index 1d31bac4..da14f325 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.runtime.compilerservices.unsafe/6.0.0/readme.md @@ -3,7 +3,7 @@ System.Runtime.CompilerServices.Unsafe [6.0.0](https://www.nuget.org/packages/Sy Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json index 8b9f322e..d0c0bfa9 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md index cd89b69e..59995c70 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.security.accesscontrol/4.7.0/readme.md @@ -3,7 +3,7 @@ System.Security.AccessControl [4.7.0](https://www.nuget.org/packages/System.Secu Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json index 3c55e802..5bf12097 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md index 445eff41..f401adc1 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.security.principal.windows/4.7.0/readme.md @@ -3,7 +3,7 @@ System.Security.Principal.Windows [4.7.0](https://www.nuget.org/packages/System. Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/index.json b/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/index.json index 24894d47..c40d6362 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/index.json @@ -11,7 +11,6 @@ "InternalOnly": false, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0", "netstandard2.0" diff --git a/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/readme.md b/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/readme.md index 4fc78a11..750f5fbe 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.threading.tasks.extensions/4.5.4/readme.md @@ -3,7 +3,7 @@ System.Threading.Tasks.Extensions [4.5.4](https://www.nuget.org/packages/System. Used by: SqlDatabase -Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0 +Target frameworks: net472, net8.0, net9.0, netstandard2.0 License: [MIT](../../../../licenses/mit) diff --git a/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/index.json b/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/index.json index 8c318844..84f43d90 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/index.json +++ b/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/index.json @@ -11,7 +11,6 @@ "InternalOnly": true, "TargetFrameworks": [ "net472", - "net6.0", "net8.0", "net9.0" ] diff --git a/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/readme.md b/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/readme.md index c264e380..9a8db6a1 100644 --- a/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/readme.md +++ b/Build/third-party-libraries/packages/nuget.org/system.valuetuple/4.5.0/readme.md @@ -3,7 +3,7 @@ System.ValueTuple [4.5.0](https://www.nuget.org/packages/System.ValueTuple/4.5.0 Used by: SqlDatabase internal -Target frameworks: net472, net6.0, net8.0, net9.0 +Target frameworks: net472, net8.0, net9.0 License: [MIT](../../../../licenses/mit) diff --git a/Examples/CSharpMirationStep/readme.md b/Examples/CSharpMirationStep/readme.md index fffbd9d3..68eba98b 100644 --- a/Examples/CSharpMirationStep/readme.md +++ b/Examples/CSharpMirationStep/readme.md @@ -4,12 +4,12 @@ Any assembly script is - .exe or .dll for target framework is 4.7.2+ -- .dll for .net 6.0+ +- .dll for .net 8.0+ - has exactly one class with script implementation This project is an example of script implementation. The build output is 2.1_2.2.dll with target framework 4.7.2. -Due to the current dependencies, 2.1_2.2.dll works well on .net 6.0+. +Due to the current dependencies, 2.1_2.2.dll works well on .net 8.0+. ## Script source diff --git a/Examples/PowerShellScript/readme.md b/Examples/PowerShellScript/readme.md index 51f26b0d..f6fc214a 100644 --- a/Examples/PowerShellScript/readme.md +++ b/Examples/PowerShellScript/readme.md @@ -75,7 +75,6 @@ Pre-installed Powershell Core is required, will be used by SqlDatabase as extern * SqlDatabase .net 9.0 can host Powershell Core versions below 7.6 * SqlDatabase .net 8.0 can host Powershell Core versions below 7.5 -* SqlDatabase .net 6.0 can host Powershell Core versions below 7.3 see [PowerShell release history](https://learn.microsoft.com/en-us/powershell/scripting/install/powershell-support-lifecycle?view=powershell-7.2#release-history). diff --git a/README.md b/README.md index 6f585f6b..05194799 100644 --- a/README.md +++ b/README.md @@ -41,9 +41,9 @@ Installation PowerShell module is compatible with Powershell Core 7.2+ and PowerShell Desktop 5.1. -.net tool is compatible with .net sdk 9.0, 8.0 and 6.0. +.net tool is compatible with .net sdk 9.0 and 8.0. -Command-line tool is compatible with .net runtime 9.0, 8.0, 6.0 and .net framework 4.7.2+. +Command-line tool is compatible with .net runtime 9.0, 8.0 and .net framework 4.7.2+. ### PowerShell, from gallery diff --git a/Sources/Docker/image-dotnet-runtime-6.0.dockerfile b/Sources/Docker/image-dotnet-runtime-6.0.dockerfile deleted file mode 100644 index bae78da2..00000000 --- a/Sources/Docker/image-dotnet-runtime-6.0.dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM mcr.microsoft.com/dotnet/runtime:6.0 - -RUN apt-get update && \ - apt-get install -y liblttng-ust0 curl && \ - curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.2.24/powershell_7.2.24-1.deb_amd64.deb --output powershell.deb && \ - dpkg -i powershell.deb && \ - apt-get install -f && \ - rm -f powershell.deb \ No newline at end of file diff --git a/Sources/Docker/image-dotnet-sdk-6.0.dockerfile b/Sources/Docker/image-dotnet-sdk-6.0.dockerfile deleted file mode 100644 index 166a26fa..00000000 --- a/Sources/Docker/image-dotnet-sdk-6.0.dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 - -RUN apt-get update && \ - apt-get install -y liblttng-ust0 && \ - curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.2.24/powershell_7.2.24-1.deb_amd64.deb --output powershell.deb && \ - dpkg -i powershell.deb && \ - apt-get install -f && \ - rm -f powershell.deb \ No newline at end of file diff --git a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/AssemblyScriptTest.cs b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/AssemblyScriptTest.cs index 9e4f84b2..edf0598f 100644 --- a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/AssemblyScriptTest.cs +++ b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/AssemblyScriptTest.cs @@ -37,7 +37,7 @@ public void BeforeEachTest() #if NET472 var frameworkVersion = FrameworkVersion.Net472; #else - var frameworkVersion = FrameworkVersion.Net6; + var frameworkVersion = FrameworkVersion.Net8; #endif _sut = new AssemblyScript( frameworkVersion, diff --git a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/Net472/Net472SubDomainTest.StepWithSubDomain.cs b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/Net472/Net472SubDomainTest.StepWithSubDomain.cs index c7d0a033..81886610 100644 --- a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/Net472/Net472SubDomainTest.StepWithSubDomain.cs +++ b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/Net472/Net472SubDomainTest.StepWithSubDomain.cs @@ -1,8 +1,4 @@ #if NET472 -using System; -using System.Data; -using System.IO; - namespace SqlDatabase.Adapter.AssemblyScripts.Net472; public partial class Net472SubDomainTest diff --git a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/NetCore/NetCoreSubDomainTest.cs b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/NetCore/NetCoreSubDomainTest.cs index 3fbe3f8e..ee653398 100644 --- a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/NetCore/NetCoreSubDomainTest.cs +++ b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/NetCore/NetCoreSubDomainTest.cs @@ -37,7 +37,7 @@ public void BeforeEachTest() .Returns(0); _sut = SubDomainFactory.Create( - FrameworkVersion.Net6, + FrameworkVersion.Net8, log.Object, GetType().Assembly.Location, () => File.ReadAllBytes(GetType().Assembly.Location)) diff --git a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj index 912de07e..631ec6d1 100644 --- a/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj +++ b/Sources/SqlDatabase.Adapter.AssemblyScripts.Test/SqlDatabase.Adapter.AssemblyScripts.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Adapter.AssemblyScripts NU1702 diff --git a/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj b/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj index cba2c657..47f57d02 100644 --- a/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.MsSql.Test/SqlDatabase.Adapter.MsSql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Adapter.MsSql diff --git a/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj b/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj index 1150e2db..eb7bafbc 100644 --- a/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.MySql.Test/SqlDatabase.Adapter.MySql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Adapter.MySql diff --git a/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj b/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj index 36575550..543e4d23 100644 --- a/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.PgSql.Test/SqlDatabase.Adapter.PgSql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Adapter.PgSql diff --git a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/InstallationSeekerTest.cs b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/InstallationSeekerTest.cs index 3dc5a295..73ded65f 100644 --- a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/InstallationSeekerTest.cs +++ b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/InstallationSeekerTest.cs @@ -16,8 +16,6 @@ public void BeforeAllTests() { #if NET472 var version = FrameworkVersion.Net472; -#elif NET6_0 - var version = FrameworkVersion.Net6; #elif NET8_0 var version = FrameworkVersion.Net8; #else diff --git a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/PowerShellTest.cs b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/PowerShellTest.cs index cca9ddd1..46fb61c6 100644 --- a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/PowerShellTest.cs +++ b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/PowerShellTest.cs @@ -34,8 +34,6 @@ public void BeforeAllTests() #if NET472 var version = FrameworkVersion.Net472; -#elif NET6_0 - var version = FrameworkVersion.Net6; #elif NET8_0 var version = FrameworkVersion.Net8; #else diff --git a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj index 51aba3f1..8add522c 100644 --- a/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj +++ b/Sources/SqlDatabase.Adapter.PowerShellScripts.Test/SqlDatabase.Adapter.PowerShellScripts.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Adapter.PowerShellScripts diff --git a/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs b/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs index 4544234b..0d706b66 100644 --- a/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs +++ b/Sources/SqlDatabase.Adapter.PowerShellScripts/InstallationSeeker.cs @@ -74,7 +74,7 @@ private static bool IsCompatibleVersion(FrameworkVersion runtimeVersion, Version { if (runtimeVersion == FrameworkVersion.Net9) { - return version < new Version("7.6"); + return version <= new Version("7.6"); } if (runtimeVersion == FrameworkVersion.Net8) @@ -82,11 +82,6 @@ private static bool IsCompatibleVersion(FrameworkVersion runtimeVersion, Version return version < new Version("7.5"); } - if (runtimeVersion == FrameworkVersion.Net6) - { - return version < new Version("7.3"); - } - return false; } } \ No newline at end of file diff --git a/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj b/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj index ae8edb37..1a759ba4 100644 --- a/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj +++ b/Sources/SqlDatabase.Adapter.Sql.Test/SqlDatabase.Adapter.Sql.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Adapter.Sql diff --git a/Sources/SqlDatabase.Adapter/HostedRuntime.cs b/Sources/SqlDatabase.Adapter/HostedRuntime.cs index cf71b8f4..7261b65f 100644 --- a/Sources/SqlDatabase.Adapter/HostedRuntime.cs +++ b/Sources/SqlDatabase.Adapter/HostedRuntime.cs @@ -3,7 +3,6 @@ public enum FrameworkVersion { Net472, - Net6, Net8, Net9 } diff --git a/Sources/SqlDatabase.CommandLine.Test/SqlDatabase.CommandLine.Test.csproj b/Sources/SqlDatabase.CommandLine.Test/SqlDatabase.CommandLine.Test.csproj index 3c31399e..0f1585c5 100644 --- a/Sources/SqlDatabase.CommandLine.Test/SqlDatabase.CommandLine.Test.csproj +++ b/Sources/SqlDatabase.CommandLine.Test/SqlDatabase.CommandLine.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.CommandLine diff --git a/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj b/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj index 122d2232..d57ba309 100644 --- a/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj +++ b/Sources/SqlDatabase.Configuration.Test/SqlDatabase.Configuration.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Configuration diff --git a/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj b/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj index 122d5ab1..e4d2de4a 100644 --- a/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj +++ b/Sources/SqlDatabase.FileSystem.Test/SqlDatabase.FileSystem.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.FileSystem diff --git a/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj b/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj index c5cb5b23..bd26528f 100644 --- a/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj +++ b/Sources/SqlDatabase.Sequence.Test/SqlDatabase.Sequence.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase.Sequence diff --git a/Sources/SqlDatabase.Test/Configuration/HostedRuntimeResolverTest.cs b/Sources/SqlDatabase.Test/Configuration/HostedRuntimeResolverTest.cs index fd77e28c..958a52a6 100644 --- a/Sources/SqlDatabase.Test/Configuration/HostedRuntimeResolverTest.cs +++ b/Sources/SqlDatabase.Test/Configuration/HostedRuntimeResolverTest.cs @@ -17,8 +17,6 @@ public void GetRuntime() #if NET472 var expected = FrameworkVersion.Net472; -#elif NET6_0 - var expected = FrameworkVersion.Net6; #elif NET8_0 var expected = FrameworkVersion.Net8; #else @@ -32,13 +30,13 @@ public void GetRuntime() [Test] [TestCase(".NET Framework 4.8.9181.0", "4.0.30319.42000", FrameworkVersion.Net472, TestName = ".net 4.8")] - [TestCase(".NET Core 4.6.26725.06", "4.0.30319.42000", FrameworkVersion.Net6, TestName = "6.1.0-ubuntu-18.04")] - [TestCase(".NET Core 4.6.27317.03", "4.0.30319.42000", FrameworkVersion.Net6, TestName = "6.1.3-ubuntu-18.04")] - [TestCase(".NET Core 4.6.27817.01", "4.0.30319.42000", FrameworkVersion.Net6, TestName = "6.2.2-ubuntu-18.04")] - [TestCase(".NET Core 4.6.28008.01", "4.0.30319.42000", FrameworkVersion.Net6, TestName = "6.2.4-ubuntu-18.04")] - [TestCase(".NET Core 3.1.2", "3.1.2", FrameworkVersion.Net6, TestName = "7.0.0-ubuntu-18.04")] - [TestCase(".NET Core 3.1.6", "3.1.6", FrameworkVersion.Net6, TestName = "7.0.0-ubuntu-18.04")] - [TestCase(".NET 5.0.0", "5.0.0", FrameworkVersion.Net6, TestName = "7.1.0-ubuntu-18.04")] + [TestCase(".NET Core 4.6.26725.06", "4.0.30319.42000", FrameworkVersion.Net8, TestName = "6.1.0-ubuntu-18.04")] + [TestCase(".NET Core 4.6.27317.03", "4.0.30319.42000", FrameworkVersion.Net8, TestName = "6.1.3-ubuntu-18.04")] + [TestCase(".NET Core 4.6.27817.01", "4.0.30319.42000", FrameworkVersion.Net8, TestName = "6.2.2-ubuntu-18.04")] + [TestCase(".NET Core 4.6.28008.01", "4.0.30319.42000", FrameworkVersion.Net8, TestName = "6.2.4-ubuntu-18.04")] + [TestCase(".NET Core 3.1.2", "3.1.2", FrameworkVersion.Net8, TestName = "7.0.0-ubuntu-18.04")] + [TestCase(".NET Core 3.1.6", "3.1.6", FrameworkVersion.Net8, TestName = "7.0.0-ubuntu-18.04")] + [TestCase(".NET 5.0.0", "5.0.0", FrameworkVersion.Net8, TestName = "7.1.0-ubuntu-18.04")] public void ResolveVersion(string description, string version, FrameworkVersion expected) { HostedRuntimeResolver.ResolveVersion(description, new Version(version)).ShouldBe(expected); diff --git a/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj b/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj index aaee2585..70af48a3 100644 --- a/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj +++ b/Sources/SqlDatabase.Test/SqlDatabase.Test.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 SqlDatabase diff --git a/Sources/SqlDatabase/Configuration/HostedRuntimeResolver.cs b/Sources/SqlDatabase/Configuration/HostedRuntimeResolver.cs index 482b2740..8ded7ca3 100644 --- a/Sources/SqlDatabase/Configuration/HostedRuntimeResolver.cs +++ b/Sources/SqlDatabase/Configuration/HostedRuntimeResolver.cs @@ -30,13 +30,11 @@ internal static FrameworkVersion ResolveVersion(string description, Version vers if (description.IndexOf(" Core ", StringComparison.OrdinalIgnoreCase) > 0) { - return FrameworkVersion.Net6; + return FrameworkVersion.Net8; } switch (version.Major) { - case <= 6: - return FrameworkVersion.Net6; case <= 8: return FrameworkVersion.Net8; default: diff --git a/Sources/SqlDatabase/SqlDatabase.csproj b/Sources/SqlDatabase/SqlDatabase.csproj index 1d03ab06..da2f8af5 100644 --- a/Sources/SqlDatabase/SqlDatabase.csproj +++ b/Sources/SqlDatabase/SqlDatabase.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0;net9.0;netstandard2.0 - net6.0;net8.0;net9.0 + net472;net8.0;net9.0;netstandard2.0 + net8.0;net9.0 Exe diff --git a/Sources/global.json b/Sources/global.json index fc56567f..80e1995c 100644 --- a/Sources/global.json +++ b/Sources/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "9.0.100-rc.2.24474.11", - "allowPrerelease": true, + "version": "9.0.300", + "allowPrerelease": false, "rollForward": "latestFeature" } } \ No newline at end of file