Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Command data files of PowerShell 6.1.0 and remove 6.0 command data files #1075

Merged
merged 10 commits into from
Mar 2, 2019
Merged

Add Command data files of PowerShell 6.1.0 and remove 6.0 command data files #1075

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0565ff7
add command data file for pwsh 6.1.0 on windows 10 1803. Also make it…
bergmeister Oct 3, 2018
a34a0cd
add command date file using Ubuntu 18.04
bergmeister Oct 5, 2018
3e7caad
update documentation
bergmeister Oct 5, 2018
0255211
add os details about command data files
bergmeister Oct 5, 2018
4875262
Add macOS file from SteveL-MSFT and add to documentation
bergmeister Oct 5, 2018
4e05361
Merge branch 'development' of https://github.com/PowerShell/PSScriptA…
bergmeister Oct 30, 2018
db3bf1d
Add command data file for raspbian and add to docs. Thanks @tylerl0706
bergmeister Oct 30, 2018
6fb2f2f
Merge branch 'development' into CommandDataFiles6_1
bergmeister Mar 1, 2019
f380dbe
Remove 6.0.2 files since we have 6.1 files and 6.0 is out of support …
bergmeister Mar 1, 2019
ef52cfc
fix failing test by adapting settings file and add more info to docum…
bergmeister Mar 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
132 changes: 90 additions & 42 deletions Engine/Settings/core-6.0.2-linux.json → Engine/Settings/core-6.1.0-linux-arm.json
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 92 additions & 44 deletions Engine/Settings/core-6.0.2-macos.json → Engine/Settings/core-6.1.0-linux.json
View file
Open in desktop

Large diffs are not rendered by default.

1,696 changes: 1,696 additions & 0 deletions Engine/Settings/core-6.1.0-macos.json
View file
Open in desktop

Large diffs are not rendered by default.

150 changes: 99 additions & 51 deletions Engine/Settings/core-6.0.2-windows.json → Engine/Settings/core-6.1.0-windows.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 12 additions & 2 deletions RuleDocumentation/UseCompatibleCmdlets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,20 @@ This rule flags cmdlets that are not available in a given Edition/Version of Pow
@{
'Rules' = @{
'PSUseCompatibleCmdlets' = @{
'compatibility' = @("core-6.0.2-windows")
'compatibility' = @("core-6.1.0-windows")
}
}
}
```

The parameter `compatibility` is a list that contain any of the following `{desktop-3.0-windows, desktop-4.0-windows, desktop-5.1.14393.206-windows, core-6.0.2-windows, core-6.0.2-linux, core-6.0.2-macos}`.
The parameter `compatibility` is a list that contain any of the following

- desktop-3.0-windows
- desktop-4.0-windows (taken from Windows Server 2012R2)
- desktop-5.1.14393.206-windows
- core-6.1.0-windows (taken from Windows 10 - 1803)
- core-6.1.0-linux (taken from Ubuntu 18.04)
- core-6.1.0-linux-arm (taken from Raspbian)
- core-6.1.0-macos

Note that the `core-6.0.2-*` files were removed in PSScriptAnalyzer 1.18 since PowerShell 6.0 reached it's end of life.
2 changes: 1 addition & 1 deletion Rules/UseCompatibleCmdlets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private struct RuleParameters
private bool hasInitializationError;
private string reference;
private readonly string defaultReference = "desktop-5.1.14393.206-windows";
private readonly string alternativeDefaultReference = "core-6.0.2-windows";
private readonly string alternativeDefaultReference = "core-6.1.0-windows";
private RuleParameters ruleParameters;

public UseCompatibleCmdlets()
Expand Down
2 changes: 1 addition & 1 deletion Tests/Rules/UseCompatibleCmdlets.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Describe "UseCompatibleCmdlets" {
}
}

$settings = @{rules=@{PSUseCompatibleCmdlets=@{compatibility=@("core-6.0.2-windows")}}}
$settings = @{rules=@{PSUseCompatibleCmdlets=@{compatibility=@("core-6.1.0-windows")}}}

Context "Microsoft.PowerShell.Core" {
@('Enter-PSSession', 'Foreach-Object', 'Get-Command') | `
Expand Down
2 changes: 1 addition & 1 deletion Utils/New-CommandDataFile.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.EXAMPLE
C:\PS> ./New-CommandDataFile.ps1

Suppose this file is run on the following version of PowerShell: PSVersion = 6.0.2, PSEdition = Core, and Windows 10 operating system. Then this script will create a file named core-6.0.2-windows.json that contains a JSON object of the following form:
Suppose this file is run on the following version of PowerShell: PSVersion = 6.1.0, PSEdition = Core, and Windows 10 operating system. Then this script will create a file named core-6.1.0-windows.json that contains a JSON object of the following form:
{
"Modules" : [
"Module1" : {
Expand Down