PowerShell · SteveL-MSFT · Aug 26, 2020 · Aug 27, 2020
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
@@ -103,7 +103,6 @@ public Guid InstanceId
         /// <summary>
         /// Gets or sets a flag that tells PowerShell to automatically perform a BreakAll when the debugger is attached to the remote target.
         /// </summary>
-        [Experimental("Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace", ExperimentAction.Show)]
         [Parameter]
         public SwitchParameter BreakAll { get; set; }
 

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs
@@ -16,7 +16,6 @@ public abstract class PSBreakpointCommandBase : PSCmdlet
         /// <summary>
         /// Gets or sets the runspace where the breakpoints will be used.
         /// </summary>
-        [Experimental("Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace", ExperimentAction.Show)]
         [Parameter]
         [ValidateNotNull]
         [Runspace]

@@ -100,7 +100,6 @@ public Guid InstanceId
         /// <summary>
         /// Gets or sets a flag that tells PowerShell to automatically perform a BreakAll when the debugger is attached to the remote target.
         /// </summary>
-        [Experimental("Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace", ExperimentAction.Show)]
         [Parameter]
         public SwitchParameter BreakAll { get; set; }
 

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/RunspaceBreakpointManagement.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/RunspaceBreakpointManagement.Tests.ps1
@@ -1,18 +1,9 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-$FeatureEnabled = $EnabledExperimentalFeatures.Contains('Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace')
-
 Describe 'Runspace Breakpoint Unit Tests - Feature-Enabled' -Tags 'CI' {
 
     BeforeAll {
-        if (!$FeatureEnabled) {
-            Write-Verbose 'Test series skipped. This series of tests requires the experimental feature ''Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace'' to be enabled.' -Verbose
-            $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-            $PSDefaultParameterValues['it:skip'] = $true
-            return
-        }
-
         # Start a job; this will create a runspace in which we can manage breakpoints
         $job = Start-Job -ScriptBlock {
             Set-PSBreakpoint -Command Start-Sleep
@@ -37,11 +28,6 @@ Describe 'Runspace Breakpoint Unit Tests - Feature-Enabled' -Tags 'CI' {
     }
 
     AfterAll {
-        if (!$FeatureEnabled) {
-            $global:PSDefaultParameterValues = $originalDefaultParameterValues
-            return
-        }
-
         # Remove the running job forcibly (whether it has finished or not)
         Remove-Job -Job $job -Force
     }

diff --git a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1 b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
@@ -150,13 +150,19 @@ Describe "Default enablement of Experimental Features" -Tags CI {
                 "Expected: Feature $Name to be Enabled"
             }
 
+            $succeeded = if ($Negate) {
+                $ActualValue -eq $false
+            }
+            else {
+                $ActualValue -eq $true
+            }
+
+            if (!$succeeded) {
+                Write-Warning (Get-ExperimentalFeature | Out-String)
+            }
+
             return [PSCustomObject]@{
-                Succeeded = if ($Negate) {
-                    $ActualValue -eq $false
-                }
-                else {
-                    $ActualValue -eq $true
-                }
+                Succeeded = $succeeded
                 FailureMessage = $failure
             }
         }

@@ -1,7 +1,6 @@
 {
   "ExperimentalFeatures": {
     "ExpTest.FeatureOne": [ "test/powershell/engine/ExperimentalFeature/ExperimentalFeature.Basic.Tests.ps1" ],
-    "PSCultureInvariantReplaceOperator": [ "test/powershell/Language/Operators/ReplaceOperator.Tests.ps1" ],
-    "Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace": [ "test/powershell/Modules/Microsoft.PowerShell.Utility/RunspaceBreakpointManagement.Tests.ps1" ]
+    "PSCultureInvariantReplaceOperator": [ "test/powershell/Language/Operators/ReplaceOperator.Tests.ps1" ]
   }
 }