diff --git a/src/System.Management.Automation/utils/PsUtils.cs b/src/System.Management.Automation/utils/PsUtils.cs
index 2575eada8e..6ca4e41117 100644
--- a/src/System.Management.Automation/utils/PsUtils.cs
+++ b/src/System.Management.Automation/utils/PsUtils.cs
@@ -140,394 +140,6 @@ namespace System.Management.Automation
}
}
-#if !CORECLR // .NET Framework Version is not applicable to CoreCLR
- ///
- /// Detects the installation of Framework Versions 1.1, 2.0, 3.0 and 3.5 and 4.0 through
- /// the official registry installation keys.
- ///
- internal static class FrameworkRegistryInstallation
- {
- ///
- /// Gets the three registry names allowing for framework installation and service pack checks based on the
- /// majorVersion and minorVersion version numbers.
- ///
- /// Major version of .NET required, for .NET 3.5 this is 3.
- /// Minor version of .NET required, for .NET 3.5 this is 5.
- /// name of the key containing installValueName
- /// name of the registry key indicating the SP has been installed
- /// name of the key containing the SP value with SP version
- /// name of the value containing the SP value with SP version
- /// true if the majorVersion and minorVersion correspond the versions we can check for, false otherwise.
- private static bool GetRegistryNames(int majorVersion, int minorVersion, out string installKeyName, out string installValueName, out string spKeyName, out string spValueName)
- {
- installKeyName = null;
- spKeyName = null;
- installValueName = null;
- spValueName = "SP";
-
-
- const string v1_1KeyName = "v1.1.4322";
- const string v2KeyName = "v2.0.50727";
- const string v3KeyName = "v3.0";
- const string v3_5KeyName = "v3.5";
-
- // There are two registry keys "Client" and "Full" corresponding to the Client and Full .NET 4 Profiles.
- // Client is a subset of the assemblies in Full (identical assemblies, smaller set), having most of the
- // .NET 4's features.
- // Here is some information on the client profile: http://msdn.microsoft.com/en-us/library/cc656912.aspx
- // For now, we are picking Client, because it has most of .NET features and is the only version available
- // in Server Core. If, in the future, PowerShell needs to depend on Full, we might have to revisit this
- // decision.
- const string v4KeyName = @"v4\Client";
- const string install = "Install";
- const string oneToThreePointFivePrefix = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\";
-
- // In .NET 4.5, there is no concept of Client and Full. There is only the full redistributable package available
- // http://msdn.microsoft.com/en-us/library/cc656912(VS.110).aspx
- const string v45KeyName = @"v4\Full";
- const string v45ReleaseKeyName = "Release";
-
- if (majorVersion == 1 && minorVersion == 1)
- {
- // http://msdn.microsoft.com/en-us/library/ms994402.aspx
- installKeyName = oneToThreePointFivePrefix + v1_1KeyName;
- spKeyName = installKeyName;
- installValueName = install;
- return true;
- }
- if (majorVersion == 2 && minorVersion == 0)
- {
- // http://msdn.microsoft.com/en-us/library/aa480243.aspx
- installKeyName = oneToThreePointFivePrefix + v2KeyName;
- spKeyName = installKeyName;
- installValueName = install;
- return true;
- }
- if (majorVersion == 3 && minorVersion == 0)
- {
- // http://msdn.microsoft.com/en-us/library/aa480173.aspx
- installKeyName = oneToThreePointFivePrefix + v3KeyName + @"\Setup";
- spKeyName = oneToThreePointFivePrefix + v3KeyName;
- installValueName = "InstallSuccess";
- return true;
- }
- if (majorVersion == 3 && minorVersion == 5)
- {
- // http://msdn.microsoft.com/en-us/library/cc160716.aspx
- installKeyName = oneToThreePointFivePrefix + v3_5KeyName;
- spKeyName = installKeyName;
- installValueName = install;
- return true;
- }
- if (majorVersion == 4 && minorVersion == 0)
- {
- // http://msdn.microsoft.com/library/ee942965(v=VS.100).aspx
- installKeyName = oneToThreePointFivePrefix + v4KeyName;
- spKeyName = installKeyName;
- installValueName = install;
- spValueName = "Servicing";
- return true;
- }
- if (majorVersion == 4 && minorVersion == 5)
- {
- // http://msdn.microsoft.com/en-us/library/ee942965(VS.110).aspx
- installKeyName = oneToThreePointFivePrefix + v45KeyName;
- installValueName = v45ReleaseKeyName;
- return true;
- }
-
- // To add v1.0 in the future note that
- // http://msdn.microsoft.com/en-us/library/ms994395.aspx does not mention
- // NDP keys since they were not introduced until later.
- // There were no official setup keys, but this blog suggests an alternative for finding out
- // about the service pack information:
- // http://blogs.msdn.com/astebner/archive/2004/09/14/229802.aspx
- return false;
- }
-
- ///
- /// Tries to read the valueName from the registry key returning null if
- /// the it was not found, if it is not an integer or if or an exception was thrown.
- ///
- /// Key containing valueName
- /// Name of value to be returned
- /// The value or null if it could not be retrieved
- private static int? GetRegistryKeyValueInt(RegistryKey key, string valueName)
- {
- try
- {
- object keyValue = key.GetValue(valueName);
- if (keyValue is int)
- {
- return (int)keyValue;
- }
- return null;
- }
- catch (ObjectDisposedException)
- {
- return null;
- }
- catch (SecurityException)
- {
- return null;
- }
- catch (IOException)
- {
- return null;
- }
- catch (UnauthorizedAccessException)
- {
- return null;
- }
- }
-
- ///
- /// Tries to read the keyName from the registry key returning null if
- /// the key was not found or an exception was thrown.
- ///
- /// Key containing subKeyName
- /// NAme of sub key to be returned
- /// The subkey or null if it could not be retrieved
- private static RegistryKey GetRegistryKeySubKey(RegistryKey key, string subKeyName)
- {
- try
- {
- return key.OpenSubKey(subKeyName);
- }
- catch (ObjectDisposedException)
- {
- return null;
- }
- catch (SecurityException)
- {
- return null;
- }
- catch (ArgumentException)
- {
- return null;
- }
- }
-
- // based on Table in http://support.microsoft.com/kb/318785
- private static Version V4_0 = new Version(4, 0, 30319, 0);
- private static Version V3_5 = new Version(3, 5, 21022, 8);
- private static Version V3_5sp1 = new Version(3, 5, 30729, 1);
- private static Version V3_0 = new Version(3, 0, 4506, 30);
- private static Version V3_0sp1 = new Version(3, 0, 4506, 648);
- private static Version V3_0sp2 = new Version(3, 0, 4506, 2152);
- private static Version V2_0 = new Version(2, 0, 50727, 42);
- private static Version V2_0sp1 = new Version(2, 0, 50727, 1433);
- private static Version V2_0sp2 = new Version(2, 0, 50727, 3053);
- private static Version V1_1 = new Version(1, 1, 4322, 573);
- private static Version V1_1sp1 = new Version(1, 1, 4322, 2032);
- private static Version V1_1sp1Server = new Version(1, 1, 4322, 2300);
-
- // Original versions without build or revision numbers
- private static Version V4_5_00 = new Version(4, 5, 0, 0);
- private static Version V4_0_00 = new Version(4, 0, 0, 0);
- private static Version V3_5_00 = new Version(3, 5, 0, 0);
- private static Version V3_0_00 = new Version(3, 0, 0, 0);
- private static Version V2_0_00 = new Version(2, 0, 0, 0);
- private static Version V1_1_00 = new Version(1, 1, 0, 0);
-
- // Dictionary holding compatible .NET framework versions
- // This is used in verifying the .NET framework version for loading module manifest
- internal static Dictionary> CompatibleNetFrameworkVersions = new Dictionary>() {
- {V1_1_00, new HashSet {V4_5_00, V4_0_00, V3_5_00, V3_0_00, V2_0_00}},
- {V2_0_00, new HashSet {V4_5_00, V4_0_00, V3_5_00, V3_0_00}},
- {V3_0_00, new HashSet {V4_5_00, V4_0_00, V3_5_00 }},
- {V3_5_00, new HashSet {V4_5_00, V4_0_00 }},
- {V4_0_00, new HashSet {V4_5_00}},
- {V4_5_00, new HashSet ()},
- };
-
- // .NET 4.5 is the highest known .NET version for PowerShell 3.0
- internal static Version KnownHighestNetFrameworkVersion = new Version(4, 5);
-
- ///
- /// Returns true if IsFrameworkInstalled will be able to check for this framework version.
- ///
- /// version to be checked
- /// Major version of .NET required, for .NET 3.5 this is 3.
- /// Minor version of .NET required, for .NET 3.5 this is 5.
- /// Minimum SP version number corresponding to .
- /// true if IsFrameworkInstalled will be able to check for this framework version
- internal static bool CanCheckFrameworkInstallation(Version version, out int majorVersion, out int minorVersion, out int minimumSpVersion)
- {
- // based on Table in http://support.microsoft.com/kb/318785
- majorVersion = -1;
- minorVersion = -1;
- minimumSpVersion = -1;
-
- if (version == V4_5_00)
- {
- majorVersion = 4;
- minorVersion = 5;
- minimumSpVersion = 0;
- return true;
- }
-
- if (version == V4_0 || version == V4_0_00)
- {
- majorVersion = 4;
- minorVersion = 0;
- minimumSpVersion = 0;
- return true;
- }
- if (version == V3_5 || version == V3_5_00)
- {
- majorVersion = 3;
- minorVersion = 5;
- minimumSpVersion = 0;
- return true;
- }
- if (version == V3_5sp1)
- {
- majorVersion = 3;
- minorVersion = 5;
- minimumSpVersion = 1;
- return true;
- }
- else if (version == V3_0 || version == V3_0_00)
- {
- majorVersion = 3;
- minorVersion = 0;
- minimumSpVersion = 0;
- return true;
- }
- else if (version == V3_0sp1)
- {
- majorVersion = 3;
- minorVersion = 0;
- minimumSpVersion = 1;
- return true;
- }
- else if (version == V3_0sp2)
- {
- majorVersion = 3;
- minorVersion = 0;
- minimumSpVersion = 2;
- return true;
- }
- else if (version == V2_0 || version == V2_0_00)
- {
- majorVersion = 2;
- minorVersion = 0;
- minimumSpVersion = 0;
- return true;
- }
- else if (version == V2_0sp1)
- {
- majorVersion = 2;
- minorVersion = 0;
- minimumSpVersion = 1;
- return true;
- }
- else if (version == V2_0sp2)
- {
- majorVersion = 2;
- minorVersion = 0;
- minimumSpVersion = 2;
- return true;
- }
- else if (version == V1_1 || version == V1_1_00)
- {
- majorVersion = 1;
- minorVersion = 1;
- minimumSpVersion = 0;
- return true;
- }
- else if (version == V1_1sp1 || version == V1_1sp1Server)
- {
- majorVersion = 1;
- minorVersion = 1;
- minimumSpVersion = 1;
- return true;
- }
-
- return false;
- }
-
- ///
- /// Check if the given version if the framework is installed
- ///
- /// version to check.
- /// for .NET Framework 3.5 and any service pack this can be new Version(3,5) or new Version(3, 5, 21022, 8).
- /// for .NET 3.5 with SP1 this should be new Version(3, 5, 30729, 1).
- /// For other versions please check the table at http://support.microsoft.com/kb/318785.
- ///
- ///
- internal static bool IsFrameworkInstalled(Version version)
- {
- int minorVersion, majorVersion, minimumSPVersion;
- if (!FrameworkRegistryInstallation.CanCheckFrameworkInstallation(
- version,
- out majorVersion,
- out minorVersion,
- out minimumSPVersion))
- {
- return false;
- }
- return IsFrameworkInstalled(majorVersion, minorVersion, minimumSPVersion);
- }
-
- ///
- /// Check if the given version if the framework is installed
- ///
- /// Major version of .NET required, for .NET 3.5 this is 3.
- /// Minor version of .NET required, for .NET 3.5 this is 5.
- /// Minimum SP version required. 0 (Zero) or less means no SP requirement.
- /// true if the framework is available. False if it is not available or that could not be determined.
- internal static bool IsFrameworkInstalled(int majorVersion, int minorVersion, int minimumSPVersion)
- {
- string installKeyName, installValueName, spKeyName, spValueName;
- if (!FrameworkRegistryInstallation.GetRegistryNames(majorVersion, minorVersion, out installKeyName, out installValueName, out spKeyName, out spValueName))
- {
- return false;
- }
-
- RegistryKey installKey = FrameworkRegistryInstallation.GetRegistryKeySubKey(Registry.LocalMachine, installKeyName);
- if (installKey == null)
- {
- return false;
- }
-
- int? installValue = FrameworkRegistryInstallation.GetRegistryKeyValueInt(installKey, installValueName);
- if (installValue == null)
- {
- return false;
- }
- // The detection logic for .NET 4.5 is to check for the existence of a DWORD key named Release under HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full folder in the registry.
- // For .NET 4.5, the value of this key is the release number and not 1 (Install = 1 for .NET 3.5, .NET 4.0) . So, we need to bypasss the check below
- if ((majorVersion != 4 && minorVersion != 5) && (installValue != 1))
- {
- Debug.Assert(PSVersionInfo.CLRVersion.Major == 4, "This check is valid only for CLR Version 4.0 and .NET Version 4.5");
- return false;
- }
-
- if (minimumSPVersion > 0)
- {
- RegistryKey spKey = FrameworkRegistryInstallation.GetRegistryKeySubKey(Registry.LocalMachine, spKeyName);
- if (spKey == null)
- {
- return false;
- }
- int? spValue = FrameworkRegistryInstallation.GetRegistryKeyValueInt(spKey, spValueName);
- if (spValue == null)
- {
- return false;
- }
- if (spValue < minimumSPVersion)
- {
- return false;
- }
- }
-
- return true;
- }
- }
-#endif
-
///
/// Returns processor architecture for the current process.
/// If powershell is running inside Wow64, then is returned.
@@ -569,25 +181,8 @@ namespace System.Management.Automation
///
internal static bool IsRunningOnProcessorArchitectureARM()
{
-#if CORECLR
Architecture arch = RuntimeInformation.OSArchitecture;
- if (arch == Architecture.Arm || arch == Architecture.Arm64)
- {
- return true;
- }
- else
- {
- return false;
- }
-#else
- // Important:
- // this function has a clone in Workflow.ServiceCore in admin\monad\src\m3p\product\ServiceCore\WorkflowCore\WorkflowRuntimeCompilation.cs
- // if you are making any changes specific to this function then update the clone as well.
-
- var sysInfo = new NativeMethods.SYSTEM_INFO();
- NativeMethods.GetSystemInfo(ref sysInfo);
- return sysInfo.wProcessorArchitecture == NativeMethods.PROCESSOR_ARCHITECTURE_ARM;
-#endif
+ return arch == Architecture.Arm || arch == Architecture.Arm64;
}
///