Merge pull request #56 from max-ieremenko/build/cleanup-pwsh

max-ieremenko · web-flow · commit ceac8d00a217 · 2024-11-02T13:14:07.000+01:00
clean-up .ps1
diff --git a/Build/build.ps1 b/Build/build.ps1
@@ -5,7 +5,7 @@
 [CmdletBinding()]
 param (
     [Parameter()]
-    [ValidateSet("local", "github")] 
+    [ValidateSet('local', 'github')] 
     [string]
     $Mode,
 
@@ -15,9 +15,9 @@ param (
 )
 
 Set-StrictMode -Version Latest
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 
-$file = Join-Path $PSScriptRoot "tasks/build-tasks.ps1"
-$task = ($Mode -eq "github") ? "GithubBuild" : "LocalBuild"
+$file = Join-Path $PSScriptRoot 'tasks/build-tasks.ps1'
+$task = ($Mode -eq 'github') ? 'GithubBuild' : 'LocalBuild'
 
 Invoke-Build -File $file -Task $task -GithubToken $GithubToken
diff --git a/Build/create-images.ps1 b/Build/create-images.ps1
@@ -3,5 +3,5 @@
 
 Set-StrictMode -Version Latest
 
-$file = Join-Path $PSScriptRoot "tasks/create-images-tasks.ps1"
+$file = Join-Path $PSScriptRoot 'tasks/create-images-tasks.ps1'
 Invoke-Build -File $file
diff --git a/Build/install-dependencies.ps1 b/Build/install-dependencies.ps1
@@ -3,32 +3,32 @@
 [CmdletBinding()]
 param (
     [Parameter()]
-    [ValidateSet(".net", "InvokeBuild", "ThirdPartyLibraries")] 
+    [ValidateSet('.net', 'InvokeBuild', 'ThirdPartyLibraries')] 
     [string[]]
-    $List = (".net", "InvokeBuild", "ThirdPartyLibraries")
+    $List = ('.net', 'InvokeBuild', 'ThirdPartyLibraries')
 )
 
 Set-StrictMode -Version Latest
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 
-. (Join-Path $PSScriptRoot "scripts/Get-ModuleVersion.ps1")
-. (Join-Path $PSScriptRoot "scripts/Invoke-InstallDotNet.ps1")
-. (Join-Path $PSScriptRoot "scripts/Invoke-InstallModule.ps1")
+. (Join-Path $PSScriptRoot 'scripts/Get-ModuleVersion.ps1')
+. (Join-Path $PSScriptRoot 'scripts/Invoke-InstallDotNet.ps1')
+. (Join-Path $PSScriptRoot 'scripts/Invoke-InstallModule.ps1')
 
-if (".net" -in $List) {
-    Invoke-InstallDotNet -Version "6.0.419"
-    Invoke-InstallDotNet -Version "7.0.406"
+if ('.net' -in $List) {
+    Invoke-InstallDotNet -Version '6.0.419'
+    Invoke-InstallDotNet -Version '7.0.406'
 
-    $version = (Get-Content -Raw (Join-Path $PSScriptRoot "../Sources/global.json") | ConvertFrom-Json).sdk.version
+    $version = (Get-Content -Raw (Join-Path $PSScriptRoot '../Sources/global.json') | ConvertFrom-Json).sdk.version
     Invoke-InstallDotNet -Version $version
 }
 
-if ("InvokeBuild" -in $List) {
-    $version = Get-ModuleVersion "InvokeBuild"
-    Invoke-InstallModule -Name "InvokeBuild" -Version $version
+if ('InvokeBuild' -in $List) {
+    $version = Get-ModuleVersion 'InvokeBuild'
+    Invoke-InstallModule -Name 'InvokeBuild' -Version $version
 }
 
-if ("ThirdPartyLibraries" -in $List) {
-    $version = Get-ModuleVersion "ThirdPartyLibraries"
-    Invoke-InstallModule -Name "ThirdPartyLibraries" -Version $version
+if ('ThirdPartyLibraries' -in $List) {
+    $version = Get-ModuleVersion 'ThirdPartyLibraries'
+    Invoke-InstallModule -Name 'ThirdPartyLibraries' -Version $version
 }
diff --git a/Build/scripts/Get-ModuleVersion.ps1 b/Build/scripts/Get-ModuleVersion.ps1
@@ -5,7 +5,7 @@ function Get-ModuleVersion {
         $Name
     )
     
-    $sources = Get-Content (Join-Path $PSScriptRoot "../build.ps1") -Raw
+    $sources = Get-Content (Join-Path $PSScriptRoot '../build.ps1') -Raw
     $tokens = $null
     $errors = $null
     $modules = [Management.Automation.Language.Parser]::ParseInput($sources, [ref]$tokens, [ref]$errors).ScriptRequirements.RequiredModules
diff --git a/Build/scripts/Invoke-InstallDotNet.ps1 b/Build/scripts/Invoke-InstallDotNet.ps1
@@ -32,7 +32,7 @@ function Invoke-InstallDotNet {
         $versions = dotnet --list-sdks
         foreach ($installedVersion in $versions) {
             # 6.0.401 [C:\Program Files\dotnet\sdk]
-            $test = ($installedVersion -split " ")[0]
+            $test = ($installedVersion -split ' ')[0]
     
             if (Test-Version -Target $Version -Test $test) {
                 Write-Output ".net sdk $test is alredy installed"
@@ -41,15 +41,15 @@ function Invoke-InstallDotNet {
         }
     }
 
-    $installDir = "C:\Program Files\dotnet"
-    $installScript = "dotnet-install.ps1"
+    $installDir = 'C:\Program Files\dotnet'
+    $installScript = 'dotnet-install.ps1'
 
     if ($IsLinux) {
-        $installDir = "/usr/share/dotnet"
-        $installScript = "dotnet-install.sh"
+        $installDir = '/usr/share/dotnet'
+        $installScript = 'dotnet-install.sh'
     }
 
-    $downloadDir = Join-Path ([System.IO.Path]::GetTempPath()) "install-dotnet"
+    $downloadDir = Join-Path ([System.IO.Path]::GetTempPath()) 'install-dotnet'
     if (Test-Path $downloadDir) {
         Remove-Item -Path $downloadDir -Recurse -Force
     }
diff --git a/Build/scripts/Invoke-InstallModule.ps1 b/Build/scripts/Invoke-InstallModule.ps1
@@ -10,7 +10,7 @@ function Invoke-InstallModule {
         $Version
     )
 
-    $test = Get-InstalledModule -Name $Name -MinimumVersion $Version -ErrorAction "SilentlyContinue"
+    $test = Get-InstalledModule -Name $Name -MinimumVersion $Version -ErrorAction 'SilentlyContinue'
     if ($test) {
         Write-Output "$Name $($test.Version) is alredy installed"
         return
diff --git a/Build/scripts/Start-Container.ps1 b/Build/scripts/Start-Container.ps1
@@ -18,13 +18,13 @@ function Start-Container {
     
     $ip = exec { 
         docker inspect `
-            --format "{{.NetworkSettings.Networks.bridge.IPAddress}}"  `
+            --format '{{.NetworkSettings.Networks.bridge.IPAddress}}'  `
             $containerId
     }
 
     $hostPort = exec { 
         docker inspect `
-            --format "{{(index (index .NetworkSettings.Ports \""$ContainerPort/tcp\"") 0).HostPort}}"  `
+            --format "{{(index (index .NetworkSettings.Ports ""$ContainerPort/tcp"") 0).HostPort}}"  `
             $containerId
     }
 
diff --git a/Build/scripts/Start-Mssql.ps1 b/Build/scripts/Start-Mssql.ps1
@@ -5,15 +5,15 @@ function Start-Mssql {
     $port = $container.port
 
     $builder = New-Object -TypeName System.Data.SqlClient.SqlConnectionStringBuilder
-    $builder["Initial Catalog"] = "SqlDatabaseTest"
-    $builder["User Id"] = "sa"
-    $builder["Password"] = "P@ssw0rd"
-    $builder["Connect Timeout"] = 5
+    $builder['Initial Catalog'] = 'SqlDatabaseTest'
+    $builder['User Id'] = 'sa'
+    $builder['Password'] = 'P@ssw0rd'
+    $builder['Connect Timeout'] = 5
 
-    $builder["Data Source"] = ".,$port"
+    $builder['Data Source'] = ".,$port"
     $connectionString = $builder.ToString()
     
-    $builder["Data Source"] = $container.ip
+    $builder['Data Source'] = $container.ip
     $remoteConnectionString = $builder.ToString()
 
     return @{
diff --git a/Build/scripts/Start-Mysql.ps1 b/Build/scripts/Start-Mysql.ps1
@@ -1,18 +1,18 @@
 function Start-Mysql {
     param ()
     
-    $sqlConnectordll = Join-Path $env:USERPROFILE "\.nuget\packages\mysqlconnector\1.3.10\lib\netstandard2.0\MySqlConnector.dll"
+    $sqlConnectordll = Join-Path $env:USERPROFILE '\.nuget\packages\mysqlconnector\1.3.10\lib\netstandard2.0\MySqlConnector.dll'
     Add-Type -Path $sqlConnectordll
 
     $container = Start-Container -Image sqldatabase/mysql:8.0.25 -ContainerPort 3306
 
     $builder = New-Object -TypeName MySqlConnector.MySqlConnectionStringBuilder
-    $builder["Database"] = "sqldatabasetest"
-    $builder["User ID"] = "root"
-    $builder["Password"] = "qwerty"
-    $builder["ConnectionTimeout"] = 5
+    $builder['Database'] = 'sqldatabasetest'
+    $builder['User ID'] = 'root'
+    $builder['Password'] = 'qwerty'
+    $builder['ConnectionTimeout'] = 5
 
-    $builder.Server = "localhost"
+    $builder.Server = 'localhost'
     $builder.Port = $container.port.ToString()
     $connectionString = $builder.ToString()
     
diff --git a/Build/scripts/Start-Pgsql.ps1 b/Build/scripts/Start-Pgsql.ps1
@@ -1,18 +1,18 @@
 function Start-Pgsql {
     param ()
     
-    $npgsqldll = Join-Path $env:USERPROFILE ".nuget\packages\npgsql\4.0.16\lib\netstandard2.0\Npgsql.dll"
+    $npgsqldll = Join-Path $env:USERPROFILE '.nuget\packages\npgsql\4.0.16\lib\netstandard2.0\Npgsql.dll'
     Add-Type -Path $npgsqldll
 
     $container = Start-Container -Image sqldatabase/postgres:13.3 -ContainerPort 5432
 
     $builder = New-Object -TypeName Npgsql.NpgsqlConnectionStringBuilder
-    $builder["Database"] = "sqldatabasetest"
-    $builder["Username"] = "adminuser"
-    $builder["Password"] = "qwerty"
-    $builder["Timeout"] = 5
+    $builder['Database'] = 'sqldatabasetest'
+    $builder['Username'] = 'adminuser'
+    $builder['Password'] = 'qwerty'
+    $builder['Timeout'] = 5
 
-    $builder.Host = "localhost"
+    $builder.Host = 'localhost'
     $builder.Port = $container.port.ToString()
     $connectionString = $builder.ToString()
     
diff --git a/Build/tasks/build-tasks.it-linux.ps1 b/Build/tasks/build-tasks.it-linux.ps1
@@ -5,13 +5,13 @@ param(
     , $image
 )
 
-task Default StartDatabase, UnZip, RunTest
+task . StartDatabase, UnZip, RunTest
 
 Get-ChildItem -Path (Join-Path $PSScriptRoot '../scripts') -Filter *.ps1 | ForEach-Object { . $_.FullName }
 
-$containerId = ""
-$connectionString = ""
-$remoteConnectionString = ""
+$containerId = ''
+$connectionString = ''
+$remoteConnectionString = ''
 $tempDir = Join-Path $settings.bin ([Guid]::NewGuid().ToString())
 
 Enter-Build {
@@ -38,16 +38,16 @@ task StartDatabase {
 task RunTest {
     & "Wait-$database" $connectionString
 
-    $app = $tempDir + ":/app"
-    $test = (Join-Path $settings.integrationTests $database) + ":/test"
+    $app = $tempDir + ':/app'
+    $test = (Join-Path $settings.integrationTests $database) + ':/test'
 
     exec {
         docker run --rm `
             -v $app `
             -v $test `
             --env connectionString=$remoteConnectionString `
             --env test=/test `
-            -w "/app" `
+            -w '/app' `
             $image `
             bash /test/Test.sh
     }
diff --git a/Build/tasks/build-tasks.it-ps-core.ps1 b/Build/tasks/build-tasks.it-ps-core.ps1
@@ -4,12 +4,12 @@ param(
     , $image
 )
 
-task Default StartDatabase, RunTest
+task . StartDatabase, RunTest
 
 Get-ChildItem -Path (Join-Path $PSScriptRoot '../scripts') -Filter *.ps1 | ForEach-Object { . $_.FullName }
 
-$containerId = ""
-$connectionString = ""
+$containerId = ''
+$connectionString = ''
 
 Enter-Build {
     Write-Output "$database on $image"
@@ -26,8 +26,8 @@ task StartDatabase {
 }
 
 task RunTest {
-    $app = $settings.artifactsPowerShell + ":/root/.local/share/powershell/Modules/SqlDatabase"
-    $test = (Join-Path $settings.integrationTests $database) + ":/test"
+    $app = $settings.artifactsPowerShell + ':/root/.local/share/powershell/Modules/SqlDatabase'
+    $test = (Join-Path $settings.integrationTests $database) + ':/test'
 
     exec {
         docker run --rm `
diff --git a/Build/tasks/build-tasks.it-ps-desktop.ps1 b/Build/tasks/build-tasks.it-ps-desktop.ps1
@@ -3,13 +3,13 @@ param(
     , $database
 )
 
-task Default RunContainers, CopyModule, PublishModule, RunTest
+task . RunContainers, CopyModule, PublishModule, RunTest
 
 Get-ChildItem -Path (Join-Path $PSScriptRoot '../scripts') -Filter *.ps1 | ForEach-Object { . $_.FullName }
 
-$containerId = ""
-$connectionString = ""
-$testDir = Join-Path ([Environment]::GetFolderPath("MyDocuments")) "WindowsPowerShell\modules\SqlDatabase"
+$containerId = ''
+$connectionString = ''
+$testDir = Join-Path ([Environment]::GetFolderPath('MyDocuments')) 'WindowsPowerShell\modules\SqlDatabase'
 
 task CopyModule {
     if (Test-Path $testDir) {
@@ -20,7 +20,7 @@ task CopyModule {
 }
 
 task PublishModule {
-    $log = Join-Path $settings.artifacts "Publish-Module.whatif.log"
+    $log = Join-Path $settings.artifacts 'Publish-Module.whatif.log'
     $command = "Publish-Module -Name SqlDatabase -WhatIf -Verbose -NuGetApiKey 123 *> $log"
 
     exec { powershell -NoLogo -Command "$command" }
diff --git a/Build/tasks/build-tasks.it-tool-linux.ps1 b/Build/tasks/build-tasks.it-tool-linux.ps1
@@ -4,12 +4,12 @@ param(
     , $image
 )
 
-task Default StartDatabase, RunTest
+task . StartDatabase, RunTest
 
 Get-ChildItem -Path (Join-Path $PSScriptRoot '../scripts') -Filter *.ps1 | ForEach-Object { . $_.FullName }
 
-$containerId = ""
-$connectionString = ""
+$containerId = ''
+$connectionString = ''
 
 Enter-Build {
     Write-Output "$database on $image"
@@ -29,7 +29,7 @@ task RunTest {
     $packageVersion = $settings.version
     $packageName = "SqlDatabase.GlobalTool.$packageVersion.nupkg"
     $app = (Join-Path $settings.artifacts $packageName) + ":/app/$packageName"
-    $test = (Join-Path $settings.integrationTests $database) + ":/test"
+    $test = (Join-Path $settings.integrationTests $database) + ':/test'
 
     exec {
         docker run -it --rm `
diff --git a/Build/tasks/build-tasks.it-win.ps1 b/Build/tasks/build-tasks.it-win.ps1
@@ -4,12 +4,12 @@ param(
     , $database
 )
 
-task Default StartDatabase, UnZip, RunTest
+task . StartDatabase, UnZip, RunTest
 
 Get-ChildItem -Path (Join-Path $PSScriptRoot '../scripts') -Filter *.ps1 | ForEach-Object { . $_.FullName }
 
-$containerId = ""
-$connectionString = ""
+$containerId = ''
+$connectionString = ''
 $tempDir = Join-Path $settings.bin ([Guid]::NewGuid().ToString())
 
 Enter-Build {
@@ -35,9 +35,9 @@ task StartDatabase {
 task RunTest {
     & "Wait-$database" $connectionString
 
-    $app = Join-Path $tempDir "SqlDatabase.exe"
+    $app = Join-Path $tempDir 'SqlDatabase.exe'
     $script = (Join-Path $settings.integrationTests $database)
-    $script = Join-Path $script "Test.ps1"
+    $script = Join-Path $script 'Test.ps1'
 
     & $script $app $connectionString
 }
diff --git a/Build/tasks/build-tasks.ps1 b/Build/tasks/build-tasks.ps1
diff --git a/Build/tasks/build-tasks.third-party.ps1 b/Build/tasks/build-tasks.third-party.ps1
diff --git a/Build/tasks/build-tasks.unit-test.ps1 b/Build/tasks/build-tasks.unit-test.ps1
diff --git a/Build/tasks/create-images-tasks.ps1 b/Build/tasks/create-images-tasks.ps1

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ function Get-ModuleVersion {`
`5`	`5`	`$Name`
`6`	`6`	`)`
`7`	`7`
`8`		`- $sources = Get-Content (Join-Path $PSScriptRoot "../build.ps1") -Raw`
	`8`	`+ $sources = Get-Content (Join-Path $PSScriptRoot '../build.ps1') -Raw`
`9`	`9`	`$tokens = $null`
`10`	`10`	`$errors = $null`
`11`	`11`	`$modules = [Management.Automation.Language.Parser]::ParseInput($sources, [ref]$tokens, [ref]$errors).ScriptRequirements.RequiredModules`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ function Invoke-InstallModule {`
`10`	`10`	`$Version`
`11`	`11`	`)`
`12`	`12`
`13`		`- $test = Get-InstalledModule -Name $Name -MinimumVersion $Version -ErrorAction "SilentlyContinue"`
	`13`	`+ $test = Get-InstalledModule -Name $Name -MinimumVersion $Version -ErrorAction 'SilentlyContinue'`
`14`	`14`	`if ($test) {`
`15`	`15`	`Write-Output "$Name $($test.Version) is alredy installed"`
`16`	`16`	`return`
Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@ function Start-Container {`
`18`	`18`
`19`	`19`	`$ip = exec {`
`20`	`20`	docker inspect `
`21`		- --format "{{.NetworkSettings.Networks.bridge.IPAddress}}" `
	`21`	+ --format '{{.NetworkSettings.Networks.bridge.IPAddress}}' `
`22`	`22`	`$containerId`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`$hostPort = exec {`
`26`	`26`	docker inspect `
`27`		- --format "{{(index (index .NetworkSettings.Ports \""$ContainerPort/tcp\"") 0).HostPort}}" `
	`27`	+ --format "{{(index (index .NetworkSettings.Ports ""$ContainerPort/tcp"") 0).HostPort}}" `
`28`	`28`	`$containerId`
`29`	`29`	`}`
`30`	`30`