Skip to content

Commit 64ada59

Browse files
max-ieremenkomax-ieremenko
authored
Merge pull request #68 from max-ieremenko/release/4.3.0
release 4.3.0
2 parents 49e4e05 + 68ff879 commit 64ada59

312 files changed

Lines changed: 3148 additions & 1631 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: 5 additions & 4 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.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 7.0 and 8.0 tests
6+
- PowerShell [7.5.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.5.0-preview.4) 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
78
- PowerShell [7.2.1](https://github.com/PowerShell/PowerShell/releases/tag/v7.2.1) for .net 6.0 tests
8-
- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild/5.11.1) -RequiredVersion 5.11.1
9-
- Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries/3.5.1) -RequiredVersion 3.5.1
9+
- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild)
10+
- 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/build.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#Requires -Version "7.0"
2-
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.1" }
3-
#Requires -Modules @{ ModuleName="ThirdPartyLibraries"; ModuleVersion="3.5.1" }
2+
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.3" }
3+
#Requires -Modules @{ ModuleName="ThirdPartyLibraries"; ModuleVersion="3.6.0" }
44

55
[CmdletBinding()]
66
param (
77
[Parameter()]
8-
[ValidateSet("local", "github")]
8+
[ValidateSet('local', 'github')]
99
[string]
1010
$Mode,
1111

@@ -15,9 +15,9 @@ param (
1515
)
1616

1717
Set-StrictMode -Version Latest
18-
$ErrorActionPreference = "Stop"
18+
$ErrorActionPreference = 'Stop'
1919

20-
$file = Join-Path $PSScriptRoot "tasks/build-tasks.ps1"
21-
$task = ($Mode -eq "github") ? "GithubBuild" : "LocalBuild"
20+
$file = Join-Path $PSScriptRoot 'tasks/build-tasks.ps1'
21+
$task = ($Mode -eq 'github') ? 'GithubBuild' : 'LocalBuild'
2222

2323
Invoke-Build -File $file -Task $task -GithubToken $GithubToken

‎Build/create-images.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Requires -Version "7.0"
2-
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.0" }
2+
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.3" }
33

44
Set-StrictMode -Version Latest
55

6-
$file = Join-Path $PSScriptRoot "tasks/create-images-tasks.ps1"
6+
$file = Join-Path $PSScriptRoot 'tasks/create-images-tasks.ps1'
77
Invoke-Build -File $file

‎Build/install-dependencies.ps1‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,33 @@
33
[CmdletBinding()]
44
param (
55
[Parameter()]
6-
[ValidateSet(".net", "InvokeBuild", "ThirdPartyLibraries")]
6+
[ValidateSet('.net', 'InvokeBuild', 'ThirdPartyLibraries')]
77
[string[]]
8-
$List = (".net", "InvokeBuild", "ThirdPartyLibraries")
8+
$List = ('.net', 'InvokeBuild', 'ThirdPartyLibraries')
99
)
1010

1111
Set-StrictMode -Version Latest
12-
$ErrorActionPreference = "Stop"
12+
$ErrorActionPreference = 'Stop'
1313

14-
. (Join-Path $PSScriptRoot "scripts/Get-ModuleVersion.ps1")
15-
. (Join-Path $PSScriptRoot "scripts/Invoke-InstallDotNet.ps1")
16-
. (Join-Path $PSScriptRoot "scripts/Invoke-InstallModule.ps1")
14+
. (Join-Path $PSScriptRoot 'scripts/Get-ModuleVersion.ps1')
15+
. (Join-Path $PSScriptRoot 'scripts/Invoke-InstallDotNet.ps1')
16+
. (Join-Path $PSScriptRoot 'scripts/Invoke-InstallModule.ps1')
1717

18-
if (".net" -in $List) {
19-
Invoke-InstallDotNet -Version "6.0.419"
20-
Invoke-InstallDotNet -Version "7.0.406"
18+
if ('.net' -in $List) {
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'
2122

22-
$version = (Get-Content -Raw (Join-Path $PSScriptRoot "../Sources/global.json") | ConvertFrom-Json).sdk.version
23+
$version = (Get-Content -Raw (Join-Path $PSScriptRoot '../Sources/global.json') | ConvertFrom-Json).sdk.version
2324
Invoke-InstallDotNet -Version $version
2425
}
2526

26-
if ("InvokeBuild" -in $List) {
27-
$version = Get-ModuleVersion "InvokeBuild"
28-
Invoke-InstallModule -Name "InvokeBuild" -Version $version
27+
if ('InvokeBuild' -in $List) {
28+
$version = Get-ModuleVersion 'InvokeBuild'
29+
Invoke-InstallModule -Name 'InvokeBuild' -Version $version
2930
}
3031

31-
if ("ThirdPartyLibraries" -in $List) {
32-
$version = Get-ModuleVersion "ThirdPartyLibraries"
33-
Invoke-InstallModule -Name "ThirdPartyLibraries" -Version $version
32+
if ('ThirdPartyLibraries' -in $List) {
33+
$version = Get-ModuleVersion 'ThirdPartyLibraries'
34+
Invoke-InstallModule -Name 'ThirdPartyLibraries' -Version $version
3435
}

‎Build/scripts/Get-ModuleVersion.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Get-ModuleVersion {
55
$Name
66
)
77

8-
$sources = Get-Content (Join-Path $PSScriptRoot "../build.ps1") -Raw
8+
$sources = Get-Content (Join-Path $PSScriptRoot '../build.ps1') -Raw
99
$tokens = $null
1010
$errors = $null
1111
$modules = [Management.Automation.Language.Parser]::ParseInput($sources, [ref]$tokens, [ref]$errors).ScriptRequirements.RequiredModules

‎Build/scripts/Invoke-InstallDotNet.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function Invoke-InstallDotNet {
3232
$versions = dotnet --list-sdks
3333
foreach ($installedVersion in $versions) {
3434
# 6.0.401 [C:\Program Files\dotnet\sdk]
35-
$test = ($installedVersion -split " ")[0]
35+
$test = ($installedVersion -split ' ')[0]
3636

3737
if (Test-Version -Target $Version -Test $test) {
3838
Write-Output ".net sdk $test is alredy installed"
@@ -41,15 +41,15 @@ function Invoke-InstallDotNet {
4141
}
4242
}
4343

44-
$installDir = "C:\Program Files\dotnet"
45-
$installScript = "dotnet-install.ps1"
44+
$installDir = 'C:\Program Files\dotnet'
45+
$installScript = 'dotnet-install.ps1'
4646

4747
if ($IsLinux) {
48-
$installDir = "/usr/share/dotnet"
49-
$installScript = "dotnet-install.sh"
48+
$installDir = '/usr/share/dotnet'
49+
$installScript = 'dotnet-install.sh'
5050
}
5151

52-
$downloadDir = Join-Path ([System.IO.Path]::GetTempPath()) "install-dotnet"
52+
$downloadDir = Join-Path ([System.IO.Path]::GetTempPath()) 'install-dotnet'
5353
if (Test-Path $downloadDir) {
5454
Remove-Item -Path $downloadDir -Recurse -Force
5555
}

‎Build/scripts/Invoke-InstallModule.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function Invoke-InstallModule {
1010
$Version
1111
)
1212

13-
$test = Get-InstalledModule -Name $Name -MinimumVersion $Version -ErrorAction "SilentlyContinue"
13+
$test = Get-InstalledModule -Name $Name -MinimumVersion $Version -ErrorAction 'SilentlyContinue'
1414
if ($test) {
1515
Write-Output "$Name $($test.Version) is alredy installed"
1616
return

‎Build/scripts/Start-Container.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ function Start-Container {
1818

1919
$ip = exec {
2020
docker inspect `
21-
--format "{{.NetworkSettings.Networks.bridge.IPAddress}}" `
21+
--format '{{.NetworkSettings.Networks.bridge.IPAddress}}' `
2222
$containerId
2323
}
2424

2525
$hostPort = exec {
2626
docker inspect `
27-
--format "{{(index (index .NetworkSettings.Ports \""$ContainerPort/tcp\"") 0).HostPort}}" `
27+
--format "{{(index (index .NetworkSettings.Ports ""$ContainerPort/tcp"") 0).HostPort}}" `
2828
$containerId
2929
}
3030

‎Build/scripts/Start-Mssql.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ function Start-Mssql {
55
$port = $container.port
66

77
$builder = New-Object -TypeName System.Data.SqlClient.SqlConnectionStringBuilder
8-
$builder["Initial Catalog"] = "SqlDatabaseTest"
9-
$builder["User Id"] = "sa"
10-
$builder["Password"] = "P@ssw0rd"
11-
$builder["Connect Timeout"] = 5
8+
$builder['Initial Catalog'] = 'SqlDatabaseTest'
9+
$builder['User Id'] = 'sa'
10+
$builder['Password'] = 'P@ssw0rd'
11+
$builder['Connect Timeout'] = 5
1212

13-
$builder["Data Source"] = ".,$port"
13+
$builder['Data Source'] = ".,$port"
1414
$connectionString = $builder.ToString()
1515

16-
$builder["Data Source"] = $container.ip
16+
$builder['Data Source'] = $container.ip
1717
$remoteConnectionString = $builder.ToString()
1818

1919
return @{

‎Build/scripts/Start-Mysql.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
function Start-Mysql {
22
param ()
33

4-
$sqlConnectordll = Join-Path $env:USERPROFILE "\.nuget\packages\mysqlconnector\1.3.10\lib\netstandard2.0\MySqlConnector.dll"
4+
$sqlConnectordll = Join-Path $env:USERPROFILE '\.nuget\packages\mysqlconnector\1.3.10\lib\netstandard2.0\MySqlConnector.dll'
55
Add-Type -Path $sqlConnectordll
66

77
$container = Start-Container -Image sqldatabase/mysql:8.0.25 -ContainerPort 3306
88

99
$builder = New-Object -TypeName MySqlConnector.MySqlConnectionStringBuilder
10-
$builder["Database"] = "sqldatabasetest"
11-
$builder["User ID"] = "root"
12-
$builder["Password"] = "qwerty"
13-
$builder["ConnectionTimeout"] = 5
10+
$builder['Database'] = 'sqldatabasetest'
11+
$builder['User ID'] = 'root'
12+
$builder['Password'] = 'qwerty'
13+
$builder['ConnectionTimeout'] = 5
1414

15-
$builder.Server = "localhost"
15+
$builder.Server = 'localhost'
1616
$builder.Port = $container.port.ToString()
1717
$connectionString = $builder.ToString()
1818

0 commit comments

Comments
 (0)