Skip to content

Remove ClrVersion property from $PSVersionTable #4027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mirichmo merged 4 commits into from
Jun 19, 2017
Merged

Remove ClrVersion property from $PSVersionTable #4027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
645c875
ClrVersion property of $PSVersionTable is not useful with CoreCLR and…
SteveL-MSFT Jun 15, 2017
6d8d085
Removed internal members used for CLRVersion
SteveL-MSFT Jun 16, 2017
5420ebf
removed CLRVersion from FullCLR build as well
SteveL-MSFT Jun 19, 2017
87411c5
added additional information to run `start-psbootstrap -buildnative` …
SteveL-MSFT Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ function Start-PSBuild {

if ($IsWindows) {
# cmake is needed to build powershell.exe
$precheck = $precheck -and (precheck 'cmake' 'cmake not found. Run Start-PSBootstrap. You can also install it from https://chocolatey.org/packages/cmake')
$precheck = $precheck -and (precheck 'cmake' 'cmake not found. Run "Start-PSBootstrap -BuildNative". You can also install it from https://chocolatey.org/packages/cmake')

Use-MSBuild

Expand All @@ -213,7 +213,7 @@ function Start-PSBuild {

} elseif ($IsLinux -or $IsOSX) {
foreach ($Dependency in 'cmake', 'make', 'g++') {
$precheck = $precheck -and (precheck $Dependency "Build dependency '$Dependency' not found. Run Start-PSBootstrap.")
$precheck = $precheck -and (precheck $Dependency "Build dependency '$Dependency' not found. Run 'Start-PSBootstrap -BuildNative'.")
}
}

Expand Down
11 changes: 0 additions & 11 deletions src/System.Management.Automation/engine/PSVersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ internal class PSVersionInfo
internal const string PSEditionName = "PSEdition";
internal const string PSGitCommitIdName = "GitCommitId";
internal const string PSCompatibleVersionsName = "PSCompatibleVersions";
internal const string PSCLRVersionName = "CLRVersion";
internal const string PSPlatformName = "Platform";
internal const string PSOSName = "OS";
internal const string SerializationVersionName = "SerializationVersion";
Expand Down Expand Up @@ -71,10 +70,8 @@ static PSVersionInfo()
s_psVersionTable[PSVersionInfo.WSManStackVersionName] = GetWSManStackVersion();
s_psVersionTable[PSPlatformName] = Environment.OSVersion.Platform.ToString();
#if CORECLR
s_psVersionTable[PSCLRVersionName] = null;
s_psVersionTable[PSOSName] = Runtime.InteropServices.RuntimeInformation.OSDescription.ToString();
#else
s_psVersionTable[PSCLRVersionName] = Environment.Version;
s_psVersionTable[PSOSName] = Environment.OSVersion.ToString();
#endif
}
Expand Down Expand Up @@ -162,14 +159,6 @@ internal static string GitCommitId
}
}

internal static Version CLRVersion
Copy link
Member

@mirichmo mirichmo Jun 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is our stance on removing FullCLR compatibility of the code? If we are dropping that requirement and only focusing on CoreCLR, then you should remove PSCLRVersionName from line 77 as well.

Copy link
Member Author

@SteveL-MSFT SteveL-MSFT Jun 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed it since we removed the other members anyways. After beta.3 goes out, I intend to revisit the discussion about removing FullCLR code.

{
get
{
return (Version)GetPSVersionTable()[PSCLRVersionName];
}
}

internal static Version[] PSCompatibleVersions
{
get
Expand Down
3 changes: 1 addition & 2 deletions test/powershell/Host/PSVersionTable.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
Describe "PSVersionTable" -Tags "CI" {
It "Should have version table entries" {
$PSVersionTable.Count | Should Be 10
$PSVersionTable.Count | Should Be 9
}

It "Should have the right version table entries" {
$PSVersionTable.ContainsKey("PSVersion") | Should Be True
$PSVersionTable.ContainsKey("PSEdition") | Should Be True
$PSVersionTable.ContainsKey("WSManStackVersion") | Should Be True
$PSVersionTable.ContainsKey("SerializationVersion") | Should Be True
$PSVersionTable.ContainsKey("CLRVersion") | Should Be True
$PSVersionTable.ContainsKey("PSCompatibleVersions") | Should Be True
$PSVersionTable.ContainsKey("PSRemotingProtocolVersion") | Should Be True
$PSVersionTable.ContainsKey("GitCommitId") | Should Be True
Expand Down