Skip to content

Commit 2f197e2

Browse files
Merge pull request #35 from max-ieremenko/feature/net8.0
target .net8.0
2 parents d39ed62 + 9ff2f94 commit 2f197e2

66 files changed

Lines changed: 127 additions & 73 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/README.md

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

55
- PowerShell Desktop 5.1
6-
- PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 7.0 tests
6+
- PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 7.0 and 8.0 tests
77
- PowerShell [7.2.1](https://github.com/PowerShell/PowerShell/releases/tag/v7.2.1) for .net 6.0 tests
88
- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild/5.10.4) -RequiredVersion 5.10.4
99
- Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries/3.4.1) -RequiredVersion 3.4.1
1010
- .net framework 4.7.2+ sdk
11-
- .net 7.0 sdk
11+
- .net 8.0 sdk
1212
- docker, switched to linux containers
1313

1414
## How to build

Build/install-dependencies.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ $ErrorActionPreference = "Stop"
1717

1818
if (".net" -in $List) {
1919
Invoke-InstallDotNet -Version "6.0.319"
20+
Invoke-InstallDotNet -Version "7.0.100"
2021

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

Build/tasks/build-tasks.ps1

Lines changed: 9 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", "net7.0"
33+
$script:frameworks = "net472", "net6.0", "net7.0", "net8.0"
3434
$script:databases = "MsSql", "PgSql", "MySql"
3535

3636
Write-Output "PackageVersion: $($settings.version)"
@@ -109,6 +109,7 @@ task PackNuget472 PackPoweShellModule, {
109109

110110
task PackManualDownload PackGlobalTool, PackPoweShellModule, {
111111
Get-ChildItem -Path $settings.bin -Recurse -Directory -Filter "publish" | Remove-Item -Force -Recurse
112+
Get-ChildItem -Path $settings.bin -Recurse -Directory -Filter "win-arm64" | Remove-Item -Force -Recurse
112113

113114
$out = $settings.artifacts
114115
$lic = Join-Path $settings.sources "..\LICENSE.md"
@@ -205,6 +206,10 @@ task PsCoreTest {
205206
, "mcr.microsoft.com/powershell:7.2.2-ubuntu-20.04"
206207
, "mcr.microsoft.com/powershell:7.3-ubuntu-20.04")
207208

209+
foreach ($image in $images) {
210+
exec { docker pull $image }
211+
}
212+
208213
$builds = @()
209214
foreach ($image in $images) {
210215
foreach ($database in $databases) {
@@ -223,7 +228,8 @@ task PsCoreTest {
223228
task SdkToolTest {
224229
$images = $(
225230
"sqldatabase/dotnet_pwsh:6.0-sdk"
226-
, "sqldatabase/dotnet_pwsh:7.0-sdk")
231+
, "sqldatabase/dotnet_pwsh:7.0-sdk"
232+
, "sqldatabase/dotnet_pwsh:8.0-sdk")
227233

228234
$builds = @()
229235
foreach ($image in $images) {
@@ -244,6 +250,7 @@ task NetRuntimeLinuxTest {
244250
$testCases = $(
245251
@{ targetFramework = "net6.0"; image = "sqldatabase/dotnet_pwsh:6.0-runtime" }
246252
, @{ targetFramework = "net7.0"; image = "sqldatabase/dotnet_pwsh:7.0-runtime" }
253+
, @{ targetFramework = "net8.0"; image = "sqldatabase/dotnet_pwsh:8.0-runtime" }
247254
)
248255

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

Build/tasks/create-images-tasks.ps1

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
task Default `
22
BuildDotnetSdk60 `
3-
, BuildDotnetRuntime60 `
43
, BuildDotnetSdk70 `
4+
, BuildDotnetSdk80 `
5+
, BuildDotnetRuntime60 `
56
, BuildDotnetRuntime70 `
7+
, BuildDotnetRuntime80 `
68
, BuildMsSqlDatabase `
79
, BuildPgSqlDatabase `
810
, BuildMySqlDatabase
@@ -79,4 +81,24 @@ task BuildDotnetRuntime70 {
7981
-t sqldatabase/dotnet_pwsh:7.0-runtime `
8082
.
8183
}
84+
}
85+
86+
task BuildDotnetSdk80 {
87+
$dockerfile = Join-Path $context "image-dotnet-sdk-8.0.dockerfile"
88+
exec {
89+
docker build `
90+
-f $dockerfile `
91+
-t sqldatabase/dotnet_pwsh:8.0-sdk `
92+
.
93+
}
94+
}
95+
96+
task BuildDotnetRuntime80 {
97+
$dockerfile = Join-Path $context "image-dotnet-runtime-8.0.dockerfile"
98+
exec {
99+
docker build `
100+
-f $dockerfile `
101+
-t sqldatabase/dotnet_pwsh:8.0-runtime `
102+
.
103+
}
82104
}

Build/third-party-libraries/packages/nuget.org/dapper.strongname/2.1.15/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-
"net7.0"
14+
"net7.0",
15+
"net8.0"
1516
]
1617
}
1718
],

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

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

44
Used by: SqlDatabase internal
55

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

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

Build/third-party-libraries/packages/nuget.org/microsoft.codecoverage/17.7.2/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-
"net7.0"
14+
"net7.0",
15+
"net8.0"
1516
]
1617
}
1718
],

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

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

44
Used by: SqlDatabase internal
55

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

88
License: [ms-net-library](../../../../licenses/ms-net-library)
99

Build/third-party-libraries/packages/nuget.org/microsoft.net.test.sdk/17.7.2/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-
"net7.0"
14+
"net7.0",
15+
"net8.0"
1516
],
1617
"Dependencies": [
1718
{

0 commit comments

Comments
 (0)