Skip to content

Get '$PSVersionTable.PSVersion' from ProductVersion attribute #4863

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
daxian-dbw merged 18 commits into from
Sep 28, 2017
Merged

Get '$PSVersionTable.PSVersion' from ProductVersion attribute #4863

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7e0e6ad
Get 'PSVersion' from ProductVersion attribute
iSazonov Sep 19, 2017
c3bc0b8
Replace versionTable["GitCommitId"] with PSVersionInfo.GitCommitId
iSazonov Sep 20, 2017
16fe5da
Split GitCommitId on formatted and non-formatted
iSazonov Sep 20, 2017
04ef450
Remove 'powershell.version' file
iSazonov Sep 20, 2017
8c29037
Fix Enable-PSRemoting
iSazonov Sep 20, 2017
38b9827
Fix test
iSazonov Sep 20, 2017
b8a83fa
Add test
iSazonov Sep 20, 2017
0a15f55
Revert "Fix test"
iSazonov Sep 21, 2017
ce1ed51
Revert "Fix Enable-PSRemoting"
iSazonov Sep 21, 2017
5ec4f94
Revert "Split GitCommitId on formatted and non-formatted"
iSazonov Sep 21, 2017
b57f457
Improve tests
iSazonov Sep 21, 2017
b85ca57
Reconstruct raw GitCommitId
iSazonov Sep 21, 2017
fbc35bd
Minor fixes
iSazonov Sep 21, 2017
9f93ebe
Remove unused code
iSazonov Sep 22, 2017
9f740fa
Correct comment and add local variable
iSazonov Sep 22, 2017
ad92e3c
Fix GitCommitId, comments and tests
iSazonov Sep 27, 2017
f469c0e
Minor fixes to the comments
daxian-dbw Sep 27, 2017
2dbf568
Use $PSHome in tests
iSazonov Sep 28, 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
Prev Previous commit
Next Next commit
Replace versionTable["GitCommitId"] with PSVersionInfo.GitCommitId
  • Loading branch information
@iSazonov
iSazonov committed Sep 27, 2017
commit c3bc0b834f82e8242053634b360416a0c9b636bd
14 changes: 7 additions & 7 deletions src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function Register-PSSessionConfiguration
$pluginWsmanRunAsUserPath = [System.IO.Path]::Combine(""WSMan:\localhost\Plugin"", ""$pluginName"", ""RunAsUser"")
set-item -WarningAction SilentlyContinue $pluginWsmanRunAsUserPath $runAsCredential -confirm:$false
}} catch {{

remove-item (Join-Path WSMan:\localhost\Plugin ""$pluginName"") -recurse -force
write-error $_
# Do not add anymore clean up code after Write-Error, because if EA=Stop is set by user
Expand Down Expand Up @@ -1564,7 +1564,7 @@ internal static string GetWinrmPluginShellName()
Hashtable versionTable = PSVersionInfo.GetPSVersionTable();

@daxian-dbw daxian-dbw Sep 21, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It seems versionTable is not used anymore. This line can be removed.

@iSazonov iSazonov Sep 22, 2017

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Removed.

I see TODO comment - currently we can detect that we use 'Release Tag' and automate the name selection. Make sense?

@daxian-dbw daxian-dbw Sep 22, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't really understand the intention of this comment. Maybe we should open an issue to track it (fix or remove).

@daxian-dbw daxian-dbw Sep 21, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ditto.

@iSazonov iSazonov Sep 22, 2017

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Fixed.

// TODO: This should be PSVersionInfo.PSVersionName once we get
// closer to release. Right now it doesn't support alpha versions.
return System.String.Concat("PowerShell.", (string)versionTable["GitCommitId"]);
return System.String.Concat("PowerShell.", PSVersionInfo.GitCommitId);
}

/// <summary>
Expand All @@ -1577,7 +1577,7 @@ internal static string GetWinrmPluginDllPath()
Hashtable versionTable = PSVersionInfo.GetPSVersionTable();
// TODO: This should be PSVersionInfo.PSVersionName once we get
// closer to release. Right now it doesn't support alpha versions.
string pluginDllDirectory = System.IO.Path.Combine("%windir%\\system32\\PowerShell", (string)versionTable["GitCommitId"]);
string pluginDllDirectory = System.IO.Path.Combine("%windir%\\system32\\PowerShell", PSVersionInfo.GitCommitId);
return System.IO.Path.Combine(pluginDllDirectory, RemotingConstants.PSPluginDLLName);
}

Expand Down Expand Up @@ -2555,7 +2555,7 @@ function Unregister-PSSessionConfiguration
return
}}
}}

$shellsFound++

$shouldProcessTargetString = $targetTemplate -f $_.Name
Expand Down Expand Up @@ -2779,12 +2779,12 @@ function ExtractPluginProperties([string]$pluginDir, $objectToWriteTo)
}}

Get-Details $pluginDir $h

# Workflow is not supported in PowerShell Core. Attempting to load the
# assembly results in a FileNotFoundException.
if (![System.Management.Automation.Platform]::IsCoreCLR -AND
$h[""AssemblyName""] -eq ""Microsoft.PowerShell.Workflow.ServiceCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"") {{

$serviceCore = [Reflection.Assembly]::Load(""Microsoft.Powershell.Workflow.ServiceCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"")

if ($null -ne $serviceCore) {{
Expand Down Expand Up @@ -4967,7 +4967,7 @@ function Enable-PSRemoting
}}
}}
}}

# remove the 'network deny all' tag
Get-PSSessionConfiguration -Force:$Force | ForEach-Object {{
$sddl = $null
Expand Down