Skip to content

Commit c04c0ac

Browse files
committed
Find/replace of master to main for branch rename
1 parent 8870139 commit c04c0ac

14 files changed

+37
-37
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ body:
99
- label: I have written a descriptive issue title.
1010
required: true
1111
- label: I have searched all [issues](https://github.com/PowerShell/vscode-powershell/issues?q=is%3Aissue) to ensure it has not already been reported.
12-
- label: I have read the [troubleshooting](https://github.com/PowerShell/vscode-powershell/blob/master/docs/troubleshooting.md) guide.
12+
- label: I have read the [troubleshooting](https://github.com/PowerShell/vscode-powershell/blob/main/docs/troubleshooting.md) guide.
1313
- label: I am sure this issue is with the _extension itself_ and does not reproduce in a standalone [PowerShell](https://github.com/PowerShell/PowerShell/issues/new/choose) instance.
1414
- label: I have verified that I am using the latest version of Visual Studio Code and the PowerShell extension.
15-
- label: If this is a security issue, I have read the [security issue reporting guidance](https://github.com/PowerShell/vscode-powershell/blob/master/SECURITY.md).
15+
- label: If this is a security issue, I have read the [security issue reporting guidance](https://github.com/PowerShell/vscode-powershell/blob/main/SECURITY.md).
1616
- type: textarea
1717
attributes:
1818
label: Summary
@@ -78,4 +78,4 @@ body:
7878
- type: textarea
7979
attributes:
8080
label: Logs
81-
description: Please upload logs collected by following these [instructions](https://github.com/PowerShell/vscode-powershell/blob/master/docs/troubleshooting.md#logs) in the area below. Be careful to scrub sensitive information!
81+
description: Please upload logs collected by following these [instructions](https://github.com/PowerShell/vscode-powershell/blob/main/docs/troubleshooting.md#logs) in the area below. Be careful to scrub sensitive information!

.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
tags: [ v* ]
77
pull_request:
88
# The branches below must be a subset of the branches above
9-
branches: [ master ]
9+
branches: [ main ]
1010
paths-ignore: [ '**/*.md' ]
1111
schedule:
1212
- cron: '00 14 * * *' # Every morning at 7:00am PDT

.vsts-ci/azure-pipelines-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ variables:
1111
trigger:
1212
branches:
1313
include:
14-
- master
14+
- main
1515

1616
resources:
1717
repositories:
1818
- repository: PowerShellEditorServices
1919
type: github
2020
endpoint: GitHub
2121
name: PowerShell/PowerShellEditorServices
22-
ref: master
22+
ref: main
2323

2424
jobs:
2525
- job: PS51_Win2019

.vsts-ci/misc-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
33
trigger:
44
branches:
55
include:
6-
- master
6+
- main
77

88
pr:
9-
- master
9+
- main
1010

1111
resources:
1212
repositories:

CHANGELOG.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@ for features to come out in the following stable release.
12941294

12951295
You may also notice that the history of the changelog has changed.
12961296
For a full list of changes between this release and the previous stable release,
1297-
see [here](https://github.com/PowerShell/vscode-powershell/blob/master/docs/preview_to_stable_changelog.md).
1297+
see [here](https://github.com/PowerShell/vscode-powershell/blob/main/docs/preview_to_stable_changelog.md).
12981298
You can find the changelog from the old stable fork
12991299
[here](https://github.com/PowerShell/vscode-powershell/blob/legacy/1.x/CHANGELOG.md).
13001300

@@ -1887,8 +1887,8 @@ As stated above, this version of the PowerShell extension only works with Window
18871887
#### [vscode-PowerShell](https://github.com/PowerShell/vscode-PowerShell)
18881888

18891889
- [vscode-PowerShell #1632](https://github.com/PowerShell/vscode-powershell/pull/1632) -
1890-
Started [a document for ISE-like configuration of VSCode](https://github.com/PowerShell/vscode-powershell/blob/master/docs/ise_compatibility.md).
1891-
Please help us build it out by [contirbuting an edit](https://github.com/PowerShell/vscode-powershell/edit/master/docs/ise_compatibility.md).
1890+
Started [a document for ISE-like configuration of VSCode](https://github.com/PowerShell/vscode-powershell/blob/main/docs/ise_compatibility.md).
1891+
Please help us build it out by [contirbuting an edit](https://github.com/PowerShell/vscode-powershell/edit/main/docs/ise_compatibility.md).
18921892

18931893
#### [PowerShellEditorServices](https://github.com/PowerShell/PowerShellEditorServices)
18941894

@@ -1929,7 +1929,7 @@ As stated above, this version of the PowerShell extension only works with Window
19291929
Add <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>J</kbd> (<kbd>Cmd</kbd>+<kbd>Alt</kbd>+<kbd>J</kbd> on macOS)
19301930
keybinding to open up list of available snippets
19311931
- [vscode-PowerShell #1597](https://github.com/PowerShell/vscode-powershell/pull/1597) -
1932-
Make `Install-VSCode.ps1` work on macOS and Linux. Get the script [here](https://github.com/PowerShell/vscode-powershell/blob/master/scripts/Install-VSCode.ps1)
1932+
Make `Install-VSCode.ps1` work on macOS and Linux. Get the script [here](https://github.com/PowerShell/vscode-powershell/blob/main/scripts/Install-VSCode.ps1)
19331933
- [vscode-PowerShell #1580](https://github.com/PowerShell/vscode-powershell/pull/1580) -
19341934
`New-EditorFile` works on non-PowerShell untitled files
19351935
- [vscode-PowerShell #1557](https://github.com/PowerShell/vscode-powershell/pull/1557) -
@@ -2619,14 +2619,14 @@ Thanks to new PowerShell Editor Services co-maintainer [Patrick Meinecke](https:
26192619
we've gained a new set of useful commands for interacting with the $psEditor APIs
26202620
within the Integrated Console:
26212621

2622-
- [Find-Ast](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Find-Ast.md)
2623-
- [Get-Token](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Get-Token.md)
2624-
- [ConvertFrom-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/ConvertFrom-ScriptExtent.md)
2625-
- [ConvertTo-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/ConvertTo-ScriptExtent.md)
2626-
- [Set-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Set-ScriptExtent.md)
2627-
- [Join-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Join-ScriptExtent.md)
2628-
- [Test-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Test-ScriptExtent.md)
2629-
- [Import-EditorCommand](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Import-EditorCommand.md)
2622+
- [Find-Ast](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Find-Ast.md)
2623+
- [Get-Token](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Get-Token.md)
2624+
- [ConvertFrom-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/ConvertFrom-ScriptExtent.md)
2625+
- [ConvertTo-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/ConvertTo-ScriptExtent.md)
2626+
- [Set-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Set-ScriptExtent.md)
2627+
- [Join-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Join-ScriptExtent.md)
2628+
- [Test-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Test-ScriptExtent.md)
2629+
- [Import-EditorCommand](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Import-EditorCommand.md)
26302630

26312631
This should also resolve the issues some people were seeing when we tried
26322632
to load the unsigned temporary script containing `Register-EditorCommand`

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PowerShell Language Support for Visual Studio Code
22

3-
[![Build Status](https://dev.azure.com/powershell/vscode-powershell/_apis/build/status/PowerShell.vscode-powershell?branchName=master)](https://dev.azure.com/powershell/vscode-powershell/_build/latest?definitionId=51&branchName=master)
3+
[![Build Status](https://dev.azure.com/powershell/vscode-powershell/_apis/build/status/PowerShell.vscode-powershell?branchName=main)](https://dev.azure.com/powershell/vscode-powershell/_build/latest?definitionId=51&branchName=main)
44
[![Version](https://vsmarketplacebadge.apphb.com/version/ms-vscode.PowerShell.svg)](https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell)
55
[![Installs](https://vsmarketplacebadge.apphb.com/installs-short/ms-vscode.PowerShell.svg)](https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell)
66
[![Discord](https://img.shields.io/discord/180528040881815552.svg?label=%23vscode&logo=discord&logoColor=white)](https://aka.ms/powershell-vscode-discord)
@@ -86,11 +86,11 @@ the `Install-Script` command.
8686

8787
**Alternatively** you can download and execute the script directly from the web
8888
without the use of `Install-Script`. However we **highly recommend** that you
89-
[read the script](https://raw.githubusercontent.com/PowerShell/vscode-powershell/master/scripts/Install-VSCode.ps1)
89+
[read the script](https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1)
9090
first before running it in this way!
9191

9292
```powershell
93-
iex (iwr https://raw.githubusercontent.com/PowerShell/vscode-powershell/master/scripts/Install-VSCode.ps1)
93+
iex (iwr https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1)
9494
```
9595

9696
## Reporting Problems
@@ -155,4 +155,4 @@ For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [open
155155
[conduct-code]: http://opensource.microsoft.com/codeofconduct/
156156
[conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/
157157
[conduct-email]: mailto:[email protected]
158-
[conduct-md]: https://github.com/PowerShell/vscode-powershell/blob/master/CODE_OF_CONDUCT.md
158+
[conduct-md]: https://github.com/PowerShell/vscode-powershell/blob/main/CODE_OF_CONDUCT.md

build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ if ($Bootstrap) {
103103
} else {
104104
$missingTools | ForEach-Object {$string += "* $_`n"}
105105
$string += "`nAll instructions for installing these tools can be found on VSCode PowerShell's Github:`n" `
106-
+ "https://github.com/PowerShell/vscode-powershell/blob/master/docs/development.md"
106+
+ "https://github.com/PowerShell/vscode-powershell/blob/main/docs/development.md"
107107
}
108108
Write-Host "`n$string`n"
109109
} elseif(hasMissingTools) {

docs/azure_data_studio/README_FOR_MARKETPLACE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PowerShell Language Support for Azure Data Studio
22

3-
[![Build Status](https://dev.azure.com/powershell/vscode-powershell/_apis/build/status/PowerShell.vscode-powershell?branchName=master)](https://dev.azure.com/powershell/vscode-powershell/_build/latest?definitionId=51&branchName=master)
3+
[![Build Status](https://dev.azure.com/powershell/vscode-powershell/_apis/build/status/PowerShell.vscode-powershell?branchName=main)](https://dev.azure.com/powershell/vscode-powershell/_build/latest?definitionId=51&branchName=main)
44
[![Version](https://vsmarketplacebadge.apphb.com/version/ms-vscode.PowerShell.svg)](https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell)
55
[![Installs](https://vsmarketplacebadge.apphb.com/installs-short/ms-vscode.PowerShell.svg)](https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell)
66
[![Discord](https://img.shields.io/discord/180528040881815552.svg?label=%23vscode&logo=discord&logoColor=white)](https://aka.ms/powershell-vscode-discord)
@@ -138,7 +138,7 @@ Name Status Size Space Recovery Compat. Owner
138138
Available Model Level
139139
---- ------ ---- ---------- -------- ------- -----
140140
AdventureWorks2017 Normal 336.00 MB 57.01 MB Simple 140 sa
141-
master Normal 6.00 MB 368.00 KB Simple 140 sa
141+
main Normal 6.00 MB 368.00 KB Simple 140 sa
142142
model Normal 16.00 MB 5.53 MB Full 140 sa
143143
msdb Normal 48.44 MB 1.70 MB Simple 140 sa
144144
PBIRS Normal 144.00 MB 55.95 MB Full 140 sa
@@ -198,4 +198,4 @@ For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [open
198198
[conduct-code]: http://opensource.microsoft.com/codeofconduct/
199199
[conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/
200200
[conduct-email]: mailto:[email protected]
201-
[conduct-md]: https://github.com/PowerShell/vscode-powershell/blob/master/CODE_OF_CONDUCT.md
201+
[conduct-md]: https://github.com/PowerShell/vscode-powershell/blob/main/CODE_OF_CONDUCT.md

docs/community_snippets.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ To optimize snippet usability and discoverability for end users we will only shi
811811
- Must be substantially different from existing snippets or intellisense
812812
- Must not violate any intellectual property rights
813813

814-
If your snippet does not meet these requirements but would still be useful to customers we will include it in our list of [Awesome Community Snippets](https://github.com/PowerShell/vscode-powershell/blob/master/docs/community_snippets.md). Additionally, snippet creators can publish snippet libraries as standalone extensions in the [VSCode Marketplace](https://code.visualstudio.com/api/working-with-extensions/publishing-extension).
814+
If your snippet does not meet these requirements but would still be useful to customers we will include it in our list of [Awesome Community Snippets](https://github.com/PowerShell/vscode-powershell/blob/main/docs/community_snippets.md). Additionally, snippet creators can publish snippet libraries as standalone extensions in the [VSCode Marketplace](https://code.visualstudio.com/api/working-with-extensions/publishing-extension).
815815

816816
If you'd like a snippet to be considered for addition to the list, [open a pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) with the following changes:
817817

docs/development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ code --extensionDevelopmentPath="c:\path\to\vscode-powershell" .
5959
## Contributing Snippets
6060

6161
For more information on contributing snippets please read our
62-
[snippet requirements](https://github.com/PowerShell/vscode-powershell/blob/master/docs/community_snippets.md#contributing).
62+
[snippet requirements](https://github.com/PowerShell/vscode-powershell/blob/main/docs/community_snippets.md#contributing).
6363

6464
## Creating a Release
6565

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"vscode": "^1.59.0"
1010
},
1111
"license": "SEE LICENSE IN LICENSE.txt",
12-
"homepage": "https://github.com/PowerShell/vscode-powershell/blob/master/README.md",
12+
"homepage": "https://github.com/PowerShell/vscode-powershell/blob/main/README.md",
1313
"categories": [
1414
"Debuggers",
1515
"Programming Languages",

scripts/Install-VSCode.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
1313
.TAGS install vscode installer
1414
15-
.LICENSEURI https://github.com/PowerShell/vscode-powershell/blob/master/LICENSE.txt
15+
.LICENSEURI https://github.com/PowerShell/vscode-powershell/blob/main/LICENSE.txt
1616
17-
.PROJECTURI https://github.com/PowerShell/vscode-powershell/blob/master/scripts/Install-VSCode.ps1
17+
.PROJECTURI https://github.com/PowerShell/vscode-powershell/blob/main/scripts/Install-VSCode.ps1
1818
1919
.ICONURI
2020
@@ -62,7 +62,7 @@
6262
6363
Please contribute improvements to this script on GitHub!
6464
65-
https://github.com/PowerShell/vscode-powershell/blob/master/scripts/Install-VSCode.ps1
65+
https://github.com/PowerShell/vscode-powershell/blob/main/scripts/Install-VSCode.ps1
6666
6767
.PARAMETER Architecture
6868
A validated string defining the bit version to download. Values can be either 64-bit or 32-bit.

src/features/GenerateBugReport.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ I am experiencing a problem with...
3939
Attached Logs
4040
=====
4141
42-
Follow the instructions in the [README](https://github.com/PowerShell/vscode-powershell/blob/master/docs/troubleshooting.md) about
42+
Follow the instructions in the [README](https://github.com/PowerShell/vscode-powershell/blob/main/docs/troubleshooting.md) about
4343
capturing and sending logs.
4444
4545
Environment Information

tools/ReleaseTools.psm1

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ function New-ReleasePR {
399399

400400
$Params = @{
401401
Head = "release"
402-
Base = "master"
402+
Base = "main"
403403
Draft = $true
404404
Title = "Release ``v$Version``"
405405
Body = "Automated PR for new release!"

0 commit comments

Comments
 (0)