From 0d893a59c73363069e3508debf274b45e7149ab7 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 8 Jan 2018 17:20:00 -0800
Subject: [PATCH] Remove sc alias which conflicts with sc.exe (#5827)

---
 .../engine/InitialSessionState.cs                             | 4 ++--
 test/powershell/engine/Basic/DefaultCommands.Tests.ps1        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index f39ed21252..9cdd6656c2 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -4639,7 +4639,6 @@ end
                     new SessionStateAliasEntry("rvpa", "Resolve-Path", "", ReadOnly),
                     new SessionStateAliasEntry("sal", "Set-Alias", "", ReadOnly),
                     new SessionStateAliasEntry("sbp", "Set-PSBreakpoint", "", ReadOnly),
-                    new SessionStateAliasEntry("sc", "Set-Content", "", ReadOnly),
                     new SessionStateAliasEntry("select", "Select-Object", "", ReadOnly_AllScope),
                     new SessionStateAliasEntry("si", "Set-Item", "", ReadOnly),
                     new SessionStateAliasEntry("sl", "Set-Location", "", ReadOnly),
@@ -4688,13 +4687,14 @@ end
                     new SessionStateAliasEntry("type", "Get-Content"),
                     // Native commands we keep because the functions act correctly on Linux
                     new SessionStateAliasEntry("clear", "Clear-Host"),
-//#if !CORECLR is used to disable aliases for cmdlets which are not available on OneCore
+//#if !CORECLR is used to disable aliases for cmdlets which are not available on OneCore or not appropriate for PSCore6 due to conflicts
 #if !CORECLR
                     new SessionStateAliasEntry("gwmi", "Get-WmiObject", "", ReadOnly),
                     new SessionStateAliasEntry("iwmi", "Invoke-WMIMethod", "", ReadOnly),
                     new SessionStateAliasEntry("ogv", "Out-GridView", "", ReadOnly),
                     new SessionStateAliasEntry("ise", "powershell_ise.exe", "", ReadOnly),
                     new SessionStateAliasEntry("rwmi", "Remove-WMIObject", "", ReadOnly),
+                    new SessionStateAliasEntry("sc", "Set-Content", "", ReadOnly),
                     new SessionStateAliasEntry("swmi", "Set-WMIInstance", "", ReadOnly),
                     new SessionStateAliasEntry("shcm", "Show-Command", "", ReadOnly),
                     new SessionStateAliasEntry("trcm", "Trace-Command", "", ReadOnly),
diff --git a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1 b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
index e2584780e7..d111d3a912 100644
--- a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
+++ b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
@@ -143,7 +143,7 @@ Describe "Verify approved aliases list" -Tags "CI" {
 "Alias",  "saps",                               "Start-Process",                      $($FullCLR -or $CoreWindows -or $CoreUnix),   "ReadOnly",         ""
 "Alias",  "sasv",                               "Start-Service",                      $($FullCLR -or $CoreWindows              ),   "ReadOnly",         ""
 "Alias",  "sbp",                                "Set-PSBreakpoint",                   $($FullCLR -or $CoreWindows -or $CoreUnix),   "ReadOnly",         ""
-"Alias",  "sc",                                 "Set-Content",                        $($FullCLR -or $CoreWindows -or $CoreUnix),   "ReadOnly",         ""
+"Alias",  "sc",                                 "Set-Content",                        $($FullCLR                               ),   "ReadOnly",         ""
 "Alias",  "scb",                                "Set-Clipboard",                      $($FullCLR                               ),   "ReadOnly",         ""
 "Alias",  "select",                             "Select-Object",                      $($FullCLR -or $CoreWindows -or $CoreUnix),   "ReadOnly",         "AllScope"
 "Alias",  "set",                                "Set-Variable",                       $($FullCLR -or $CoreWindows -or $CoreUnix),   "",                 ""