Skip to content

Commit 5043e23

Browse files
Merge pull request #72 from max-ieremenko/remove/net6
remove .net 6
2 parents bafca14 + a83dca9 commit 5043e23

78 files changed

Lines changed: 60 additions & 144 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Build/install-dependencies.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ $ErrorActionPreference = 'Stop'
1616
. (Join-Path $PSScriptRoot 'scripts/Invoke-InstallModule.ps1')
1717

1818
if ('.net' -in $List) {
19-
Invoke-InstallDotNet -Version '6.0.422'
2019
Invoke-InstallDotNet -Version '8.0.403'
21-
Invoke-InstallDotNet -Version '9.0.100-rc.2.24474.11'
20+
Invoke-InstallDotNet -Version '9.0.300'
2221

2322
$version = (Get-Content -Raw (Join-Path $PSScriptRoot '../Sources/global.json') | ConvertFrom-Json).sdk.version
2423
Invoke-InstallDotNet -Version $version

Build/show-powershell-images.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ function Get-ShortVersion {
2929
}
3030
}
3131

32+
# https://learn.microsoft.com/en-us/powershell/scripting/install/powershell-support-lifecycle
3233
(Invoke-RestMethod -Uri 'https://mcr.microsoft.com/v2/powershell/tags/list').tags `
3334
| Where-Object { ($_ -Like '[0-9]*') -or ($_ -Like 'preview-[0-9]*') } `
3435
| Get-ShortVersion `

Build/tasks/build-tasks.ps1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ task Initialize {
3030
repositoryCommitId = git rev-parse HEAD
3131
}
3232

33-
$script:frameworks = 'net472', 'net6.0', 'net8.0', 'net9.0'
33+
$script:frameworks = 'net472', 'net8.0', 'net9.0'
3434
$script:databases = 'MsSql', 'PgSql', 'MySql'
3535

3636
Write-Output "PackageVersion: $($settings.version)"
@@ -209,8 +209,7 @@ task PsCoreTest {
209209

210210
task SdkToolTest {
211211
$images = $(
212-
'sqldatabase/dotnet_pwsh:6.0-sdk'
213-
, 'sqldatabase/dotnet_pwsh:8.0-sdk'
212+
'sqldatabase/dotnet_pwsh:8.0-sdk'
214213
, 'sqldatabase/dotnet_pwsh:9.0-sdk')
215214

216215
$builds = @()
@@ -230,8 +229,7 @@ task SdkToolTest {
230229

231230
task NetRuntimeLinuxTest {
232231
$testCases = $(
233-
@{ targetFramework = 'net6.0'; image = 'sqldatabase/dotnet_pwsh:6.0-runtime' }
234-
, @{ targetFramework = 'net8.0'; image = 'sqldatabase/dotnet_pwsh:8.0-runtime' }
232+
@{ targetFramework = 'net8.0'; image = 'sqldatabase/dotnet_pwsh:8.0-runtime' }
235233
, @{ targetFramework = 'net9.0'; image = 'sqldatabase/dotnet_pwsh:9.0-runtime' }
236234
)
237235

Build/tasks/build-tasks.unit-test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ param(
55
$Sources,
66

77
[Parameter(Mandatory)]
8-
[ValidateSet('net472', 'net6.0', 'net8.0', 'net9.0')]
8+
[ValidateSet('net472', 'net8.0', 'net9.0')]
99
[string]
1010
$Framework
1111
)

Build/tasks/create-images-tasks.ps1

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
task . `
2-
BuildDotnetSdk60 `
3-
, BuildDotnetSdk80 `
2+
BuildDotnetSdk80 `
43
, BuildDotnetSdk90 `
5-
, BuildDotnetRuntime60 `
64
, BuildDotnetRuntime80 `
75
, BuildDotnetRuntime90 `
86
, BuildMsSqlDatabase `
@@ -46,28 +44,6 @@ task BuildMySqlDatabase {
4644
}
4745
}
4846

49-
task BuildDotnetSdk60 {
50-
$dockerfile = Join-Path $context 'image-dotnet-sdk-6.0.dockerfile'
51-
exec {
52-
docker build `
53-
--pull `
54-
-f $dockerfile `
55-
-t sqldatabase/dotnet_pwsh:6.0-sdk `
56-
.
57-
}
58-
}
59-
60-
task BuildDotnetRuntime60 {
61-
$dockerfile = Join-Path $context 'image-dotnet-runtime-6.0.dockerfile'
62-
exec {
63-
docker build `
64-
--pull `
65-
-f $dockerfile `
66-
-t sqldatabase/dotnet_pwsh:6.0-runtime `
67-
.
68-
}
69-
}
70-
7147
task BuildDotnetSdk80 {
7248
$dockerfile = Join-Path $context 'image-dotnet-sdk-8.0.dockerfile'
7349
exec {

Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/index.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"InternalOnly": true,
1212
"TargetFrameworks": [
1313
"net472",
14-
"net6.0",
1514
"net8.0",
1615
"net9.0"
1716
]

Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.35/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Dapper.StrongName [2.1.35](https://www.nuget.org/packages/Dapper.StrongName/2.1.
33

44
Used by: SqlDatabase internal
55

6-
Target frameworks: net472, net6.0, net8.0, net9.0
6+
Target frameworks: net472, net8.0, net9.0
77

88
License: [Apache-2.0](../../../../licenses/apache-2.0)
99

Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/index.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"InternalOnly": true,
1212
"TargetFrameworks": [
1313
"net472",
14-
"net6.0",
1514
"net8.0",
1615
"net9.0"
1716
]

Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.11.1/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft.CodeCoverage [17.11.1](https://www.nuget.org/packages/Microsoft.CodeCo
33

44
Used by: SqlDatabase internal
55

6-
Target frameworks: net472, net6.0, net8.0, net9.0
6+
Target frameworks: net472, net8.0, net9.0
77

88
License: [MIT](../../../../licenses/mit)
99

Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.11.1/index.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"InternalOnly": true,
1212
"TargetFrameworks": [
1313
"net472",
14-
"net6.0",
1514
"net8.0",
1615
"net9.0"
1716
],

0 commit comments

Comments
 (0)