Skip to content

Due to the use of unsupported APIs, we must remove the Counter CmdLets in the Diagnostics Module until a better solution is found. #4303

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

Merged
Travis Plunk (TravisEz13) merged 4 commits into from
Jul 20, 2017
Merged

Due to the use of unsupported APIs, we must remove the Counter CmdLets in the Diagnostics Module until a better solution is found. #4303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa7f523
remove counter cmdlets from the build
TravisEz13 Jul 14, 2017
b79f9ff
disable counter tests
TravisEz13 Jul 15, 2017
ee12af0
fix tests [Feature]
TravisEz13 Jul 18, 2017
65bd206
remove counter exports [Feature]
TravisEz13 Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...icrosoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@
</PropertyGroup>

<ItemGroup>
<Compile Remove="CounterFileInfo.cs" />
<Compile Remove="CounterSample.cs" />
<Compile Remove="CounterSet.cs" />
<Compile Remove="ExportCounterCommand.cs" />
<Compile Remove="GetCounterCommand.cs" />
<Compile Remove="GetEventSnapin.cs" />
<Compile Remove="ImportCounterCommand.cs" />
<Compile Remove="PdhHelper.cs" />
<Compile Remove="PdhSafeHandle.cs" />
<Compile Remove="gen\GetEventResources.cs" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...dules/Windows-Core/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
GUID="CA046F10-CA64-4740-8FF9-2565DBA61A4F"
Author="Microsoft Corporation"
CompanyName="Microsoft Corporation"
Copyright="� Microsoft Corporation. All rights reserved."
Copyright="© Microsoft Corporation. All rights reserved."
ModuleVersion="3.0.0.0"
PowerShellVersion="3.0"
CmdletsToExport="Get-WinEvent", "New-WinEvent", "Get-Counter", "Import-Counter", "Export-Counter"
CmdletsToExport="Get-WinEvent", "New-WinEvent" # Counter CmdLets Disabled #4272: "Get-Counter", "Import-Counter", "Export-Counter"
NestedModules="Microsoft.PowerShell.Commands.Diagnostics.dll"
TypesToProcess="GetEvent.types.ps1xml"
FormatsToProcess="Event.format.ps1xml", "Diagnostics.format.ps1xml"
Expand Down
2 changes: 1 addition & 1 deletion test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Describe "TabCompletion" -Tags CI {
}
}

