From 6560a2aa25170623e63170d8b9d02a031f24a6e4 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 24 Jun 2022 13:27:16 -0700 Subject: [PATCH 1/2] Find/replace of `master` to `main` for branch rename --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/emacs-test.yml | 4 ++-- .vsts-ci/misc-analysis.yml | 4 ++-- CHANGELOG.md | 20 +++++++++---------- PowerShellEditorServices.Common.props | 2 +- README.md | 6 +++--- .../PowerShellEditorServices.VSCode.psd1 | 2 +- .../PowerShellEditorServices.Commands.psd1 | 2 +- .../PowerShellEditorServices.psd1 | 2 +- .../Start-EditorServices.ps1 | 2 +- module/docs/ConvertFrom-ScriptExtent.md | 2 +- module/docs/ConvertTo-ScriptExtent.md | 2 +- module/docs/Find-Ast.md | 2 +- module/docs/Get-Token.md | 2 +- module/docs/Import-EditorCommand.md | 2 +- module/docs/Join-ScriptExtent.md | 2 +- module/docs/Out-CurrentFile.md | 2 +- module/docs/Register-EditorCommand.md | 2 +- module/docs/Set-ScriptExtent.md | 2 +- module/docs/Test-ScriptExtent.md | 2 +- module/docs/Unregister-EditorCommand.md | 2 +- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3b6854968..fa898e2bb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,11 +2,11 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] tags: [ v* ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] paths-ignore: [ '**/*.md' ] schedule: - cron: '00 14 * * *' # Every morning at 7:00am PDT diff --git a/.github/workflows/emacs-test.yml b/.github/workflows/emacs-test.yml index 398cf0c4b..aa41e7b61 100644 --- a/.github/workflows/emacs-test.yml +++ b/.github/workflows/emacs-test.yml @@ -2,11 +2,11 @@ name: "Emacs" on: push: - branches: [ master ] + branches: [ main ] tags: [ v* ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] paths-ignore: [ '**/*.md' ] jobs: diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml index 2647eb182..86b0b5840 100644 --- a/.vsts-ci/misc-analysis.yml +++ b/.vsts-ci/misc-analysis.yml @@ -3,10 +3,10 @@ name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: branches: include: - - master + - main pr: -- master +- main resources: repositories: diff --git a/CHANGELOG.md b/CHANGELOG.md index bd6e78f2f..6c9effb61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1415,14 +1415,14 @@ Thanks to our new co-maintainer [Patrick Meinecke](https://github.com/SeeminglyS we've gained a new set of useful commands for interacting with the $psEditor APIs within the Integrated Console: -- [Find-Ast](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Find-Ast.md) -- [Get-Token](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Get-Token.md) -- [ConvertFrom-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/ConvertFrom-ScriptExtent.md) -- [ConvertTo-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/ConvertTo-ScriptExtent.md) -- [Set-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Set-ScriptExtent.md) -- [Join-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Join-ScriptExtent.md) -- [Test-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Test-ScriptExtent.md) -- [Import-EditorCommand](https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/docs/Import-EditorCommand.md) +- [Find-Ast](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Find-Ast.md) +- [Get-Token](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Get-Token.md) +- [ConvertFrom-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/ConvertFrom-ScriptExtent.md) +- [ConvertTo-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/ConvertTo-ScriptExtent.md) +- [Set-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Set-ScriptExtent.md) +- [Join-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Join-ScriptExtent.md) +- [Test-ScriptExtent](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Test-ScriptExtent.md) +- [Import-EditorCommand](https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/docs/Import-EditorCommand.md) #### Microsoft.PowerShell.EditorServices API removals ([#492](https://github.com/PowerShell/PowerShellEditorServices/pull/492)) @@ -1626,7 +1626,7 @@ on the PowerShell Team Blog. ## 0.10.0 ### Tuesday, March 14, 2017 -These improvements are described in detail in the [vscode-powershell changelog](https://github.com/PowerShell/vscode-powershell/blob/master/CHANGELOG.md#0100) +These improvements are described in detail in the [vscode-powershell changelog](https://github.com/PowerShell/vscode-powershell/blob/main/CHANGELOG.md#0100) for its 0.10.0 release. #### Language feature improvements @@ -1644,7 +1644,7 @@ for its 0.10.0 release. ## 0.9.0 ### Thursday, January 19, 2017 -These improvements are described in detail in the [vscode-powershell changelog](https://github.com/PowerShell/vscode-powershell/blob/master/CHANGELOG.md#090) +These improvements are described in detail in the [vscode-powershell changelog](https://github.com/PowerShell/vscode-powershell/blob/main/CHANGELOG.md#090) for its 0.9.0 release. #### Language feature improvements diff --git a/PowerShellEditorServices.Common.props b/PowerShellEditorServices.Common.props index 48e298557..f18822361 100644 --- a/PowerShellEditorServices.Common.props +++ b/PowerShellEditorServices.Common.props @@ -6,7 +6,7 @@ © Microsoft Corporation. latest PowerShell;editor;development;language;debugging - https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/master/LICENSE + https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/main/LICENSE true git https://github.com/PowerShell/PowerShellEditorServices diff --git a/README.md b/README.md index 092274fe8..fb0de20d7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # PowerShell Editor Services -[![Build Status](https://dev.azure.com/powershell/PowerShellEditorServices/_apis/build/status/PowerShellEditorServices-ci?branchName=master)](https://dev.azure.com/powershell/PowerShellEditorServices/_build/latest?definitionId=57&branchName=master) +[![Build Status](https://dev.azure.com/powershell/PowerShellEditorServices/_apis/build/status/PowerShellEditorServices-ci?branchName=main)](https://dev.azure.com/powershell/PowerShellEditorServices/_build/latest?definitionId=57&branchName=main) [![Discord](https://img.shields.io/discord/180528040881815552.svg?label=%23vscode&logo=discord&logoColor=white)](https://aka.ms/psdiscord) [![Join the chat at https://gitter.im/PowerShell/PowerShellEditorServices](https://badges.gitter.im/PowerShell/PowerShellEditorServices.svg)](https://gitter.im/PowerShell/PowerShellEditorServices?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -119,7 +119,7 @@ The types of PowerShell Editor Services can change at any moment and should not ## Development -> NOTE: The easiest way to manually test changes you've made in PowerShellEditorServices is to follow the [vscode-powershell development doc](https://github.com/PowerShell/vscode-powershell/blob/master/docs/development.md) to get a local build of the VS Code extension to use your local build of PowerShellEditorServices. +> NOTE: The easiest way to manually test changes you've made in PowerShellEditorServices is to follow the [vscode-powershell development doc](https://github.com/PowerShell/vscode-powershell/blob/main/docs/development.md) to get a local build of the VS Code extension to use your local build of PowerShellEditorServices. ### 1. Install PowerShell 7+ @@ -179,4 +179,4 @@ For more information, see the [Code of Conduct FAQ][conduct-FAQ] or contact [ope [conduct-code]: http://opensource.microsoft.com/codeofconduct/ [conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/ [conduct-email]: mailto:opencode@microsoft.com -[conduct-md]: https://github.com/PowerShell/PowerShellEditorServices/blob/master/CODE_OF_CONDUCT.md +[conduct-md]: https://github.com/PowerShell/PowerShellEditorServices/blob/main/CODE_OF_CONDUCT.md diff --git a/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 b/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 index a6d64c0f6..a03ff34ba 100644 --- a/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 +++ b/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 @@ -102,7 +102,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/master/LICENSE' + LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' # A URL to the main website for this project. ProjectUri = 'https://github.com/PowerShell/PowerShellEditorServices' diff --git a/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 b/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 index 6cf4bcffd..666ac4113 100644 --- a/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 +++ b/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 @@ -108,7 +108,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/master/LICENSE' + LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' # A URL to the main website for this project. ProjectUri = 'https://github.com/PowerShell/PowerShellEditorServices' diff --git a/module/PowerShellEditorServices/PowerShellEditorServices.psd1 b/module/PowerShellEditorServices/PowerShellEditorServices.psd1 index 2e3f5698c..6307c505b 100644 --- a/module/PowerShellEditorServices/PowerShellEditorServices.psd1 +++ b/module/PowerShellEditorServices/PowerShellEditorServices.psd1 @@ -107,7 +107,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/master/LICENSE' + LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' # A URL to the main website for this project. ProjectUri = 'https://github.com/PowerShell/PowerShellEditorServices' diff --git a/module/PowerShellEditorServices/Start-EditorServices.ps1 b/module/PowerShellEditorServices/Start-EditorServices.ps1 index 47ba523c2..5a9eb2300 100644 --- a/module/PowerShellEditorServices/Start-EditorServices.ps1 +++ b/module/PowerShellEditorServices/Start-EditorServices.ps1 @@ -23,7 +23,7 @@ If editor integration authors make modifications to this script, please consider contributing changes back to the canonical version of this script at the PowerShell Editor Services GitHub repository: - https://github.com/PowerShell/PowerShellEditorServices/blob/master/module/PowerShellEditorServices/Start-EditorServices.ps1' + https://github.com/PowerShell/PowerShellEditorServices/blob/main/module/PowerShellEditorServices/Start-EditorServices.ps1' #> [CmdletBinding(DefaultParameterSetName="NamedPipe")] param( diff --git a/module/docs/ConvertFrom-ScriptExtent.md b/module/docs/ConvertFrom-ScriptExtent.md index 741fe010e..d6fcc3273 100644 --- a/module/docs/ConvertFrom-ScriptExtent.md +++ b/module/docs/ConvertFrom-ScriptExtent.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/ConvertFrom-ScriptExtent.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/ConvertFrom-ScriptExtent.md schema: 2.0.0 --- diff --git a/module/docs/ConvertTo-ScriptExtent.md b/module/docs/ConvertTo-ScriptExtent.md index f01db70e8..9d627f6f8 100644 --- a/module/docs/ConvertTo-ScriptExtent.md +++ b/module/docs/ConvertTo-ScriptExtent.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/ConvertTo-ScriptExtent.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/ConvertTo-ScriptExtent.md schema: 2.0.0 --- diff --git a/module/docs/Find-Ast.md b/module/docs/Find-Ast.md index a2d0a6720..8a77c06df 100644 --- a/module/docs/Find-Ast.md +++ b/module/docs/Find-Ast.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Find-Ast.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Find-Ast.md schema: 2.0.0 --- diff --git a/module/docs/Get-Token.md b/module/docs/Get-Token.md index 71744b5f2..c0716390b 100644 --- a/module/docs/Get-Token.md +++ b/module/docs/Get-Token.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Get-Token.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Get-Token.md schema: 2.0.0 --- diff --git a/module/docs/Import-EditorCommand.md b/module/docs/Import-EditorCommand.md index cf90e8c55..35c8d7fd8 100644 --- a/module/docs/Import-EditorCommand.md +++ b/module/docs/Import-EditorCommand.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Import-EditorCommand.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Import-EditorCommand.md schema: 2.0.0 --- diff --git a/module/docs/Join-ScriptExtent.md b/module/docs/Join-ScriptExtent.md index 0c622bdb9..047952622 100644 --- a/module/docs/Join-ScriptExtent.md +++ b/module/docs/Join-ScriptExtent.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Join-ScriptExtent.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Join-ScriptExtent.md schema: 2.0.0 --- diff --git a/module/docs/Out-CurrentFile.md b/module/docs/Out-CurrentFile.md index a1b6a604d..18f4b46ec 100644 --- a/module/docs/Out-CurrentFile.md +++ b/module/docs/Out-CurrentFile.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Out-CurrentFile.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Out-CurrentFile.md schema: 2.0.0 --- diff --git a/module/docs/Register-EditorCommand.md b/module/docs/Register-EditorCommand.md index 605576fd0..b412b7c32 100644 --- a/module/docs/Register-EditorCommand.md +++ b/module/docs/Register-EditorCommand.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Register-EditorCommand.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Register-EditorCommand.md schema: 2.0.0 --- diff --git a/module/docs/Set-ScriptExtent.md b/module/docs/Set-ScriptExtent.md index fb92efe12..a2673f476 100644 --- a/module/docs/Set-ScriptExtent.md +++ b/module/docs/Set-ScriptExtent.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Set-ScriptExtent.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Set-ScriptExtent.md schema: 2.0.0 --- diff --git a/module/docs/Test-ScriptExtent.md b/module/docs/Test-ScriptExtent.md index bc0ac6841..63068c2a6 100644 --- a/module/docs/Test-ScriptExtent.md +++ b/module/docs/Test-ScriptExtent.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Test-ScriptExtent.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Test-ScriptExtent.md schema: 2.0.0 --- diff --git a/module/docs/Unregister-EditorCommand.md b/module/docs/Unregister-EditorCommand.md index 61821d24e..528aed4e5 100644 --- a/module/docs/Unregister-EditorCommand.md +++ b/module/docs/Unregister-EditorCommand.md @@ -1,6 +1,6 @@ --- external help file: PowerShellEditorServices.Commands-help.xml -online version: https://github.com/PowerShell/PowerShellEditorServices/tree/master/module/docs/Unregister-EditorCommand.md +online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Unregister-EditorCommand.md schema: 2.0.0 --- From 6ae20d3086ef97d3c0d507448fbe1eac3c711391 Mon Sep 17 00:00:00 2001 From: Andy Schwartzmeyer Date: Fri, 24 Jun 2022 13:41:24 -0700 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Patrick Meinecke --- .../PowerShellEditorServices.VSCode.psd1 | 2 +- .../Commands/PowerShellEditorServices.Commands.psd1 | 2 +- module/PowerShellEditorServices/PowerShellEditorServices.psd1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 b/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 index a03ff34ba..331fee950 100644 --- a/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 +++ b/module/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.psd1 @@ -102,7 +102,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' + LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' # A URL to the main website for this project. ProjectUri = 'https://github.com/PowerShell/PowerShellEditorServices' diff --git a/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 b/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 index 666ac4113..69347beab 100644 --- a/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 +++ b/module/PowerShellEditorServices/Commands/PowerShellEditorServices.Commands.psd1 @@ -108,7 +108,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' + LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' # A URL to the main website for this project. ProjectUri = 'https://github.com/PowerShell/PowerShellEditorServices' diff --git a/module/PowerShellEditorServices/PowerShellEditorServices.psd1 b/module/PowerShellEditorServices/PowerShellEditorServices.psd1 index 6307c505b..b91f1f51f 100644 --- a/module/PowerShellEditorServices/PowerShellEditorServices.psd1 +++ b/module/PowerShellEditorServices/PowerShellEditorServices.psd1 @@ -107,7 +107,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' + LicenseUri = 'https://github.com/PowerShell/PowerShellEditorServices/blob/main/LICENSE' # A URL to the main website for this project. ProjectUri = 'https://github.com/PowerShell/PowerShellEditorServices'