Skip to content

Commit

Permalink
Fixes #394 (#395)
Browse files Browse the repository at this point in the history
Co-authored-by: Gael <[email protected]>
  • Loading branch information
raandree and gaelcolas authored Nov 1, 2022
1 parent ec08d5d commit faa144b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
10 changes: 10 additions & 0 deletions Resolve-Dependency.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ if (-not $powerShellGetModule -and -not $nuGetProvider)
{
$providerBootstrapParameters.Add('Scope', $Scope)
}

'AllowPrerelease'
{
$providerBootstrapParameters.Add('AllowPrerelease', $AllowPrerelease)
}
}

if ($AllowPrerelease)
Expand Down Expand Up @@ -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'
Expand Down
9 changes: 9 additions & 0 deletions Sampler/Templates/Build/Resolve-Dependency.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ if (-not $powerShellGetModule -and -not $nuGetProvider)
{
$providerBootstrapParameters.Add('Scope', $Scope)
}

'AllowPrerelease'
{
$providerBootstrapParameters.Add('AllowPrerelease', $AllowPrerelease)
}
}

if ($AllowPrerelease)
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit faa144b

Please sign in to comment.