Skip to content

Commit 8c81ebd

Browse files
committed
fix: 🔄 update references from master to main
* Changed all occurrences of `master` to `main` in: - CI workflow configuration - Documentation files - Example dependency files - PowerShell scripts * Ensures consistency with the new default branch naming convention.
1 parent 33f9573 commit 8c81ebd

17 files changed

Lines changed: 34 additions & 34 deletions

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI
22
on:
33
push:
4-
branches: [master]
4+
branches: [main]
55
paths:
66
- "PSDepend/**"
77
- "Tests/**"

‎Examples/HowDoI.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ All modules install to `C:\MyProject` except `Pester`, which installs to `C:\sc`
6464
}
6565
6666
PSDeploy = 'latest'
67-
'PowerShellOrg/PSDepend' = 'master'
67+
'PowerShellOrg/PSDepend' = 'main'
6868
}
6969
```
7070

@@ -81,6 +81,6 @@ All modules install to `C:\MyProject` except `Pester`, which installs to `C:\sc`
8181
PSJira = @{
8282
Target = 'C:\OtherTarget'
8383
}
84-
'PowerShellOrg/PSDepend' = 'master'
84+
'PowerShellOrg/PSDepend' = 'main'
8585
}
8686
```

‎Examples/ModuleDependencies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Set-Content C:\MyModule\Requirements.psd1 -Value @'
3939
4040
'Posh-SSH' = 'latest'
4141
42-
'PowerShellOrg/PSDepend' = 'master'
42+
'PowerShellOrg/PSDepend' = 'main'
4343
4444
'AzCopy_Download' = @{
4545
Name = 'azcopy.msi'

‎Examples/VirtualEnvironment.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Set-Content C:\ProjectX\Requirements.psd1 -Value @'
1919
'Posh-SSH' = 'latest'
2020
2121
# Clone a git repo
22-
'PowerShellOrg/PSDepend' = 'master'
22+
'PowerShellOrg/PSDepend' = 'main'
2323
2424
# Download a file
2525
'RabbitMQ.Client.dll' = @{
2626
DependencyType = 'FileDownload'
27-
Source = 'https://github.com/PowerShellOrg/PSDepend/raw/master/PSDepend/PSDepend.psd1'
27+
Source = 'https://github.com/PowerShellOrg/PSDepend/raw/main/PSDepend/PSDepend.psd1'
2828
}
2929
}
3030
'@

‎PSDepend/PSDepend.psd1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
Tags = @('requirements', 'dependencies', 'dependency', 'manager', 'bundle', 'package')
8888

8989
# A URL to the license for this module.
90-
LicenseUri = 'https://github.com/PowerShellOrg/PSDepend/blob/master/LICENSE'
90+
LicenseUri = 'https://github.com/PowerShellOrg/PSDepend/blob/main/LICENSE'
9191

9292
# A URL to the main website for this project.
9393
ProjectUri = 'https://github.com/PowerShellOrg/PSDepend/'

