Skip to content

Commit

Permalink
Merge pull request #62 from max-ieremenko/feature/net9
Browse files Browse the repository at this point in the history
.net 9.0
  • Loading branch information
max-ieremenko authored Nov 3, 2024
2 parents 19a31e8 + 36f7160 commit 901c31d
Show file tree
Hide file tree
Showing 68 changed files with 136 additions and 59 deletions.
3 changes: 2 additions & 1 deletion Build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
build.ps1 is designed to run on windows

- PowerShell Desktop 5.1
- PowerShell [7.5.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.5.0-preview.4) for .net 9.0 tests
- PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 8.0 tests
- PowerShell [7.2.1](https://github.com/PowerShell/PowerShell/releases/tag/v7.2.1) for .net 6.0 tests
- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild)
- Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries)
- .net framework 4.7.2+ sdk
- .net 8.0 sdk
- .net 9.0 sdk
- docker, switched to linux containers

## How to build
Expand Down
4 changes: 3 additions & 1 deletion Build/install-dependencies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ $ErrorActionPreference = 'Stop'
. (Join-Path $PSScriptRoot 'scripts/Invoke-InstallModule.ps1')

if ('.net' -in $List) {
Invoke-InstallDotNet -Version '6.0.419'
Invoke-InstallDotNet -Version '6.0.422'
Invoke-InstallDotNet -Version '8.0.403'
Invoke-InstallDotNet -Version '9.0.100-rc.2.24474.11'

$version = (Get-Content -Raw (Join-Path $PSScriptRoot '../Sources/global.json') | ConvertFrom-Json).sdk.version
Invoke-InstallDotNet -Version $version
Expand Down
6 changes: 4 additions & 2 deletions Build/tasks/build-tasks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ task Initialize {
repositoryCommitId = git rev-parse HEAD
}

$script:frameworks = 'net472', 'net6.0', 'net8.0'
$script:frameworks = 'net472', 'net6.0', 'net8.0', 'net9.0'
$script:databases = 'MsSql', 'PgSql', 'MySql'

Write-Output "PackageVersion: $($settings.version)"
Expand Down Expand Up @@ -210,7 +210,8 @@ 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 = @()
foreach ($image in $images) {
Expand All @@ -231,6 +232,7 @@ task NetRuntimeLinuxTest {
$testCases = $(
@{ targetFramework = 'net6.0'; image = 'sqldatabase/dotnet_pwsh:6.0-runtime' }
, @{ targetFramework = 'net8.0'; image = 'sqldatabase/dotnet_pwsh:8.0-runtime' }
, @{ targetFramework = 'net9.0'; image = 'sqldatabase/dotnet_pwsh:9.0-runtime' }
)

$builds = @()
Expand Down
2 changes: 1 addition & 1 deletion Build/tasks/build-tasks.unit-test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ param(
$Sources,

[Parameter(Mandatory)]
[ValidateSet('net472', 'net6.0', 'net8.0')]
[ValidateSet('net472', 'net6.0', 'net8.0', 'net9.0')]
[string]
$Framework
)
Expand Down
24 changes: 24 additions & 0 deletions Build/tasks/create-images-tasks.ps1
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
task . `
BuildDotnetSdk60 `
, BuildDotnetSdk80 `
, BuildDotnetSdk90 `
, BuildDotnetRuntime60 `
, BuildDotnetRuntime80 `
, BuildDotnetRuntime90 `
, BuildMsSqlDatabase `
, BuildPgSqlDatabase `
, BuildMySqlDatabase
Expand Down Expand Up @@ -86,4 +88,26 @@ task BuildDotnetRuntime80 {
-t sqldatabase/dotnet_pwsh:8.0-runtime `
.
}
}

task BuildDotnetSdk90 {
$dockerfile = Join-Path $context 'image-dotnet-sdk-9.0.dockerfile'
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:9.0-sdk `
.
}
}

task BuildDotnetRuntime90 {
$dockerfile = Join-Path $context 'image-dotnet-runtime-9.0.dockerfile'
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:9.0-runtime `
.
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft.CodeCoverage [17.9.0](https://www.nuget.org/packages/Microsoft.CodeCov

Used by: SqlDatabase internal

Target frameworks: net472, net6.0, net8.0
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
],
"Dependencies": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft.NET.Test.Sdk [17.9.0](https://www.nuget.org/packages/Microsoft.NET.Tes

Used by: SqlDatabase internal

Target frameworks: net472, net6.0, net8.0
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
],
"Dependencies": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft.TestPlatform.ObjectModel [17.9.0](https://www.nuget.org/packages/Micro

Used by: SqlDatabase internal

Target frameworks: net472, net6.0, net8.0
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
],
"Dependencies": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft.TestPlatform.TestHost [17.9.0](https://www.nuget.org/packages/Microsof

Used by: SqlDatabase internal

Target frameworks: net472, net6.0, net8.0
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"net472",
"net6.0",
"net8.0",
"net9.0",
"netstandard2.0"
],
"Dependencies": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, netstandard2.0
Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"net472",
"net6.0",
"net8.0",
"net9.0",
"netstandard2.0"
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, netstandard2.0
Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NUnit [4.1.0](https://www.nuget.org/packages/NUnit/4.1.0)

Used by: SqlDatabase internal

Target frameworks: net472, net6.0, net8.0
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NUnit3TestAdapter [4.5.0](https://www.nuget.org/packages/NUnit3TestAdapter/4.5.0

Used by: SqlDatabase internal

Target frameworks: net472, net6.0, net8.0
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"net472",
"net6.0",
"net8.0",
"net9.0",
"netstandard2.0"
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, netstandard2.0
Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"net472",
"net6.0",
"net8.0",
"net9.0",
"netstandard2.0"
],
"Dependencies": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, netstandard2.0
Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"TargetFrameworks": [
"net472",
"net6.0",
"net8.0"
"net8.0",
"net9.0"
]
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Target frameworks: net472, net6.0, net8.0, net9.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"net472",
"net6.0",
"net8.0",
"net9.0",
"netstandard2.0"
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, netstandard2.0
Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"net472",
"net6.0",
"net8.0",
"net9.0",
"netstandard2.0"
],
"Dependencies": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, netstandard2.0
Target frameworks: net472, net6.0, net8.0, net9.0, netstandard2.0

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

Expand Down
Loading

0 comments on commit 901c31d

Please sign in to comment.