Skip to content

Commit 4af8824

Browse files
Merge pull request #77 from max-ieremenko/net/10
.net 10
2 parents 807fb7e + f0442fb commit 4af8824

110 files changed

Lines changed: 170 additions & 75 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: 3 additions & 2 deletions
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.6.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.6.0-preview.4) for .net 10.0 tests
67
- PowerShell [7.5.3](https://github.com/PowerShell/PowerShell/releases/tag/v7.5.3) for .net 9.0 tests
7-
- PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 8.0 tests
8+
- PowerShell [7.4.12](https://github.com/PowerShell/PowerShell/releases/tag/v7.4.12) for .net 8.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 9.0 sdk
12+
- .net 10.0 sdk
1213
- docker, switched to linux containers
1314

1415
## How to build

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', 'net8.0', 'net9.0'
33+
$script:frameworks = 'net472', 'net8.0', 'net9.0', 'net10.0'
3434
$script:databases = 'MsSql', 'PgSql', 'MySql'
3535

3636
Write-Output "PackageVersion: $($settings.version)"
@@ -211,7 +211,8 @@ task PsCoreTest {
211211
task SdkToolTest {
212212
$images = $(
213213
'sqldatabase/dotnet_pwsh:8.0-sdk'
214-
, 'sqldatabase/dotnet_pwsh:9.0-sdk')
214+
, 'sqldatabase/dotnet_pwsh:9.0-sdk'
215+
, 'sqldatabase/dotnet_pwsh:10.0-sdk')
215216

216217
$builds = @()
217218
foreach ($image in $images) {
@@ -232,6 +233,7 @@ task NetRuntimeLinuxTest {
232233
$testCases = $(
233234
@{ targetFramework = 'net8.0'; image = 'sqldatabase/dotnet_pwsh:8.0-runtime' }
234235
, @{ targetFramework = 'net9.0'; image = 'sqldatabase/dotnet_pwsh:9.0-runtime' }
236+
, @{ targetFramework = 'net10.0'; image = 'sqldatabase/dotnet_pwsh:10.0-runtime' }
235237
)
236238

237239
$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', 'net8.0', 'net9.0')]
8+
[ValidateSet('net472', 'net8.0', 'net9.0', 'net10.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
BuildDotnetSdk80 `
33
, BuildDotnetSdk90 `
4+
, BuildDotnetSdk100 `
45
, BuildDotnetRuntime80 `
56
, BuildDotnetRuntime90 `
7+
, BuildDotnetRuntime100 `
68
, BuildMsSqlDatabase `
79
, BuildPgSqlDatabase `
810
, BuildMySqlDatabase
@@ -86,4 +88,26 @@ task BuildDotnetRuntime90 {
8688
-t sqldatabase/dotnet_pwsh:9.0-runtime `
8789
.
8890
}
91+
}
92+
93+
task BuildDotnetSdk100 {
94+
$dockerfile = Join-Path $context 'image-dotnet-sdk-10.0.dockerfile'
95+
exec {
96+
docker build `
97+
--pull `
98+
-f $dockerfile `
99+
-t sqldatabase/dotnet_pwsh:10.0-sdk `
100+
.
101+
}
102+
}
103+
104+
task BuildDotnetRuntime100 {
105+
$dockerfile = Join-Path $context 'image-dotnet-runtime-10.0.dockerfile'
106+
exec {
107+
docker build `
108+
--pull `
109+
-f $dockerfile `
110+
-t sqldatabase/dotnet_pwsh:10.0-runtime `
111+
.
112+
}
89113
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"Name": "SqlDatabase",
1111
"InternalOnly": true,
1212
"TargetFrameworks": [
13+
"net10.0",
1314
"net472",
1415
"net8.0",
1516
"net9.0"

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

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

44
Used by: SqlDatabase internal
55

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

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

Build/third-party-libraries/packages/nuget.org/microsoft.applicationinsights/2.23.0/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"Name": "SqlDatabase",
1111
"InternalOnly": true,
1212
"TargetFrameworks": [
13+
"net10.0",
1314
"net472",
1415
"net8.0",
1516
"net9.0"

Build/third-party-libraries/packages/nuget.org/microsoft.applicationinsights/2.23.0/readme.md

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

44
Used by: SqlDatabase internal
55

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

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

Build/third-party-libraries/packages/nuget.org/microsoft.bcl.asyncinterfaces/9.0.1/index.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"Name": "SqlDatabase",
1111
"InternalOnly": true,
1212
"TargetFrameworks": [
13+
"net10.0",
1314
"net472",
1415
"net8.0",
1516
"net9.0"

Build/third-party-libraries/packages/nuget.org/microsoft.bcl.asyncinterfaces/9.0.1/readme.md

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

44
Used by: SqlDatabase internal
55

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

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

0 commit comments

Comments
 (0)