Merge pull request #1458 from PowerShell/psedition_rename

Rename Desktop & Core PSEditions to WindowsPowerShell & PowerShellCore

src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs

@@ -386,7 +386,7 @@ namespace Microsoft.PowerShell.Commands
         /// </summary>
         [Parameter]
         [AllowEmptyCollection]
-        [ValidateSet("Desktop", "Core")]
+        [ValidateSet("WindowsPowerShell", "PowerShellCore")]
         [SuppressMessage("Microsoft.Performance",
             "CA1819:PropertiesShouldNotReturnArrays", Justification = "Cmdlets use arrays for parameters.")]
         public string[] CompatiblePSEditions

src/System.Management.Automation/engine/PSVersionInfo.cs

@@ -47,11 +47,9 @@ namespace System.Management.Automation
         /// Linux -- All PS on Linux flavors. This may need to be subdivided based on compatibility between distros.
         /// </remarks>
 #if !CORECLR
-        internal const string PSEditionValue = "Desktop";
-#elif LINUX
-        internal const string PSEditionValue = "Linux";
+        internal const string PSEditionValue = "WindowsPowerShell";
 #else
-        internal const string PSEditionValue = "Core";
+        internal const string PSEditionValue = "PowerShellCore";
 #endif
 
         // Static Constructor.

src/System.Management.Automation/engine/Utils.cs

@@ -71,7 +71,7 @@ namespace System.Management.Automation
         /// <summary>
         /// Allowed PowerShell Editions
         /// </summary>
-        internal static string[] AllowedEditionValues = { "Desktop", "Core" };
+        internal static string[] AllowedEditionValues = { "WindowsPowerShell", "PowerShellCore" };
 
         /// <summary>
         /// helper fn to check byte[] arg for null.