maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use a static cache for PSVersionInfo.PSVersion to avoid casting SemanticVersion to Version very time accessing that property (#10028)

Browse source
This commit is contained in:
Dongbo Wang 2019-07-03 21:13:41 -07:00 committed by Ilya
parent 2a80ed728f
commit 0bb122b193
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/System.Management.Automation/engine/PSVersionInfo.cs
View file

@ -4,8 +4,6 @@
using System.Collections;
using System.Diagnostics;
using System.Globalization;
using System.Management.Automation.Internal;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
@ -41,7 +39,7 @@ namespace System.Management.Automation
internal const string PSOSName = "OS";
internal const string SerializationVersionName = "SerializationVersion";
internal const string WSManStackVersionName = "WSManStackVersion";
private static PSVersionHashTable s_psVersionTable = null;
private static readonly PSVersionHashTable s_psVersionTable;
/// <summary>
/// A constant to track current PowerShell Version.
@ -54,14 +52,15 @@ namespace System.Management.Automation
/// For each later release of PowerShell, this constant needs to
/// be updated to reflect the right version.
/// </remarks>
private static Version s_psV1Version = new Version(1, 0);
private static Version s_psV2Version = new Version(2, 0);
private static Version s_psV3Version = new Version(3, 0);
private static Version s_psV4Version = new Version(4, 0);
private static Version s_psV5Version = new Version(5, 0);
private static Version s_psV51Version = new Version(5, 1, NTVerpVars.PRODUCTBUILD, NTVerpVars.PRODUCTBUILD_QFE);
private static SemanticVersion s_psV6Version = new SemanticVersion(6, 0, 0, null, null);
private static SemanticVersion s_psV7Version;
private static readonly Version s_psV1Version = new Version(1, 0);
private static readonly Version s_psV2Version = new Version(2, 0);
private static readonly Version s_psV3Version = new Version(3, 0);
private static readonly Version s_psV4Version = new Version(4, 0);
private static readonly Version s_psV5Version = new Version(5, 0);
private static readonly Version s_psV51Version = new Version(5, 1, NTVerpVars.PRODUCTBUILD, NTVerpVars.PRODUCTBUILD_QFE);
private static readonly SemanticVersion s_psV6Version = new SemanticVersion(6, 0, 0, preReleaseLabel: null, buildLabel: null);
private static readonly SemanticVersion s_psSemVersion;
private static readonly Version s_psVersion;
/// <summary>
/// A constant to track current PowerShell Edition.
@ -100,12 +99,13 @@ namespace System.Management.Automation
rawGitCommitId = mainVersion;
}
s_psV7Version = new SemanticVersion(mainVersion);
s_psSemVersion = new SemanticVersion(mainVersion);
s_psVersion = (Version)s_psSemVersion;
s_psVersionTable[PSVersionInfo.PSVersionName] = s_psV7Version;
s_psVersionTable[PSVersionInfo.PSVersionName] = s_psSemVersion;
s_psVersionTable[PSVersionInfo.PSEditionName] = PSEditionValue;
s_psVersionTable[PSGitCommitIdName] = rawGitCommitId;
s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV7Version };
s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psVersion };
s_psVersionTable[PSVersionInfo.SerializationVersionName] = new Version(InternalSerializer.DefaultVersion);
s_psVersionTable[PSVersionInfo.PSRemotingProtocolVersionName] = RemotingConstants.ProtocolVersion;
s_psVersionTable[PSVersionInfo.WSManStackVersionName] = GetWSManStackVersion();
@ -122,7 +122,7 @@ namespace System.Management.Automation
{
var result = (Hashtable)s_psVersionTable.Clone();
// Downlevel systems don't support SemanticVersion, but Version is most likely good enough anyway.
result[PSVersionInfo.PSVersionName] = (Version)(SemanticVersion)s_psVersionTable[PSVersionInfo.PSVersionName];
result[PSVersionInfo.PSVersionName] = s_psVersion;
return result;
}
@ -173,7 +173,7 @@ namespace System.Management.Automation
{
get
{
return (SemanticVersion)GetPSVersionTable()[PSVersionInfo.PSVersionName];
return s_psVersion;
}
}
@ -181,7 +181,7 @@ namespace System.Management.Automation
{
get
{
return (string)GetPSVersionTable()[PSGitCommitIdName];
return (string)s_psVersionTable[PSGitCommitIdName];
}
}
@ -189,7 +189,7 @@ namespace System.Management.Automation
{
get
{
return (Version[])GetPSVersionTable()[PSCompatibleVersionsName];
return (Version[])s_psVersionTable[PSCompatibleVersionsName];
}
}
@ -200,7 +200,7 @@ namespace System.Management.Automation
{
get
{
return (string)GetPSVersionTable()[PSVersionInfo.PSEditionName];
return (string)s_psVersionTable[PSVersionInfo.PSEditionName];
}
}
@ -208,7 +208,7 @@ namespace System.Management.Automation
{
get
{
return (Version)GetPSVersionTable()[SerializationVersionName];
return (Version)s_psVersionTable[SerializationVersionName];
}
}
@ -272,9 +272,9 @@ namespace System.Management.Automation
internal static bool IsValidPSVersion(Version version)
{
if (version.Major == s_psV7Version.Major)
if (version.Major == s_psSemVersion.Major)
{
return version.Minor == s_psV7Version.Minor;
return version.Minor == s_psSemVersion.Minor;
}
if (version.Major == s_psV6Version.Major)
@ -327,9 +327,9 @@ namespace System.Management.Automation
get { return s_psV6Version; }
}
internal static SemanticVersion PSV7Version
internal static SemanticVersion PSCurrentVersion
{
get { return s_psV7Version; }
get { return s_psSemVersion; }
}
#endregion