‎PSDepend/PSDependScripts/FileDownload.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
.EXAMPLE
2222
sqllite_dll = @{
2323
DependencyType = 'FileDownload'
24-
Source = 'https://github.com/RamblingCookieMonster/PSSQLite/blob/master/PSSQLite/x64/System.Data.SQLite.dll?raw=true'
24+
Source = 'https://github.com/RamblingCookieMonster/PSSQLite/blob/main/PSSQLite/x64/System.Data.SQLite.dll?raw=true'
2525
Target = 'C:\temp'
2626
}
2727
2828
# Downloads System.Data.SQLite.dll to C:\temp
2929
3030
.EXAMPLE
31-
'https://github.com/RamblingCookieMonster/PSSQLite/blob/master/PSSQLite/x64/System.Data.SQLite.dll?raw=true' = @{
31+
'https://github.com/RamblingCookieMonster/PSSQLite/blob/main/PSSQLite/x64/System.Data.SQLite.dll?raw=true' = @{
3232
DependencyType = 'FileDownload'
3333
Target = 'C:\temp\sqlite.dll'
3434
}

‎PSDepend/PSDependScripts/Git.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
You can override this with the 'Name'.
1313
If you specify only an Account/Repository, we assume GitHub is the source
1414
Name: Optional override for the Git URL, same rules as DependencyName (key)
15-
Version: Used with git checkout. Specify a branch name, commit hash, or tags/<tag name>, for example. Defaults to master
15+
Version: Used with git checkout. Specify a branch name, commit hash, or tags/<tag name>, for example. Defaults to main
1616
Target: Path to clone this repository. e.g C:\Temp would result in C:\Temp\RepoName. Defaults to nothing (current path/repo name)
1717
AddToPath: Prepend the Target to ENV:PATH and ENV:PSModulePath
1818
@@ -47,7 +47,7 @@
4747
.EXAMPLE
4848
4949
@{
50-
'https://github.com/RamblingCookieMonster/PSDeploy.git' = 'master'
50+
'https://github.com/RamblingCookieMonster/PSDeploy.git' = 'main'
5151
'https://internal.gitlab.fqdn/jdoe/BuildHelpers.git' = 'd32a9495c39046c851ceccfb7b1a85b17d5be051'
5252
}
5353
@@ -132,7 +132,7 @@ if(-not (Get-Command git -ErrorAction SilentlyContinue))
132132
$Version = $Dependency.Version
133133
if(-not $Version)
134134
{
135-
$Version = 'master'
135+
$Version = 'main'
136136
}
137137

138138
if($GottaTest)

‎PSDepend/PSDependScripts/GitHub.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
This downloads version 0.1.0 to "powershell-lib\0.1.0"
8484
8585
@{
86-
'Dargmuesli/powershell-lib' = 'master'
86+
'Dargmuesli/powershell-lib' = 'main'
8787
}
88-
This downloads branch "master" (most recent commit version) to "powershell-lib"
88+
This downloads branch "main" (most recent commit version) to "powershell-lib"
8989
9090
.EXAMPLE
9191
Imagine a GitHub repository containing a PowerShell module with no git tags.
@@ -97,9 +97,9 @@
9797
'Dargmuesli/powershell-lib' = ''
9898
}
9999
@{
100-
'Dargmuesli/powershell-lib' = 'master'
100+
'Dargmuesli/powershell-lib' = 'main'
101101
}
102-
These download branch "master" (most recent commit version) to "powershell-lib"
102+
These download branch "main" (most recent commit version) to "powershell-lib"
103103
104104
@{
105105
'Dargmuesli/powershell-lib' = @{
@@ -118,13 +118,13 @@
118118
}
119119
@{
120120
'Dargmuesli/powershell-lib' = @{
121-
Version = 'master'
121+
Version = 'main'
122122
Parameters @{
123123
TargetType = 'Parallel'
124124
}
125125
}
126126
}
127-
These download branch "master" (most recent commit version) to "powershell-lib\master\powershell-lib"
127+
These download branch "main" (most recent commit version) to "powershell-lib\main\powershell-lib"
128128
129129
@{
130130
'Dargmuesli/powershell-lib' = @{
@@ -421,10 +421,10 @@ if($ShouldInstall)
421421
else
422422
{
423423
Write-Verbose "[$DependencyID] has no tags on GitHub or [$DependencyVersion] is a branchname"
424-
# Translate version "latest" to "master"
424+
# Translate version "latest" to "main"
425425
if($DependencyVersion -eq "latest")
426426
{
427-
$DependencyVersion = "master"
427+
$DependencyVersion = "main"
428428
}
429429

430430
# Link for a .zip archive of the repository's branch

‎PSDepend/Private/Install-Dotnet.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function Install-Dotnet {
1919

2020
$IsWindowsEnv = !$PSVersionTable.Platform -or $PSVersionTable.Platform -eq "Win32NT"
2121

22-
$obtainUrl = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain"
22+
$obtainUrl = "https://raw.githubusercontent.com/dotnet/cli/main/scripts/obtain"
2323

2424
try {
2525
# remove the old folder, download, and run the dotnet-install script for the correct platform

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Store dependencies in a PowerShell data file named `*.depend.psd1` or `requireme
3939
BuildHelpers = '0.0.20'
4040
PSDeploy = '0.1.21'
4141
42-
'PowerShellOrg/PSDepend' = 'master'
42+
'PowerShellOrg/PSDepend' = 'main'
4343
}
4444
```
4545

@@ -51,7 +51,7 @@ DependencyName DependencyType Version Tags
5151
psake PSGalleryModule latest
5252
BuildHelpers PSGalleryModule 0.0.20
5353
Pester PSGalleryModule latest
54-
PowerShellOrg/PSDepend GitHub master
54+
PowerShellOrg/PSDepend GitHub main
5555
PSDeploy PSGalleryModule 0.1.21
5656
```
5757

@@ -60,7 +60,7 @@ You can also specify the dependency type explicitly:
6060
```powershell
6161
@{
6262
'PSGalleryModule::InvokeBuild' = 'latest'
63-
'GitHub::PowerShellOrg/PSDepend' = 'master'
63+
'GitHub::PowerShellOrg/PSDepend' = 'main'
6464
}
6565
```
6666

@@ -182,15 +182,15 @@ Get-Help Get-Dependency -Full
182182

183183
## Extending PSDepend
184184

185-
PSDepend is extensible. To add a new dependency type, create a script in the [PSDependScripts folder](https://github.com/PowerShellOrg/PSDepend/tree/master/PSDepend/PSDependScripts) and register it in [PSDependMap.psd1](https://github.com/PowerShellOrg/PSDepend/blob/master/PSDepend/PSDependMap.psd1).
185+
PSDepend is extensible. To add a new dependency type, create a script in the [PSDependScripts folder](https://github.com/PowerShellOrg/PSDepend/tree/main/PSDepend/PSDependScripts) and register it in [PSDependMap.psd1](https://github.com/PowerShellOrg/PSDepend/blob/main/PSDepend/PSDependMap.psd1).
186186

187187
Your script must:
188188

189189
- Include comment-based help describing how it uses `Dependency` metadata
190190
- Accept a `PSDependAction` parameter with values `Install`, `Test`, and/or `Import`
191191
- Implement the expected behavior for each action (`Install` installs, `Test` returns a boolean, `Import` loads the dependency)
192192

193-
See [Git.ps1](https://github.com/PowerShellOrg/PSDepend/blob/master/PSDepend/PSDependScripts/Git.ps1) and [PSGalleryModule.ps1](https://github.com/PowerShellOrg/PSDepend/blob/master/PSDepend/PSDependScripts/PSGalleryModule.ps1) for reference implementations.
193+
See [Git.ps1](https://github.com/PowerShellOrg/PSDepend/blob/main/PSDepend/PSDependScripts/Git.ps1) and [PSGalleryModule.ps1](https://github.com/PowerShellOrg/PSDepend/blob/main/PSDepend/PSDependScripts/PSGalleryModule.ps1) for reference implementations.
194194

195195
## Examples
196196

0 commit comments

Comments
 (0)