Skip to content

Commit 8d953ae

Browse files
authored
Merge branch 'PowerShell:master' into fix-PreferenceVariable-warning
2 parents b9f1149 + 542b75f commit 8d953ae

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ To install **PSScriptAnalyzer** from source code:
7272

7373
### Requirements
7474

75-
- [.NET Core 3.1.102 SDK](https://www.microsoft.com/net/download/dotnet-core/3.1#sdk-3.1.102) or
75+
- [.NET Core 3.1.424 SDK](https://www.microsoft.com/net/download/dotnet-core/3.1#sdk-3.1.424) or
7676
newer patch release
7777
* 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.
7878
* Optionally but recommended for development: [Visual Studio 2017/2019](https://www.visualstudio.com/downloads)
@@ -163,8 +163,7 @@ built-in rules.
163163

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

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

170169
```powershell

Rules/AvoidLongLines.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public override RuleSeverity GetSeverity()
132132
/// Gets the severity of the returned diagnostic record: error, warning, or information.
133133
/// </summary>
134134
/// <returns></returns>
135-
public DiagnosticSeverity GetDiagnosticSeverity()
135+
private DiagnosticSeverity GetDiagnosticSeverity()
136136
{
137137
return DiagnosticSeverity.Warning;
138138
}

docs/Rules/UseApprovedVerbs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ All cmdlets must used approved verbs.
1515

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

18-
Additional documentation on approved verbs can be found in the microsoft docs page
18+
Additional documentation on approved verbs can be found at
1919
[Approved Verbs for PowerShell Commands](https://learn.microsoft.com/powershell/scripting/developer/cmdlet/approved-verbs-for-windows-powershell-commands).
2020
Some unapproved verbs are documented on the approved verbs page and point to approved alternatives.
2121
Try searching for the verb you used to find its approved form. For example, searching for `Read`,

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.1.419"
3+
"version": "3.1.424"
44
}
55
}

tools/appveyor.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
$ErrorActionPreference = 'Stop'
55

66
function Install-Pester {
7-
$requiredPesterVersion = '5.2.2'
8-
$pester = Get-Module Pester -ListAvailable | Where-Object { $_.Version -eq $requiredPesterVersion }
7+
$requiredPesterVersion = '5.3'
8+
$pester = Get-Module Pester -ListAvailable | Where-Object { $_.Version -ge $requiredPesterVersion }
99
if ($null -eq $pester) {
1010
if ($null -eq (Get-Module -ListAvailable PowershellGet)) {
1111
# WMF 4 image build

0 commit comments

Comments
 (0)