diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a1e243a..91088adb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 `Get-SamplerModuleRootPath` are currently built. The code that was reverted handles resolving the wildcard (`*`) in the returned paths from the mentioned commands. +- `Resolve-Dependency.ps1` + - Fixes #394, `AllowPrerelease` is ignored for bootstrap. - `module.tests.ps1.template` - Fixed code style according to this project's standard. diff --git a/Resolve-Dependency.ps1 b/Resolve-Dependency.ps1 index 3848462c..8ce49440 100644 --- a/Resolve-Dependency.ps1 +++ b/Resolve-Dependency.ps1 @@ -202,6 +202,11 @@ if (-not $powerShellGetModule -and -not $nuGetProvider) { $providerBootstrapParameters.Add('Scope', $Scope) } + + 'AllowPrerelease' + { + $providerBootstrapParameters.Add('AllowPrerelease', $AllowPrerelease) + } } if ($AllowPrerelease) @@ -307,6 +312,11 @@ try { $installPowerShellGetParameters.Add('Credential', $GalleryCredential) } + + 'AllowPrerelease' + { + $installPowerShellGetParameters.Add('AllowPrerelease', $AllowPrerelease) + } } Write-Progress -Activity 'Bootstrap:' -PercentComplete 60 -CurrentOperation 'Installing newer version of PowerShellGet' diff --git a/Sampler/Templates/Build/Resolve-Dependency.ps1 b/Sampler/Templates/Build/Resolve-Dependency.ps1 index 3848462c..935cbbb8 100644 --- a/Sampler/Templates/Build/Resolve-Dependency.ps1 +++ b/Sampler/Templates/Build/Resolve-Dependency.ps1 @@ -202,6 +202,11 @@ if (-not $powerShellGetModule -and -not $nuGetProvider) { $providerBootstrapParameters.Add('Scope', $Scope) } + + 'AllowPrerelease' + { + $providerBootstrapParameters.Add('AllowPrerelease', $AllowPrerelease) + } } if ($AllowPrerelease) @@ -307,6 +312,10 @@ try { $installPowerShellGetParameters.Add('Credential', $GalleryCredential) } + 'AllowPrerelease' + { + $installPowerShellGetParameters.Add('AllowPrerelease', $AllowPrerelease) + } } Write-Progress -Activity 'Bootstrap:' -PercentComplete 60 -CurrentOperation 'Installing newer version of PowerShellGet'