Skip to content

Commit

Permalink
Merge branch 'PowerShell:master' into fix-PreferenceVariable-warning
Browse files Browse the repository at this point in the history
  • Loading branch information
ewisniew0 authored Nov 23, 2022
2 parents b9f1149 + 542b75f commit 8d953ae
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ To install **PSScriptAnalyzer** from source code:

### Requirements

- [.NET Core 3.1.102 SDK](https://www.microsoft.com/net/download/dotnet-core/3.1#sdk-3.1.102) or
- [.NET Core 3.1.424 SDK](https://www.microsoft.com/net/download/dotnet-core/3.1#sdk-3.1.424) or
newer patch release
* If building for Windows PowerShell versions, then the .NET Framework 4.6.2 [targeting pack](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net462) (also referred to as developer/targeting pack) need to be installed. This is only possible on Windows.
* Optionally but recommended for development: [Visual Studio 2017/2019](https://www.visualstudio.com/downloads)
Expand Down Expand Up @@ -163,8 +163,7 @@ built-in rules.

Pester-based ScriptAnalyzer Tests are located in `path/to/PSScriptAnalyzer/Tests` folder.

- Ensure [Pester 4.3.1](https://www.powershellgallery.com/packages/Pester/4.3.1) or higher is
installed
- Ensure [Pester](https://www.powershellgallery.com/packages/Pester) of at least version 5.3 is installed
- In the root folder of your local repository, run:

```powershell
Expand Down
2 changes: 1 addition & 1 deletion Rules/AvoidLongLines.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public override RuleSeverity GetSeverity()
/// Gets the severity of the returned diagnostic record: error, warning, or information.
/// </summary>
/// <returns></returns>
public DiagnosticSeverity GetDiagnosticSeverity()
private DiagnosticSeverity GetDiagnosticSeverity()
{
return DiagnosticSeverity.Warning;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/Rules/UseApprovedVerbs.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ All cmdlets must used approved verbs.

Approved verbs can be found by running the command `Get-Verb`.

Additional documentation on approved verbs can be found in the microsoft docs page
Additional documentation on approved verbs can be found at
[Approved Verbs for PowerShell Commands](https://learn.microsoft.com/powershell/scripting/developer/cmdlet/approved-verbs-for-windows-powershell-commands).
Some unapproved verbs are documented on the approved verbs page and point to approved alternatives.
Try searching for the verb you used to find its approved form. For example, searching for `Read`,
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.419"
"version": "3.1.424"
}
}
4 changes: 2 additions & 2 deletions tools/appveyor.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
$ErrorActionPreference = 'Stop'

function Install-Pester {
$requiredPesterVersion = '5.2.2'
$pester = Get-Module Pester -ListAvailable | Where-Object { $_.Version -eq $requiredPesterVersion }
$requiredPesterVersion = '5.3'
$pester = Get-Module Pester -ListAvailable | Where-Object { $_.Version -ge $requiredPesterVersion }
if ($null -eq $pester) {
if ($null -eq (Get-Module -ListAvailable PowershellGet)) {
# WMF 4 image build
Expand Down

0 comments on commit 8d953ae

Please sign in to comment.