Skip to content
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

Minor update and fix pre-merge script block #238

Open
wants to merge 6 commits into
base: testing
Choose a base branch
from
Open

Minor update and fix pre-merge script block #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ee8c3d
Update jinja to 3.1.5
SamErde Mar 3, 2025
70bdf94
Add more tags after comparing to related projects in Gallery
SamErde Mar 4, 2025
0a932ab
Add CmdletBinding attribute to merged script.
SamErde Mar 4, 2025
f9d4f25
Add full parameter definitions and validation to merged script.
SamErde Mar 4, 2025
7cd54dc
Merge branch 'jakehildreth:main' into main
SamErde Mar 5, 2025
8c92dc3
Merge branch 'testing' into main
SamErde Mar 12, 2025
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
12 changes: 9 additions & 3 deletions Build/Build-Module.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Build-Module -ModuleName 'Locksmith' {
ProjectUri = 'https://github.com/jakehildreth/Locksmith'
IconUri = 'https://raw.githubusercontent.com/jakehildreth/Locksmith/main/Images/locksmith.ico'
PowerShellVersion = '5.1'
Tags = @('Windows', 'Locksmith', 'CA', 'PKI', 'ActiveDirectory', 'CertificateServices', 'ADCS')
Tags = @('Locksmith', 'ActiveDirectory', 'ADCS', 'CA', 'Certificate', 'CertificateAuthority', 'CertificateServices', 'PKI', 'X509', 'Windows')
}
New-ConfigurationManifest @Manifest

Expand Down Expand Up @@ -120,10 +120,16 @@ Build-Module -ModuleName 'Locksmith' {
New-ConfigurationBuild -Enable:$true -SignModule:$false -DeleteTargetModuleBeforeBuild -MergeModuleOnBuild #-UseWildcardForFunctions

$PreScriptMerge = {
[CmdletBinding(HelpUri = 'https://jakehildreth.github.io/Locksmith/Invoke-Locksmith')]
param (
[int]$Mode,
# The mode to run Locksmith in. Defaults to 0.
[Parameter(Mandatory = $false)]
[ValidateSet(0, 1, 2, 3, 4)]
[int]$Mode = 0,

# The scans to run. Defaults to 'All'.
[Parameter()]
[ValidateSet('Auditing','ESC1','ESC2','ESC3','ESC4','ESC5','ESC6','ESC8','ESC11','ESC13','ESC15','EKUwu','All','PromptMe')]
[ValidateSet('Auditing', 'ESC1', 'ESC2', 'ESC3', 'ESC4', 'ESC5', 'ESC6', 'ESC8', 'ESC11', 'ESC13', 'ESC15', 'EKUwu', 'All', 'PromptMe')]
[array]$Scans = 'All'
)
}
Expand Down
2 changes: 1 addition & 1 deletion Docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://github.com/readthedocs-examples/example-mkdocs-basic/blob/main/docs/requirements.txt
# requirements.txt
jinja2==3.1.4 #https://pypi.org/project/Jinja2/
jinja2==3.1.5 #https://pypi.org/project/Jinja2/
mkdocs>=1.6.0 #https://github.com/mkdocs/mkdocs
mkdocs-material==9.5.25 #https://github.com/squidfunk/mkdocs-material
pygments>=2.18.0 #https://pypi.org/project/Pygments/
Loading