Merge pull request #117 from max-ieremenko/release/3.7.0

release 3.7.0

Author: max-ieremenko

Build/build-ci.ps1

@@ -1,5 +1,5 @@
 #Requires -Version "7.0"
-#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.3" }
+#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.12.1" }
 
 [CmdletBinding()]
 param (

Build/build-locally.ps1

@@ -1,5 +1,5 @@
 #Requires -Version "7.0"
-#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.3" }
+#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.12.1" }
 
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version Latest

Build/build-tasks.ps1

@@ -17,7 +17,7 @@ Enter-Build {
         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', 'net9.0'
+        frameworks = 'net8.0', 'net9.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
@@ -52,7 +52,7 @@ task Build {
 task ThirdPartyNotices {
     Invoke-Build `
         -File 'tasks/third-party-notices.ps1' `
-        -AppPath (Join-Path $settings.bin 'app/net6.0/ThirdPartyLibraries.dll') `
+        -AppPath (Join-Path $settings.bin 'app/net8.0/ThirdPartyLibraries.dll') `
         -Version $settings.version `
         -SourcesPath $settings.sources `
         -RepositoryPath $settings.repository `
@@ -113,22 +113,13 @@ 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.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.5-ubuntu-22.04'
+        , 'mcr.microsoft.com/powershell:preview-7.6-ubuntu-22.04')
 
     $builds = @()
     foreach ($image in $images) {
@@ -146,7 +137,7 @@ task PsCoreTest {
 }
 
 task UpdateExamples {
-    $appPath = Join-Path $settings.bin 'app/net6.0/ThirdPartyLibraries.dll'
+    $appPath = Join-Path $settings.bin 'app/net8.0/ThirdPartyLibraries.dll'
     $builds = @()
 
     $examples = Get-ChildItem -Path (Join-Path $settings.examples 'third-party-notices-template') -Directory

Build/install-dependencies.ps1

@@ -15,8 +15,7 @@ $ErrorActionPreference = 'Stop'
 
 if (-not $List -or ('.net' -in $List)) {
     $install = Join-Path $PSScriptRoot 'scripts/Install-DotNet.ps1'
-    & $install '6.0.418'
-    & $install '9.0.100-rc.2.24474.11'
+    & $install '8.0.403'
     & $install (Get-Content -Raw (Join-Path $PSScriptRoot '../Sources/global.json') | ConvertFrom-Json).sdk.version
 }
 

Build/scripts/Install-DotNet.ps1

@@ -27,24 +27,38 @@ function Test-Version {
     }
 }
 
+function Get-InstallationPath {
+    if (Get-Command -Name dotnet -ErrorAction SilentlyContinue) {
+        $versions = dotnet --list-sdks
+        foreach ($installedVersion in $versions) {
+            $path = ($installedVersion -split ' ')[1]
+            $path = $path.Trim('[', ']')
+            if (Test-Path $path) {
+                return  (Split-Path -Path $path -Parent)
+            }
+        }
+    }
+
+    $IsLinux ? '/usr/share/dotnet' : 'C:\Program Files\dotnet'
+}
+
 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]
 
         if (Test-Version -Target $Version -Test $test) {
-            Write-Output ".net sdk $test is alredy installed"
+            Write-Output ".net sdk $test is already installed"
             return
         }
     }
 }
 
-$installDir = 'C:\Program Files\dotnet'
+$installDir = Get-InstallationPath
 $installScript = 'dotnet-install.ps1'
 
 if ($IsLinux) {
-    $installDir = '/usr/share/dotnet'
     $installScript = 'dotnet-install.sh'
 }
 
@@ -63,4 +77,9 @@ if ($IsLinux) {
 }
 
 "$dotnetInstall -Version $Version -InstallDir $installDir"
-& $dotnetInstall -Version $Version -InstallDir $installDir
+if ($IsLinux -and (Get-Command -Name sudo -ErrorAction SilentlyContinue)) {
+    sudo /bin/bash $dotnetInstall -Version $Version -InstallDir $installDir
+}
+else {
+    & $dotnetInstall -Version $Version -InstallDir $installDir
+}

Build/show-powershell-images.ps1

@@ -32,4 +32,5 @@ function Get-ShortVersion {
 (Invoke-RestMethod -Uri 'https://mcr.microsoft.com/v2/powershell/tags/list').tags `
 | Where-Object { ($_ -Like '[0-9]*') -or ($_ -Like 'preview-[0-9]*') } `
 | Get-ShortVersion `
+| Where-Object { ($_ -ge '7.2') } `
 | Sort-Object -Unique

Build/tasks/pack-manual-download.ps1

@@ -10,7 +10,7 @@ param(
     $Version,
 
     [Parameter(Mandatory = $true)]
-    [ValidateSet('net6.0', 'net8.0', 'net9.0')] 
+    [ValidateSet('net8.0', 'net9.0')] 
     [string]
     $Framework,
 

Build/tasks/unit-test.ps1

@@ -6,7 +6,7 @@ param (
     $BinPath,
 
     [Parameter(Mandatory = $true)]
-    [ValidateSet('net6.0', 'net8.0', 'net9.0')] 
+    [ValidateSet('net8.0', 'net9.0')] 
     [string]
     $Framework
 )

Examples/export-to-csv/packages.csv

@@ -1,32 +1,33 @@
 "Name","Version","Package Url","License","License Url","Authors","Copyright"
 "chalk","5.3.0","https://www.npmjs.com/package/chalk/v/5.3.0","MIT License","https://spdx.org/licenses/MIT","",""
-"DotLiquid","2.2.692","https://www.nuget.org/packages/DotLiquid/2.2.692","Apache License 2.0","https://spdx.org/licenses/Apache-2.0","Tim Jones, Alessandro Petrelli",""
-"Microsoft.Bcl.AsyncInterfaces","8.0.0","https://www.nuget.org/packages/Microsoft.Bcl.AsyncInterfaces/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Configuration","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.Configuration/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Configuration.Abstractions","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Abstractions/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Configuration.Binder","8.0.2","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Binder/8.0.2","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Configuration.EnvironmentVariables","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.EnvironmentVariables/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Configuration.FileExtensions","8.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.FileExtensions/8.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Configuration.Json","8.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Json/8.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Configuration.UserSecrets","8.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.UserSecrets/8.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.DependencyInjection","8.0.1","https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/8.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.DependencyInjection.Abstractions","8.0.2","https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection.Abstractions/8.0.2","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.FileProviders.Abstractions","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.FileProviders.Abstractions/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.FileProviders.Physical","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.FileProviders.Physical/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.FileSystemGlobbing","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.FileSystemGlobbing/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Options","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.Options/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Options.ConfigurationExtensions","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.Options.ConfigurationExtensions/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"Microsoft.Extensions.Primitives","8.0.0","https://www.nuget.org/packages/Microsoft.Extensions.Primitives/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"NuGet.Frameworks","6.11.1","https://www.nuget.org/packages/NuGet.Frameworks/6.11.1","Apache License 2.0","https://spdx.org/licenses/Apache-2.0","Microsoft","© Microsoft Corporation. All rights reserved."
-"NuGet.Versioning","6.11.1","https://www.nuget.org/packages/NuGet.Versioning/6.11.1","Apache License 2.0","https://spdx.org/licenses/Apache-2.0","Microsoft","© Microsoft Corporation. All rights reserved."
+"DotLiquid","2.3.18","https://www.nuget.org/packages/DotLiquid/2.3.18","Apache-2.0 OR MS-PL","https://spdx.org/licenses/Apache-2.0https://spdx.org/licenses/MS-PL","Tim Jones, Alessandro Petrelli",""
+"Microsoft.Bcl.AsyncInterfaces","9.0.1","https://www.nuget.org/packages/Microsoft.Bcl.AsyncInterfaces/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Configuration","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Configuration.Abstractions","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Abstractions/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Configuration.Binder","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Binder/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Configuration.EnvironmentVariables","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.EnvironmentVariables/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Configuration.FileExtensions","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.FileExtensions/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Configuration.Json","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Json/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Configuration.UserSecrets","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Configuration.UserSecrets/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.DependencyInjection","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.DependencyInjection.Abstractions","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection.Abstractions/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.FileProviders.Abstractions","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.FileProviders.Abstractions/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.FileProviders.Physical","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.FileProviders.Physical/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.FileSystemGlobbing","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.FileSystemGlobbing/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Options","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Options/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Options.ConfigurationExtensions","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Options.ConfigurationExtensions/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"Microsoft.Extensions.Primitives","9.0.1","https://www.nuget.org/packages/Microsoft.Extensions.Primitives/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"NuGet.Frameworks","6.12.1","https://www.nuget.org/packages/NuGet.Frameworks/6.12.1","Apache License 2.0","https://spdx.org/licenses/Apache-2.0","Microsoft","© Microsoft Corporation. All rights reserved."
+"NuGet.Versioning","6.12.1","https://www.nuget.org/packages/NuGet.Versioning/6.12.1","Apache License 2.0","https://spdx.org/licenses/Apache-2.0","Microsoft","© Microsoft Corporation. All rights reserved."
 "PowerShellStandard.Library","5.1.1","https://www.nuget.org/packages/PowerShellStandard.Library/5.1.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
 "SharpZipLib","1.4.2","https://www.nuget.org/packages/SharpZipLib/1.4.2","MIT License","https://spdx.org/licenses/MIT","ICSharpCode","Copyright © 2000-2022 SharpZipLib Contributors"
 "System.Buffers","4.5.1","https://www.nuget.org/packages/System.Buffers/4.5.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
 "System.ComponentModel.Annotations","5.0.0","https://www.nuget.org/packages/System.ComponentModel.Annotations/5.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"System.IO.Pipelines","9.0.1","https://www.nuget.org/packages/System.IO.Pipelines/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
 "System.Memory","4.5.5","https://www.nuget.org/packages/System.Memory/4.5.5","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
 "System.Numerics.Vectors","4.4.0","https://www.nuget.org/packages/System.Numerics.Vectors/4.4.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation.  All rights reserved."
 "System.Runtime.CompilerServices.Unsafe","6.0.0","https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
 "System.Runtime.Loader","4.3.0","https://www.nuget.org/packages/System.Runtime.Loader/4.3.0","MICROSOFT .NET LIBRARY","https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm","Microsoft","© Microsoft Corporation.  All rights reserved."
-"System.Text.Encodings.Web","8.0.0","https://www.nuget.org/packages/System.Text.Encodings.Web/8.0.0","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
-"System.Text.Json","8.0.5","https://www.nuget.org/packages/System.Text.Json/8.0.5","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"System.Text.Encodings.Web","9.0.1","https://www.nuget.org/packages/System.Text.Encodings.Web/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
+"System.Text.Json","9.0.1","https://www.nuget.org/packages/System.Text.Json/9.0.1","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."
 "System.Threading.Tasks.Extensions","4.5.4","https://www.nuget.org/packages/System.Threading.Tasks.Extensions/4.5.4","MIT License","https://spdx.org/licenses/MIT","Microsoft","© Microsoft Corporation. All rights reserved."