Merge pull request #102 from max-ieremenko/build/cleanup

clean up
max-ieremenko · Oct 20, 2024 · e891cf4 · e891cf4
2 parents ce337ee + 1187f6f
commit e891cf4
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 113 deletions.
diff --git a/Build/build-ci.ps1 b/Build/build-ci.ps1
@@ -8,8 +8,8 @@ param (
     $GithubToken
 )
 
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 Set-StrictMode -Version Latest
 
-$file = Join-Path $PSScriptRoot "build-tasks.ps1"
+$file = Join-Path $PSScriptRoot 'build-tasks.ps1'
 Invoke-Build -File $file -Task CiBuild -GithubToken $GithubToken
diff --git a/Build/build-locally.ps1 b/Build/build-locally.ps1
@@ -1,8 +1,8 @@
 #Requires -Version "7.0"
 #Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.3" }
 
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 Set-StrictMode -Version Latest
 
-$file = Join-Path $PSScriptRoot "build-tasks.ps1"
+$file = Join-Path $PSScriptRoot 'build-tasks.ps1'
 Invoke-Build -File $file -Task LocalBuild
diff --git a/Build/build-tasks.ps1 b/Build/build-tasks.ps1
@@ -12,16 +12,16 @@ task Pack PackGlobalTool, PackPowerShellModule, PackManualDownload, PackTest
 
 Enter-Build {
     $settings = @{
-        sources    = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot "../Sources"))
-        output     = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot "../build-out"))
-        bin        = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot "../Sources/bin"))
-        repository = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot "../ThirdPartyLibraries"))
-        examples   = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot "../Examples"))
-        frameworks = "net6.0", "net8.0"
+        sources    = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../Sources'))
+        output     = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../build-out'))
+        bin        = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../Sources/bin'))
+        repository = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../ThirdPartyLibraries'))
+        examples   = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../Examples'))
+        frameworks = 'net6.0', 'net8.0'
         version    = $(
-            $buildProps = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot "../Sources/Directory.Build.props"))
-            $packageVersion = (Select-Xml -Path $buildProps -XPath "Project/PropertyGroup/DefaultPackageVersion").Node.InnerText
-            assert $packageVersion "Package version not found"
+            $buildProps = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../Sources/Directory.Build.props'))
+            $packageVersion = (Select-Xml -Path $buildProps -XPath 'Project/PropertyGroup/DefaultPackageVersion').Node.InnerText
+            assert $packageVersion 'Package version not found'
             $packageVersion
         )
     }
