Merge pull request #49 from max-ieremenko/release/4.2.1

Release/4.2.1

Author: max-ieremenko

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       shell: pwsh
@@ -35,7 +35,7 @@ jobs:
       run: ./Build/build.ps1 -Mode "github" -GithubToken "${{ secrets.GITHUB_TOKEN }}"
 
     - name: Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: packages
         path: |

.gitignore

@@ -4,6 +4,8 @@ bin/
 build.out/
 
 launchSettings.json
+launchSettings.txt
 *.sln.DotSettings.user
+*.csproj.user
 
 todo.txt

Build/README.md

@@ -5,8 +5,8 @@ build.ps1 is designed to run on windows
 - PowerShell Desktop 5.1
 - PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 7.0 and 8.0 tests
 - PowerShell [7.2.1](https://github.com/PowerShell/PowerShell/releases/tag/v7.2.1) for .net 6.0 tests
-- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild/5.10.4) -RequiredVersion 5.10.4
-- Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries/3.4.1) -RequiredVersion 3.4.1
+- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild/5.11.0) -RequiredVersion 5.11.0
+- Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries/3.5.1) -RequiredVersion 3.5.1
 - .net framework 4.7.2+ sdk
 - .net 8.0 sdk
 - docker, switched to linux containers

Build/build.ps1

@@ -1,6 +1,6 @@
 #Requires -Version "7.0"
-#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.10.4" }
-#Requires -Modules @{ ModuleName="ThirdPartyLibraries"; ModuleVersion="3.4.1" }
+#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.0" }
+#Requires -Modules @{ ModuleName="ThirdPartyLibraries"; ModuleVersion="3.5.1" }
 
 [CmdletBinding()]
 param (

Build/create-images.ps1

@@ -1,5 +1,5 @@
 #Requires -Version "7.0"
-#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.10.4" }
+#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.0" }
 
 Set-StrictMode -Version Latest
 

Build/install-dependencies.ps1

@@ -16,8 +16,8 @@ $ErrorActionPreference = "Stop"
 . (Join-Path $PSScriptRoot "scripts/Invoke-InstallModule.ps1")
 
 if (".net" -in $List) {
-    Invoke-InstallDotNet -Version "6.0.319"
-    Invoke-InstallDotNet -Version "7.0.100"
+    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
     Invoke-InstallDotNet -Version $version

Build/show-powershell-images.ps1

@@ -1,4 +1,4 @@
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = 'Stop'
 
 function Get-ShortVersion {
     [CmdletBinding()]
@@ -9,23 +9,27 @@ function Get-ShortVersion {
     )
 
     process {
-        $parts = $FullVersion -split "-"
-        $result = $parts[0]
+        # preview-7.5-ubuntu-20.04
+        # 7.4-ubuntu-22.04
+        # 7.3.0-preview.1-ubuntu-20.04
+        $parts = $FullVersion -split '-'
+        $version = $parts[0]
+        $tag = $parts[1]
 
-        if ($parts[1] -like "preview*") {
-            $result += "-" + $parts[1]
+        if ($version -like 'preview*') {
+            $version = $parts[1]
+            $tag = $parts[0]
         }
 
-        return $result
+        if ($tag -like 'preview*') {
+            $version += '-' + $tag
+        }
+
+        return $version
     }
 }
 
-(Invoke-RestMethod -Uri "https://mcr.microsoft.com/v2/powershell/tags/list").tags `
-    | Where-Object {$_ -Like "[0-9]*"} `
-    | Get-ShortVersion `
-    | Sort-Object -Unique
-
-# (Invoke-RestMethod -Uri "https://mcr.microsoft.com/v2/powershell/tags/list").tags `
-#     | Where-Object {$_ -Like "7.2.0*"} `
-#     | Where-Object {($_ -Like "*ubuntu*") -or ($_ -Like "*alpine*")} `
-#     | Sort-Object
+(Invoke-RestMethod -Uri 'https://mcr.microsoft.com/v2/powershell/tags/list').tags `
+| Where-Object { ($_ -Like '[0-9]*') -or ($_ -Like 'preview-[0-9]*') } `
+| Get-ShortVersion `
+| Sort-Object -Unique

Build/tasks/build-tasks.ps1

@@ -70,7 +70,7 @@ task PackGlobalTool {
 }
 
 task PackPoweShellModule {
-    $source = Join-Path $settings.bin "SqlDatabase.PowerShell\netstandard2.0\"
+    $source = Join-Path $settings.bin "SqlDatabase.PowerShell"
     $dest = $settings.artifactsPowerShell
 
     Copy-Item -Path $source -Destination $dest -Recurse
@@ -204,14 +204,14 @@ task PsCoreTest {
         , "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")
-
-    foreach ($image in $images) {
-        exec { docker pull $image }
-    }
+        , "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 -q $image }
+
         foreach ($database in $databases) {
             $builds += @{
                 File     = "build-tasks.it-ps-core.ps1"

Build/tasks/create-images-tasks.ps1

@@ -17,6 +17,7 @@ task BuildMsSqlDatabase {
     $dockerfile = Join-Path $context "image-mssql-2017.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/mssql:2017 `
             $context
@@ -27,6 +28,7 @@ task BuildPgSqlDatabase {
     $dockerfile = Join-Path $context "image-postgres-133.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/postgres:13.3 `
             $context
@@ -37,6 +39,7 @@ task BuildMySqlDatabase {
     $dockerfile = Join-Path $context "image-mysql-8025.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/mysql:8.0.25 `
             $context
@@ -47,6 +50,7 @@ task BuildDotnetSdk60 {
     $dockerfile = Join-Path $context "image-dotnet-sdk-6.0.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/dotnet_pwsh:6.0-sdk `
             .
@@ -57,6 +61,7 @@ task BuildDotnetRuntime60 {
     $dockerfile = Join-Path $context "image-dotnet-runtime-6.0.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/dotnet_pwsh:6.0-runtime `
             .
@@ -67,6 +72,7 @@ task BuildDotnetSdk70 {
     $dockerfile = Join-Path $context "image-dotnet-sdk-7.0.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/dotnet_pwsh:7.0-sdk `
             .
@@ -77,6 +83,7 @@ task BuildDotnetRuntime70 {
     $dockerfile = Join-Path $context "image-dotnet-runtime-7.0.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/dotnet_pwsh:7.0-runtime `
             .
@@ -87,6 +94,7 @@ task BuildDotnetSdk80 {
     $dockerfile = Join-Path $context "image-dotnet-sdk-8.0.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/dotnet_pwsh:8.0-sdk `
             .
@@ -97,6 +105,7 @@ task BuildDotnetRuntime80 {
     $dockerfile = Join-Path $context "image-dotnet-runtime-8.0.dockerfile"
     exec {
         docker build `
+            --pull `
             -f $dockerfile `
             -t sqldatabase/dotnet_pwsh:8.0-runtime `
             .