It 'Should complete "Export-Counter -FileFormat" with available output formats'-Skip:(!$IsWindows) {
It 'Should complete "Export-Counter -FileFormat" with available output formats' -Pending {
$res = TabExpansion2 -inputScript 'Export-Counter -FileFormat ' -cursorColumn 'Export-Counter -FileFormat '.Length
$res.CompletionMatches.Count | Should Be 3
$completionText = $res.CompletionMatches.CompletionText | Sort-Object
Expand Down
5 changes: 5 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Export-Counter.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# File: Export-Counter.Tests.ps1
# Provides Pester tests for the Export-Counter cmdlet.
############################################################################################>

# Counter CmdLets are removed see issue #4272
# Tests are disabled
return

$cmdletName = "Export-Counter"

. "$PSScriptRoot/CounterTestHelperFunctions.ps1"
Expand Down
7 changes: 6 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-Counter.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
# File: Get-Counter.Tests.ps1
# Provides Pester tests for the Get-Counter cmdlet.
############################################################################################>
$cmdletName = "Get-Counter"

# Counter CmdLets are removed see issue #4272
# Tests are disabled
return

$cmdletName = "Get-Counter"

. "$PSScriptRoot/CounterTestHelperFunctions.ps1"

Expand Down
4 changes: 4 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Import-Counter.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# Provides Pester tests for the Import-Counter cmdlet.
############################################################################################>

# Counter CmdLets are removed see issue #4272
# Tests are disabled
return

$cmdletName = "Import-Counter"

. "$PSScriptRoot/CounterTestHelperFunctions.ps1"
Expand Down
6 changes: 3 additions & 3 deletions test/powershell/engine/DefaultCommands.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Describe "Verify approved aliases list" -Tags "CI" {
"Cmdlet", "Export-Alias", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Export-Clixml", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Export-Console", , $($FullCLR )
"Cmdlet", "Export-Counter", , $($FullCLR -or $CoreWindows )
"Cmdlet", "Export-Counter", , $($FullCLR )
"Cmdlet", "Export-Csv", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Export-FormatData", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Export-ModuleMember", , $($FullCLR -or $CoreWindows -or $CoreUnix)
Expand All @@ -248,7 +248,7 @@ Describe "Verify approved aliases list" -Tags "CI" {
"Cmdlet", "Get-ComputerRestorePoint", , $($FullCLR )
"Cmdlet", "Get-Content", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Get-ControlPanelItem", , $($FullCLR )
"Cmdlet", "Get-Counter", , $($FullCLR -or $CoreWindows )
"Cmdlet", "Get-Counter", , $($FullCLR )
"Cmdlet", "Get-Credential", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Get-Culture", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Get-Date", , $($FullCLR -or $CoreWindows -or $CoreUnix)
Expand Down Expand Up @@ -300,7 +300,7 @@ Describe "Verify approved aliases list" -Tags "CI" {
"Cmdlet", "Group-Object", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Import-Alias", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Import-Clixml", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Import-Counter", , $($FullCLR -or $CoreWindows )
"Cmdlet", "Import-Counter", , $($FullCLR )
"Cmdlet", "Import-Csv", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Import-LocalizedData", , $($FullCLR -or $CoreWindows -or $CoreUnix)
"Cmdlet", "Import-Module", , $($FullCLR -or $CoreWindows -or $CoreUnix)
Expand Down
3 changes: 0 additions & 3 deletions test/powershell/engine/Help/assets/HelpURI/V2Cmdlets.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Exit-PsSession,https://go.microsoft.com/fwlink/?LinkID=135212
Export-Alias,https://go.microsoft.com/fwlink/?LinkID=113296
Export-Clixml,https://go.microsoft.com/fwlink/?LinkID=113297
Export-Console,https://go.microsoft.com/fwlink/?LinkID=113298
Export-Counter,https://go.microsoft.com/fwlink/?LinkID=138337
Export-Csv,https://go.microsoft.com/fwlink/?LinkID=113299
Export-FormatData,https://go.microsoft.com/fwlink/?LinkID=144302
Export-ModuleMember,https://go.microsoft.com/fwlink/?LinkID=141551
Expand All @@ -59,7 +58,6 @@ Get-ChildItem,https://go.microsoft.com/fwlink/?LinkID=113308
Get-Command,https://go.microsoft.com/fwlink/?LinkID=113309
Get-ComputerRestorePoint,https://go.microsoft.com/fwlink/?LinkID=135215
Get-Content,https://go.microsoft.com/fwlink/?LinkID=113310
Get-Counter,https://go.microsoft.com/fwlink/?LinkID=138335
Get-Credential,https://go.microsoft.com/fwlink/?LinkID=113311
Get-Culture,https://go.microsoft.com/fwlink/?LinkID=113312
Get-Date,https://go.microsoft.com/fwlink/?LinkID=113313
Expand Down Expand Up @@ -102,7 +100,6 @@ Get-WSManInstance,https://go.microsoft.com/fwlink/?LinkID=141444
Group-Object,https://go.microsoft.com/fwlink/?LinkID=113338
Import-Alias,https://go.microsoft.com/fwlink/?LinkID=113339
Import-Clixml,https://go.microsoft.com/fwlink/?LinkID=113340
Import-Counter,https://go.microsoft.com/fwlink/?LinkID=138338
Import-Csv,https://go.microsoft.com/fwlink/?LinkID=113341
Import-LocalizedData,https://go.microsoft.com/fwlink/?LinkID=113342
Import-Module,https://go.microsoft.com/fwlink/?LinkID=141553
Expand Down