Skip to content

Commit 80a1d40

Browse files
committed
build target .net8.0
1 parent 8eaeb38 commit 80a1d40

6 files changed

Lines changed: 49 additions & 4 deletions

File tree

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
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM mcr.microsoft.com/dotnet/runtime:8.0
2+
3+
RUN apt-get update && \
4+
apt-get install -y curl && \
5+
curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.3.9/powershell_7.3.9-1.deb_amd64.deb --output powershell.deb && \
6+
dpkg -i powershell.deb && \
7+
apt-get install -f && \
8+
rm -f powershell.deb
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0
2+
3+
RUN apt-get update && \
4+
curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.3.9/powershell_7.3.9-1.deb_amd64.deb --output powershell.deb && \
5+
dpkg -i powershell.deb && \
6+
apt-get install -f && \
7+
rm -f powershell.deb

0 commit comments

Comments
 (0)