@@ -39,42 +39,42 @@ task Clean {
     Get-ChildItem -Path $settings.sources -Filter bin -Directory -Recurse | Remove-Item -Recurse -Force
     Get-ChildItem -Path $settings.sources -Filter obj -Directory -Recurse | Remove-Item -Recurse -Force
 
-    $nodeModules = Join-Path $settings.sources "ThirdPartyLibraries.Npm.Demo\node_modules"
+    $nodeModules = Join-Path $settings.sources 'ThirdPartyLibraries.Npm.Demo\node_modules'
     if (Test-Path $nodeModules) {
         Remove-Item -Path $nodeModules -Recurse -Force
     }
 }
 
 task Build {
-    Invoke-Build -File "tasks/build.ps1" -SourcesPath $settings.sources
+    Invoke-Build -File 'tasks/build.ps1' -SourcesPath $settings.sources
 }
 
 task ThirdPartyNotices {
     Invoke-Build `
-        -File "tasks/third-party-notices.ps1" `
-        -AppPath (Join-Path $settings.bin "app/net6.0/ThirdPartyLibraries.dll") `
+        -File 'tasks/third-party-notices.ps1' `
+        -AppPath (Join-Path $settings.bin 'app/net6.0/ThirdPartyLibraries.dll') `
         -Version $settings.version `
         -SourcesPath $settings.sources `
         -RepositoryPath $settings.repository `
-        -OutPath (Join-Path $settings.output "ThirdNotices") `
+        -OutPath (Join-Path $settings.output 'ThirdNotices') `
         -GithubToken $GithubToken
 }
 
 task UnitTest {
     $builds = @()
     foreach ($framework in $settings.frameworks) {
-        $builds += @{ File = "tasks/unit-test.ps1"; BinPath = $settings.bin; Framework = $framework }
+        $builds += @{ File = 'tasks/unit-test.ps1'; BinPath = $settings.bin; Framework = $framework }
     }
 
     Build-Parallel $builds -ShowParameter Framework -MaximumBuilds 4
 }
 
 task PackGlobalTool {
-    Invoke-Build -File "tasks/pack-global-tool.ps1" -SourcesPath $settings.sources -OutPath $settings.output
+    Invoke-Build -File 'tasks/pack-global-tool.ps1' -SourcesPath $settings.sources -OutPath $settings.output
 }
 
 task PackPowerShellModule {
-    Invoke-Build -File "tasks/pack-ps-module.ps1" `
+    Invoke-Build -File 'tasks/pack-ps-module.ps1' `
         -BinPath $settings.bin `
         -Version $settings.version `
         -OutPath $settings.output
@@ -84,7 +84,7 @@ task PackManualDownload {
     $builds = @()
     foreach ($framework in $settings.frameworks) {
         $builds += @{ 
-            File      = "tasks/pack-manual-download.ps1"
+            File      = 'tasks/pack-manual-download.ps1'
             BinPath   = $settings.bin
             Version   = $settings.version
             Framework = $framework
@@ -96,13 +96,13 @@ task PackManualDownload {
 }
 
 task PackTest {
-    $packageList = Get-ChildItem -Path $settings.output -Recurse -File -Include "*.nupkg", "*.zip" | ForEach-Object { $_.FullName }
-    assert ($packageList -and $packageList.Length) "no packages found."
+    $packageList = Get-ChildItem -Path $settings.output -Recurse -File -Include '*.nupkg', '*.zip' | ForEach-Object { $_.FullName }
+    assert ($packageList -and $packageList.Length) 'no packages found.'
 
     $builds = @()
     foreach ($package in $packageList) {
         $builds += @{ 
-            File = "tasks/pack-test.ps1"
+            File = 'tasks/pack-test.ps1'
             Path = $package
         }
     }
@@ -113,31 +113,31 @@ task PackTest {
 task PsCoreTest {
     # show-powershell-images.ps1
     $images = $(
-        "mcr.microsoft.com/powershell:7.0.0-ubuntu-18.04"
-        , "mcr.microsoft.com/powershell:7.0.1-ubuntu-18.04"
-        , "mcr.microsoft.com/powershell:7.0.2-ubuntu-18.04"
-        , "mcr.microsoft.com/powershell:7.0.3-ubuntu-18.04"
-        , "mcr.microsoft.com/powershell:7.1.0-ubuntu-18.04"
-        , "mcr.microsoft.com/powershell:7.1.1-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.1.2-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.1.3-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.1.4-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.1.5-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.2.0-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.2.1-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.2.2-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.3-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:7.4-ubuntu-20.04"
-        , "mcr.microsoft.com/powershell:preview-7.5-ubuntu-20.04")
+        'mcr.microsoft.com/powershell:7.0.0-ubuntu-18.04'
+        , 'mcr.microsoft.com/powershell:7.0.1-ubuntu-18.04'
+        , 'mcr.microsoft.com/powershell:7.0.2-ubuntu-18.04'
+        , 'mcr.microsoft.com/powershell:7.0.3-ubuntu-18.04'
+        , 'mcr.microsoft.com/powershell:7.1.0-ubuntu-18.04'
+        , 'mcr.microsoft.com/powershell:7.1.1-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.1.2-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.1.3-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.1.4-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.1.5-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.2.0-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.2.1-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.2.2-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.3-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:7.4-ubuntu-20.04'
+        , 'mcr.microsoft.com/powershell:preview-7.5-ubuntu-20.04')
 
     $builds = @()
     foreach ($image in $images) {
         exec { docker pull --quiet $image }
 
         $builds += @{
-            File           = "tasks/test-ps-module.ps1"
-            PowerShellPath = (Join-Path $settings.output "pwsh.zip")
-            TestPath       = (Join-Path $settings.sources "ThirdPartyLibraries.PowerShell.IntegrationTest")
+            File           = 'tasks/test-ps-module.ps1'
+            PowerShellPath = (Join-Path $settings.output 'pwsh.zip')
+            TestPath       = (Join-Path $settings.sources 'ThirdPartyLibraries.PowerShell.IntegrationTest')
             ImageName      = $image
         }
     }
@@ -146,29 +146,29 @@ task PsCoreTest {
 }
 
 task UpdateExamples {
-    $appPath = Join-Path $settings.bin "app/net6.0/ThirdPartyLibraries.dll"
+    $appPath = Join-Path $settings.bin 'app/net6.0/ThirdPartyLibraries.dll'
     $builds = @()
 
-    $examples = Get-ChildItem -Path (Join-Path $settings.examples "third-party-notices-template") -Directory
+    $examples = Get-ChildItem -Path (Join-Path $settings.examples 'third-party-notices-template') -Directory
     foreach ($example in $examples) {
         $builds += @{ 
-            File           = "tasks/update-example.ps1"
+            File           = 'tasks/update-example.ps1'
             AppPath        = $appPath
             ExamplePath    = $example.FullName
             RepositoryPath = $settings.repository
-            TemplatePath   = (Join-Path $example.FullName "third-party-notices-template.txt")
-            ToFileName     = "ThirdPartyNotices.txt"
+            TemplatePath   = (Join-Path $example.FullName 'third-party-notices-template.txt')
+            ToFileName     = 'ThirdPartyNotices.txt'
         }
     }
 
-    $example = Join-Path $settings.examples "export-to-csv"
+    $example = Join-Path $settings.examples 'export-to-csv'
     $builds += @{ 
-        File           = "tasks/update-example.ps1"
+        File           = 'tasks/update-example.ps1'
         AppPath        = $appPath
         ExamplePath    = $example
         RepositoryPath = $settings.repository
-        TemplatePath   = (Join-Path $example "export-template.txt")
-        ToFileName     = "packages.csv"
+        TemplatePath   = (Join-Path $example 'export-template.txt')
+        ToFileName     = 'packages.csv'
     }
 
     Build-Parallel $builds -ShowParameter ExamplePath -MaximumBuilds 1

diff --git a/Build/install-dependencies.ps1 b/Build/install-dependencies.ps1
@@ -3,24 +3,24 @@
 [CmdletBinding()]
 param (
     [Parameter()]
-    [ValidateSet(".net", "InvokeBuild")] 
+    [ValidateSet('.net', 'InvokeBuild')] 
     [string[]]
     $List
 )
 
 Set-StrictMode -Version Latest
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 
-. (Join-Path $PSScriptRoot "scripts" "Get-ModuleVersion.ps1")
+. (Join-Path $PSScriptRoot 'scripts' 'Get-ModuleVersion.ps1')
 
-if (-not $List -or (".net" -in $List)) {
-    $install = Join-Path $PSScriptRoot "scripts/Install-DotNet.ps1"
-    & $install "6.0.418"
-    & $install (Get-Content -Raw (Join-Path $PSScriptRoot "../Sources/global.json") | ConvertFrom-Json).sdk.version
+if (-not $List -or ('.net' -in $List)) {
+    $install = Join-Path $PSScriptRoot 'scripts/Install-DotNet.ps1'
+    & $install '6.0.418'
+    & $install (Get-Content -Raw (Join-Path $PSScriptRoot '../Sources/global.json') | ConvertFrom-Json).sdk.version
 }
 
-if (-not $List -or ("InvokeBuild" -in $List)) {
-    $install = Join-Path $PSScriptRoot "scripts/Install-Module.ps1"
-    $version = Get-ModuleVersion "InvokeBuild"
-    & $install "InvokeBuild" $version
+if (-not $List -or ('InvokeBuild' -in $List)) {
+    $install = Join-Path $PSScriptRoot 'scripts/Install-Module.ps1'
+    $version = Get-ModuleVersion 'InvokeBuild'
+    & $install 'InvokeBuild' $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-ci.ps1") -Raw
+    $sources = Get-Content (Join-Path $PSScriptRoot '../build-ci.ps1') -Raw
     $tokens = $null
     $errors = $null
     $modules = [Management.Automation.Language.Parser]::ParseInput($sources, [ref]$tokens, [ref]$errors).ScriptRequirements.RequiredModules

diff --git a/Build/scripts/Install-DotNet.ps1 b/Build/scripts/Install-DotNet.ps1
@@ -31,7 +31,7 @@ if (Get-Command -Name dotnet -ErrorAction SilentlyContinue) {
     $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"
@@ -40,15 +40,15 @@ if (Get-Command -Name dotnet -ErrorAction SilentlyContinue) {
     }
 }
 
-$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/tasks/build.ps1 b/Build/tasks/build.ps1
@@ -6,14 +6,14 @@ param(
     $SourcesPath
 )
 
-task Default DotnetRestore, DotnetBuild
+task . DotnetRestore, DotnetBuild
 
 task DotnetRestore {
     exec { dotnet restore $SourcesPath }
 }
 
 task DotnetBuild {
-    $sln = Join-Path $SourcesPath "ThirdPartyLibraries.sln"
+    $sln = Join-Path $SourcesPath 'ThirdPartyLibraries.sln'
     exec {
         dotnet build $sln `
             -t:Rebuild `

diff --git a/Build/tasks/pack-global-tool.ps1 b/Build/tasks/pack-global-tool.ps1
@@ -11,8 +11,8 @@ param(
     $OutPath
 )
 
-task Default {
-    $projectFile = Join-Path $SourcesPath "ThirdPartyLibraries/ThirdPartyLibraries.csproj"
+task . {
+    $projectFile = Join-Path $SourcesPath 'ThirdPartyLibraries/ThirdPartyLibraries.csproj'
 
     exec {
         dotnet pack `

diff --git a/Build/tasks/pack-manual-download.ps1 b/Build/tasks/pack-manual-download.ps1
@@ -10,7 +10,7 @@ param(
     $Version,
 
     [Parameter(Mandatory = $true)]
-    [ValidateSet("net6.0", "net8.0")] 
+    [ValidateSet('net6.0', 'net8.0')] 
     [string]
     $Framework,
 
@@ -20,8 +20,8 @@ param(
     $OutPath
 )
 
-task Default {
-    $lic = Join-Path $OutPath "ThirdNotices/*"
+task . {
+    $lic = Join-Path $OutPath 'ThirdNotices/*'
     $destination = Join-Path $OutPath "ThirdPartyLibraries.$Version-$Framework.zip"
     $source = Join-Path $BinPath "app/$Framework/publish/*"
 

diff --git a/Build/tasks/pack-ps-module.ps1 b/Build/tasks/pack-ps-module.ps1
@@ -15,18 +15,18 @@ param(
     $OutPath
 )
 
-task Default Copy, Clean, SetVersion, Zip
+task . Copy, Clean, SetVersion, Zip
 
 Enter-Build {
-    $temp = Join-Path $OutPath "pwsh"
+    $temp = Join-Path $OutPath 'pwsh'
 }
 
 Exit-Build {
     remove $temp
 }
 
 task Copy {
-    Copy-Item -Path (Join-Path $BinPath "pwsh") -Destination $temp -Recurse    
+    Copy-Item -Path (Join-Path $BinPath 'pwsh') -Destination $temp -Recurse    
 }
 
 task Clean {
@@ -35,13 +35,13 @@ task Clean {
 
 task SetVersion {
     # .psd1 set module version
-    $psdFile = Join-Path $temp "ThirdPartyLibraries.psd1"
+    $psdFile = Join-Path $temp 'ThirdPartyLibraries.psd1'
     $content = Get-Content -Path $psdFile -Raw
-    $content = $content -replace "3.2.1", $Version
+    $content = $content -replace '3.2.1', $Version
     Set-Content -Path $psdFile -Value $content
 }
 
 task Zip {
-    $lic = Join-Path $OutPath "ThirdNotices/*"
-    Compress-Archive -Path "$temp/*", $lic -DestinationPath (Join-Path $OutPath "pwsh.zip")
+    $lic = Join-Path $OutPath 'ThirdNotices/*'
+    Compress-Archive -Path "$temp/*", $lic -DestinationPath (Join-Path $OutPath 'pwsh.zip')
 }