From 60f08fe20c16652c31feb0d6ea377e651961a4f6 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 19 Aug 2024 22:59:17 +0200 Subject: [PATCH 1/5] - Using Process-PSModule v3 - Remove nuget from Dependabot settings --- .github/dependabot.yml | 4 ---- .github/workflows/Nightly-Run.yml | 2 +- .github/workflows/Process-PSModule.yml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b92544a..f57e1e9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,7 +9,3 @@ updates: directory: / # Location of package manifests schedule: interval: weekly - - package-ecosystem: nuget # See documentation for possible values - directory: / # Location of package manifests - schedule: - interval: weekly diff --git a/.github/workflows/Nightly-Run.yml b/.github/workflows/Nightly-Run.yml index d5b5994..4f56d30 100644 --- a/.github/workflows/Nightly-Run.yml +++ b/.github/workflows/Nightly-Run.yml @@ -10,5 +10,5 @@ permissions: jobs: Process-PSModule: - uses: PSModule/Process-PSModule/.github/workflows/CI.yml@v2 + uses: PSModule/Process-PSModule/.github/workflows/CI.yml@v3 secrets: inherit diff --git a/.github/workflows/Process-PSModule.yml b/.github/workflows/Process-PSModule.yml index 76f9983..da48a8b 100644 --- a/.github/workflows/Process-PSModule.yml +++ b/.github/workflows/Process-PSModule.yml @@ -26,5 +26,5 @@ permissions: jobs: Process-PSModule: - uses: PSModule/Process-PSModule/.github/workflows/workflow.yml@v2 + uses: PSModule/Process-PSModule/.github/workflows/workflow.yml@v3 secrets: inherit From 397e04cbde08ace18e4233a88a60b9b9222ff995 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 19 Aug 2024 23:23:22 +0200 Subject: [PATCH 2/5] - Restructure for v3 --- src/classes/{ => public}/Function.ps1 | 0 src/classes/{ => public}/PSModule.ps1 | 0 src/{ => functions}/private/Get-InternalPSModule.ps1 | 0 src/{ => functions}/private/Set-InternalPSModule.ps1 | 0 src/{ => functions}/public/Get-PSModuleTemplate.ps1 | 0 src/{ => functions}/public/New-PSModuleTemplate.ps1 | 0 src/{ => functions}/public/Set-PSModuleTemplate.ps1 | 0 src/{ => functions}/public/Test-PSModuleTemplate.ps1 | 0 src/header.ps1 | 3 +-- 9 files changed, 1 insertion(+), 2 deletions(-) rename src/classes/{ => public}/Function.ps1 (100%) rename src/classes/{ => public}/PSModule.ps1 (100%) rename src/{ => functions}/private/Get-InternalPSModule.ps1 (100%) rename src/{ => functions}/private/Set-InternalPSModule.ps1 (100%) rename src/{ => functions}/public/Get-PSModuleTemplate.ps1 (100%) rename src/{ => functions}/public/New-PSModuleTemplate.ps1 (100%) rename src/{ => functions}/public/Set-PSModuleTemplate.ps1 (100%) rename src/{ => functions}/public/Test-PSModuleTemplate.ps1 (100%) diff --git a/src/classes/Function.ps1 b/src/classes/public/Function.ps1 similarity index 100% rename from src/classes/Function.ps1 rename to src/classes/public/Function.ps1 diff --git a/src/classes/PSModule.ps1 b/src/classes/public/PSModule.ps1 similarity index 100% rename from src/classes/PSModule.ps1 rename to src/classes/public/PSModule.ps1 diff --git a/src/private/Get-InternalPSModule.ps1 b/src/functions/private/Get-InternalPSModule.ps1 similarity index 100% rename from src/private/Get-InternalPSModule.ps1 rename to src/functions/private/Get-InternalPSModule.ps1 diff --git a/src/private/Set-InternalPSModule.ps1 b/src/functions/private/Set-InternalPSModule.ps1 similarity index 100% rename from src/private/Set-InternalPSModule.ps1 rename to src/functions/private/Set-InternalPSModule.ps1 diff --git a/src/public/Get-PSModuleTemplate.ps1 b/src/functions/public/Get-PSModuleTemplate.ps1 similarity index 100% rename from src/public/Get-PSModuleTemplate.ps1 rename to src/functions/public/Get-PSModuleTemplate.ps1 diff --git a/src/public/New-PSModuleTemplate.ps1 b/src/functions/public/New-PSModuleTemplate.ps1 similarity index 100% rename from src/public/New-PSModuleTemplate.ps1 rename to src/functions/public/New-PSModuleTemplate.ps1 diff --git a/src/public/Set-PSModuleTemplate.ps1 b/src/functions/public/Set-PSModuleTemplate.ps1 similarity index 100% rename from src/public/Set-PSModuleTemplate.ps1 rename to src/functions/public/Set-PSModuleTemplate.ps1 diff --git a/src/public/Test-PSModuleTemplate.ps1 b/src/functions/public/Test-PSModuleTemplate.ps1 similarity index 100% rename from src/public/Test-PSModuleTemplate.ps1 rename to src/functions/public/Test-PSModuleTemplate.ps1 diff --git a/src/header.ps1 b/src/header.ps1 index cc1fde9..3247a0e 100644 --- a/src/header.ps1 +++ b/src/header.ps1 @@ -1,3 +1,2 @@ -[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidLongLines', '', Justification = 'Contains long links.')] -[CmdletBinding()] +[CmdletBinding()] param() From 431f55485d60d9cf67c9ee3566c8c3a664633031 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Tue, 20 Aug 2024 23:02:42 +0200 Subject: [PATCH 3/5] Fix permissions on CI --- .github/workflows/Nightly-Run.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Nightly-Run.yml b/.github/workflows/Nightly-Run.yml index 4f56d30..c25d806 100644 --- a/.github/workflows/Nightly-Run.yml +++ b/.github/workflows/Nightly-Run.yml @@ -7,6 +7,8 @@ on: permissions: contents: read + pull-requests: write + statuses: write jobs: Process-PSModule: From 2792cd196831d3ead0400d5c61f345ba5e8db17c Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Tue, 20 Aug 2024 23:46:21 +0200 Subject: [PATCH 4/5] disable markdown and yaml prettier linter --- .github/workflows/Linter.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Linter.yml b/.github/workflows/Linter.yml index 5c9f300..d7650ae 100644 --- a/.github/workflows/Linter.yml +++ b/.github/workflows/Linter.yml @@ -27,3 +27,5 @@ jobs: uses: super-linter/super-linter@latest env: GITHUB_TOKEN: ${{ github.token }} + VALIDATE_MARKDOWN_PRETTIER: false + VALIDATE_YAML_PRETTIER: false From d401ff8452c0e7d63c3221f2ec55c1667236da32 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Thu, 22 Aug 2024 00:23:00 +0200 Subject: [PATCH 5/5] Fix --- examples/General.ps1 | 19 ---------------- src/classes/public/Function.ps1 | 9 -------- src/classes/public/PSModule.ps1 | 11 ---------- .../private/Get-InternalPSModule.ps1 | 18 --------------- .../private/Set-InternalPSModule.ps1 | 22 ------------------- src/functions/public/Get-PSModuleTemplate.ps1 | 18 --------------- src/functions/public/New-PSModuleTemplate.ps1 | 22 ------------------- src/functions/public/Set-PSModuleTemplate.ps1 | 22 ------------------- src/init/initializer.ps1 | 3 --- src/scripts/loader.ps1 | 3 --- 10 files changed, 147 deletions(-) delete mode 100644 examples/General.ps1 delete mode 100644 src/classes/public/Function.ps1 delete mode 100644 src/classes/public/PSModule.ps1 delete mode 100644 src/functions/private/Get-InternalPSModule.ps1 delete mode 100644 src/functions/private/Set-InternalPSModule.ps1 delete mode 100644 src/functions/public/Get-PSModuleTemplate.ps1 delete mode 100644 src/functions/public/New-PSModuleTemplate.ps1 delete mode 100644 src/functions/public/Set-PSModuleTemplate.ps1 delete mode 100644 src/init/initializer.ps1 delete mode 100644 src/scripts/loader.ps1 diff --git a/examples/General.ps1 b/examples/General.ps1 deleted file mode 100644 index e193423..0000000 --- a/examples/General.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -<# - .SYNOPSIS - This is a general example of how to use the module. -#> - -# Import the module -Import-Module -Name 'PSModule' - -# Define the path to the font file -$FontFilePath = 'C:\Fonts\CodeNewRoman\CodeNewRomanNerdFontPropo-Regular.tff' - -# Install the font -Install-Font -Path $FontFilePath -Verbose - -# List installed fonts -Get-Font -Name 'CodeNewRomanNerdFontPropo-Regular' - -# Uninstall the font -Get-Font -Name 'CodeNewRomanNerdFontPropo-Regular' | Uninstall-Font -Verbose diff --git a/src/classes/public/Function.ps1 b/src/classes/public/Function.ps1 deleted file mode 100644 index a0421d3..0000000 --- a/src/classes/public/Function.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -class Function { - $Name - $Version - - PSModule ([string] $Name, [string] $Version) { - $this.Name = $Name - $this.Version = $Version - } -} diff --git a/src/classes/public/PSModule.ps1 b/src/classes/public/PSModule.ps1 deleted file mode 100644 index 8746dd2..0000000 --- a/src/classes/public/PSModule.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -class PSModule { - $Name - $Version - $Functions - - PSModule ([string] $Name, [string] $Version, [hashtable] $Functions) { - $this.Name = $Name - $this.Version = $Version - $this.Functions = $Functions - } -} diff --git a/src/functions/private/Get-InternalPSModule.ps1 b/src/functions/private/Get-InternalPSModule.ps1 deleted file mode 100644 index 323f7a6..0000000 --- a/src/functions/private/Get-InternalPSModule.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -function Get-InternalPSModule { - <# - .SYNOPSIS - Performs tests on a module. - - .EXAMPLE - Get-InternalPSModule -Name 'World' - - "Hello, World!" - #> - [CmdletBinding()] - param ( - # Name of the person to greet. - [Parameter(Mandatory)] - [string] $Name - ) - Write-Output "Hello, $Name!" -} diff --git a/src/functions/private/Set-InternalPSModule.ps1 b/src/functions/private/Set-InternalPSModule.ps1 deleted file mode 100644 index 4b46032..0000000 --- a/src/functions/private/Set-InternalPSModule.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -function Set-InternalPSModule { - <# - .SYNOPSIS - Performs tests on a module. - - .EXAMPLE - Set-InternalPSModule -Name 'World' - - "Hello, World!" - #> - [Diagnostics.CodeAnalysis.SuppressMessageAttribute( - 'PSUseShouldProcessForStateChangingFunctions', '', Scope = 'Function', - Justification = 'Reason for suppressing' - )] - [CmdletBinding()] - param ( - # Name of the person to greet. - [Parameter(Mandatory)] - [string] $Name - ) - Write-Output "Hello, $Name!" -} diff --git a/src/functions/public/Get-PSModuleTemplate.ps1 b/src/functions/public/Get-PSModuleTemplate.ps1 deleted file mode 100644 index 014b47c..0000000 --- a/src/functions/public/Get-PSModuleTemplate.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -function Get-PSModuleTemplate { - <# - .SYNOPSIS - Performs tests on a module. - - .EXAMPLE - Get-PSModuleTemplate -Name 'World' - - "Hello, World!" - #> - [CmdletBinding()] - param ( - # Name of the person to greet. - [Parameter(Mandatory)] - [string] $Name - ) - Write-Output "Hello, $Name!" -} diff --git a/src/functions/public/New-PSModuleTemplate.ps1 b/src/functions/public/New-PSModuleTemplate.ps1 deleted file mode 100644 index 8d5f1fd..0000000 --- a/src/functions/public/New-PSModuleTemplate.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -function New-PSModuleTemplate { - <# - .SYNOPSIS - Performs tests on a module. - - .EXAMPLE - New-PSModuleTemplate -Name 'World' - - "Hello, World!" - #> - [Diagnostics.CodeAnalysis.SuppressMessageAttribute( - 'PSUseShouldProcessForStateChangingFunctions', '', Scope = 'Function', - Justification = 'Reason for suppressing' - )] - [CmdletBinding()] - param ( - # Name of the person to greet. - [Parameter(Mandatory)] - [string] $Name - ) - Write-Output "Hello, $Name!" -} diff --git a/src/functions/public/Set-PSModuleTemplate.ps1 b/src/functions/public/Set-PSModuleTemplate.ps1 deleted file mode 100644 index 51f099c..0000000 --- a/src/functions/public/Set-PSModuleTemplate.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -function Set-PSModuleTemplate { - <# - .SYNOPSIS - Performs tests on a module. - - .EXAMPLE - Set-PSModuleTemplate -Name 'World' - - "Hello, World!" - #> - [Diagnostics.CodeAnalysis.SuppressMessageAttribute( - 'PSUseShouldProcessForStateChangingFunctions', '', Scope = 'Function', - Justification = 'Reason for suppressing' - )] - [CmdletBinding()] - param ( - # Name of the person to greet. - [Parameter(Mandatory)] - [string] $Name - ) - Write-Output "Hello, $Name!" -} diff --git a/src/init/initializer.ps1 b/src/init/initializer.ps1 deleted file mode 100644 index 28396fb..0000000 --- a/src/init/initializer.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -Write-Verbose '-------------------------------' -Write-Verbose '--- THIS IS AN INITIALIZER ---' -Write-Verbose '-------------------------------' diff --git a/src/scripts/loader.ps1 b/src/scripts/loader.ps1 deleted file mode 100644 index 973735a..0000000 --- a/src/scripts/loader.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -Write-Verbose '-------------------------' -Write-Verbose '--- THIS IS A LOADER ---' -Write-Verbose '-------------------------'