Skip to content

Commit 901c31d

Browse files
Merge pull request #62 from max-ieremenko/feature/net9
.net 9.0
2 parents 19a31e8 + 36f7160 commit 901c31d

File tree

68 files changed

+136
-59
lines changed

Some content is hidden

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

68 files changed

+136
-59
lines changed

Build/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
build.ps1 is designed to run on windows
44

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

1415
## How to build

Build/install-dependencies.ps1

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

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

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

Build/tasks/build-tasks.ps1

Lines changed: 4 additions & 2 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'
33+
$script:frameworks = 'net472', 'net6.0', 'net8.0', 'net9.0'
3434
$script:databases = 'MsSql', 'PgSql', 'MySql'
3535

3636
Write-Output "PackageVersion: $($settings.version)"
@@ -210,7 +210,8 @@ task PsCoreTest {
210210
task SdkToolTest {
211211
$images = $(
212212
'sqldatabase/dotnet_pwsh:6.0-sdk'
213-
, 'sqldatabase/dotnet_pwsh:8.0-sdk')
213+
, 'sqldatabase/dotnet_pwsh:8.0-sdk'
214+
, 'sqldatabase/dotnet_pwsh:9.0-sdk')
214215

215216
$builds = @()
216217
foreach ($image in $images) {
@@ -231,6 +232,7 @@ task NetRuntimeLinuxTest {
231232
$testCases = $(
232233
@{ targetFramework = 'net6.0'; image = 'sqldatabase/dotnet_pwsh:6.0-runtime' }
233234
, @{ targetFramework = 'net8.0'; image = 'sqldatabase/dotnet_pwsh:8.0-runtime' }
235+
, @{ targetFramework = 'net9.0'; image = 'sqldatabase/dotnet_pwsh:9.0-runtime' }
234236
)
235237

236238
$builds = @()

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')]
8+
[ValidateSet('net472', 'net6.0', 'net8.0', 'net9.0')]
99
[string]
1010
$Framework
1111
)

Build/tasks/create-images-tasks.ps1

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
task . `
22
BuildDotnetSdk60 `
33
, BuildDotnetSdk80 `
4+
, BuildDotnetSdk90 `
45
, BuildDotnetRuntime60 `
56
, BuildDotnetRuntime80 `
7+
, BuildDotnetRuntime90 `
68
, BuildMsSqlDatabase `
79
, BuildPgSqlDatabase `
810
, BuildMySqlDatabase
@@ -86,4 +88,26 @@ task BuildDotnetRuntime80 {
8688
-t sqldatabase/dotnet_pwsh:8.0-runtime `
8789
.
8890
}
91+
}
92+
93+
task BuildDotnetSdk90 {
94+
$dockerfile = Join-Path $context 'image-dotnet-sdk-9.0.dockerfile'
95+
exec {
96+
docker build `
97+
--pull `
98+
-f $dockerfile `
99+
-t sqldatabase/dotnet_pwsh:9.0-sdk `
100+
.
101+
}
102+
}
103+
104+
task BuildDotnetRuntime90 {
105+
$dockerfile = Join-Path $context 'image-dotnet-runtime-9.0.dockerfile'
106+
exec {
107+
docker build `
108+
--pull `
109+
-f $dockerfile `
110+
-t sqldatabase/dotnet_pwsh:9.0-runtime `
111+
.
112+
}
89113
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"TargetFrameworks": [
1212
"net472",
1313
"net6.0",
14-
"net8.0"
14+
"net8.0",
15+
"net9.0"
1516
]
1617
}
1718
],

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
6+
Target frameworks: net472, net6.0, 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.9.0/index.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"TargetFrameworks": [
1212
"net472",
1313
"net6.0",
14-
"net8.0"
14+
"net8.0",
15+
"net9.0"
1516
]
1617
}
1718
],

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

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

44
Used by: SqlDatabase internal
55

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

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"TargetFrameworks": [
1212
"net472",
1313
"net6.0",
14-
"net8.0"
14+
"net8.0",
15+
"net9.0"
1516
],
1617
"Dependencies": [
1718
{

0 commit comments

Comments
 (0)