Skip to content

Update dependency to use PSResource #3180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernieWhite merged 5 commits into from
Jan 3, 2026
Merged

Update dependency to use PSResource #3180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61da0cc
Update dependency to use PSResource
BernieWhite Jan 2, 2026
9d69850
Fix
BernieWhite Jan 2, 2026
e30248c
Fixes
BernieWhite Jan 3, 2026
619af7d
Fix
BernieWhite Jan 3, 2026
41573e3
Fix
BernieWhite Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ jobs:
- name: Install dependencies
shell: pwsh
timeout-minutes: 3
run: ./scripts/pipeline-deps.ps1
run: |
./scripts/pipeline-deps.ps1
Import-Module ./scripts/dependencies.psm1 -Force
Install-Dependencies -Dev -Repository 'PSGallery' -TrustRepository

- name: Build module
shell: pwsh
Expand Down Expand Up @@ -135,13 +138,19 @@ jobs:
name: Install dependencies (PowerShell)
shell: pwsh
timeout-minutes: 3
run: ./scripts/pipeline-deps.ps1
run: |
./scripts/pipeline-deps.ps1
Import-Module ./scripts/dependencies.psm1 -Force
Install-Dependencies -Dev -Repository 'PSGallery' -TrustRepository

- if: ${{ matrix.shell == 'powershell' }}
name: Install dependencies (Windows PowerShell)
shell: powershell
timeout-minutes: 3
run: ./scripts/pipeline-deps.ps1
run: |
./scripts/pipeline-deps.ps1
Import-Module ./scripts/dependencies.psm1 -Force
Install-Dependencies -Dev -Repository 'PSGallery' -TrustRepository

- name: Download module
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
Expand Down
26 changes: 16 additions & 10 deletions scripts/dependencies.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,16 @@ function Install-Dependencies {
[String]$Repository = 'PSGallery',

[Parameter(Mandatory = $False)]
[Switch]$Dev
[Switch]$Dev,

[Parameter(Mandatory = $False)]
[Switch]$TrustRepository
)
process {
$modules = Get-Content -Path $Path -Raw | ConvertFrom-Json;
InstallVersion $modules.dependencies -Repository $Repository;
InstallVersion $modules.dependencies -Repository $Repository -TrustRepository:$TrustRepository;
if ($Dev) {
InstallVersion $modules.devDependencies -Repository $Repository -Dev;
InstallVersion $modules.devDependencies -Repository $Repository -Dev -TrustRepository:$TrustRepository;
}
}
}
Expand Down Expand Up @@ -98,9 +101,7 @@ function CheckVersion {
Write-Host -Object "[$group] -- Checking $($module.Name)";
$installParams = @{}
$installParams += $module.Value;
$installParams.MinimumVersion = $installParams.version;
$installParams.Remove('version');
$available = @(Find-Module -Repository $Repository -Name $module.Name @installParams -ErrorAction Ignore);
$available = @(Find-PSResource -Repository $Repository -Name $module.Name @installParams -ErrorAction Ignore);
foreach ($found in $available) {
if (([Version]$found.Version) -gt ([Version]$module.Value.version)) {
Write-Host -Object "[$group] -- Newer version found $($found.Version)";
Expand All @@ -127,7 +128,10 @@ function InstallVersion {
[String]$Repository,

[Parameter(Mandatory = $False)]
[Switch]$Dev
[Switch]$Dev,

[Parameter(Mandatory = $False)]
[Switch]$TrustRepository
)
begin {
$group = 'Dependencies';
Expand All @@ -138,9 +142,11 @@ function InstallVersion {
process {
foreach ($module in $InputObject.PSObject.Properties.GetEnumerator()) {
Write-Host -Object "[$group] -- Installing $($module.Name) v$($module.Value.version)";
$installParams = @{ RequiredVersion = $module.Value.version };
if ($Null -eq (Get-InstalledModule -Name $module.Name @installParams -ErrorAction Ignore)) {
Install-Module -Name $module.Name @installParams -Force -Repository $Repository;
$installParams = @{ Version = $module.Value.version };
if ($Null -eq (Get-PSResource -Name $module.Name @installParams -ErrorAction Ignore)) {
Install-PSResource -Name $module.Name @installParams -Repository $Repository -TrustRepository:$TrustRepository;
} else {
Write-Verbose -Message "[$group] -- $($module.Name) v$($module.Value.version) already installed.";
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions scripts/pipeline-deps.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ if ($Null -eq (Get-InstalledModule -Name PowerShellGet -MinimumVersion 2.2.1 -Er
if ($Null -eq (Get-InstalledModule -Name InvokeBuild -MinimumVersion 5.4.0 -ErrorAction Ignore)) {
Install-Module InvokeBuild -MinimumVersion 5.4.0 -Scope CurrentUser -Force;
}

if ($Null -eq (Get-InstalledModule -Name Microsoft.PowerShell.PSResourceGet -MinimumVersion 1.1.1 -ErrorAction Ignore)) {
Install-Module Microsoft.PowerShell.PSResourceGet -MinimumVersion 1.1.1 -Scope CurrentUser -Force;
}
Loading