8000 Create the default PSSession configuration, not tied to a specific PowerShell version. by kalgiz · Pull Request #6519 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]
Skip to content

Create the default PSSession configuration, not tied to a specific PowerShell version. #6519

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
merged 44 commits into from
Apr 10, 2018
Merged

Create the default PSSession configuration, not tied to a specific PowerShell version. #6519

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
2945dcd
[Feature] Create the default PSSession configuration, not tied to a s…
kalgiz Mar 27, 2018
f63fa87
[Feature] Tests for Enable-PSRemoting
kalgiz Mar 28, 2018
1cc6d32
[Feature] Enable-PSRemoiting command fix.
kalgiz Mar 28, 2018
b200048
[Feature] Enable-PSRemoting, dealing with corner case added.
kalgiz Mar 28, 2018
969f611
[Feature] Remoting tests correction
kalgiz Mar 28, 2018
0701ed2
[Feature] Install-PowerShellRemoting script adds the configuration na…
kalgiz Mar 28, 2018
e73c156
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Mar 28, 2018
d545c92
[Feature]
kalgiz Mar 28, 2018
f280922
[Feature] Correcting tests for non Windows platforms.
kalgiz Mar 28, 2018
6beafc0
commit
kalgiz Mar 28, 2018
0f375d2
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
kalgiz Mar 28, 2018
67a8772
[Feature] Not overwriting existing session by command Enable-PSRemoting.
kalgiz Mar 29, 2018
a30542d
[Feature] Enable-PSRemoting command correction.
kalgiz Mar 29, 2018
a9da476
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Mar 29, 2018
cb19b50
Merge branch 'master' of https://github.com/PowerShell/PowerShell
kalgiz Mar 29, 2018
3c0fa49
Merge branch 'master' of https://github.com/kalgiz/PowerShell
kalgiz Mar 30, 2018
3fcb173
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Mar 30, 2018
d9782a3
[Feature] Comments for endpoints' name clarifications added.
kalgiz Mar 30, 2018
4a8b4c5
Merge branch 'master' of https://github.com/PowerShell/PowerShell
kalgiz Apr 2, 2018
9d81797
Merge branch 'master' of https://github.com/kalgiz/PowerShell
kalgiz Apr 2, 2018
9dfa552
Merge branch 'master' of https://github.com/PowerShell/PowerShell
kalgiz Apr 3, 2018
95474a0
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Apr 3, 2018
1836dca
Code fixes.
kalgiz Apr 4, 2018
7b2af9f
Set-StrictoMode Latest added to the psremoting scripts.
kalgiz Apr 4, 2018
4247332
Merge branch 'master' of https://github.com/PowerShell/PowerShell
kalgiz Apr 4, 2018
412ca3a
Merge branch 'master' of https://github.com/kalgiz/PowerShell
kalgiz Apr 4, 2018
f4a9ade
and ShouldProcess in Intall-PowerShellRemoting script.
kalgiz Apr 4, 2018
dd00e2c
Enable-PSRemoting corrections after running SA.
kalgiz Apr 4, 2018
ba55e12
-ErrorAction Stop in Install-PowerShellRemoting module.
kalgiz Apr 4, 2018
7c4560b
-ErrorAction Stop used for commands in Enable-PSRemoting definition.
kalgiz Apr 4, 2018
21fd7ae
check for administrator rights moved to the beginning of the script.
kalgiz Apr 4, 2018
5f3a58a
Merge branch 'master' of https://github.com/PowerShell/PowerShell
kalgiz Apr 5, 2018
701e6ff
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Apr 5, 2018
40f98ff
Merge branch 'master' of https://github.com/PowerShell/PowerShell
kalgiz Apr 6, 2018
1d6e199
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Apr 6, 2018
b8517e7
[Feature] Write-Error if Install-PowerShellRemoting is called without…
kalgiz Apr 6, 2018
e0f15c4
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Apr 6, 2018
26046c5
Merge branch 'remoting-conf-name' of https://github.com/kalgiz/PowerS…
kalgiz Apr 9, 2018
f7b0127
Correcting erorr appearing because of the Strict Mode
kalgiz Apr 9, 2018
479a2dc
[Feature] Write-Error with -Category and -ErrorId parameters.
kalgiz Apr 9, 2018
0c74b16
[Feature] Remove check of the value of non assigned variable.
kalgiz Apr 9, 2018
9aa27fb
Merge branch 'master' of https://github.com/PowerShell/PowerShell
kalgiz Apr 9, 2018
aede937
Merge branch 'master' of https://github.com/kalgiz/PowerShell
kalgiz Apr 9, 2018
f01b4ca
Merge branch 'master' of https://github.com/kalgiz/PowerShell into re…
kalgiz Apr 9, 2018
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
[Feature] Not overwriting existing session by command Enable-PSRemoting.
  • Loading branch information
@kalgiz
kalgiz committed Mar 29, 2018
commit 67a87729f4e16b223a5f92e9ac2e6bb2a2f5152b
62 changes: 35 additions & 27 deletions src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
View file
Open in desktop
559B
Original file line number Diff line number Diff line change
Expand Up @@ -4867,6 +4867,39 @@ function Register-Endpoint
restart-service winrm -confirm:$false
}}

function Register-EndpointIfNotPresent
{{
param(
[Parameter()] [string] $configurationName
)
#
# This cmdlet will make sure default powershell end points exist upon successful completion.
#
# Windows PowerShell:
# Microsoft.PowerShell
# Microsoft.PowerShell32 (wow64)
#
# PowerShell Core:
# PowerShell.<version ID>
#
$errorCount = $error.Count
$endPoint = Get-PSSessionConfiguration $configurationName -Force:$Force -ErrorAction silentlycontinue 2>&1
$newErrorCount = $error.Count

# remove the 'No Session Configuration matches criteria' errors
for ($index = 0; $index -lt ($newErrorCount - $errorCount); $index ++)
{{
$error.RemoveAt(0)
}}

$qMessage = $queryForRegisterDefault -f ""$configurationName"",""Register-PSSessionConfiguration {0} -force""
if ((!$endpoint) -and
($force -or $pscmdlet.ShouldProcess($qMessage, $captionForRegisterDefault)))
{{
Register-Endpoint $configurationName
}}
}}

function Enable-PSRemoting
{{
[CmdletBinding(SupportsShouldProcess=$true, ConfirmImpact=""Medium"")]
Expand Down Expand Up @@ -4895,40 +4928,15 @@ function Enable-PSRemoting
# first try to enable all the sessions
Enable-PSSessionConfiguration @PSBoundParameters

#
# This cmdlet will make sure default powershell end points exist upon successful completion.
#
# Windows PowerShell:
# Microsoft.PowerShell
# Microsoft.PowerShell32 (wow64)
#
# PowerShell Core:
# PowerShell.<version ID>
#
$errorCount = $error.Count
$endPoint = Get-PSSessionConfiguration {0} -Force:$Force -ErrorAction silentlycontinue 2>&1
$newErrorCount = $error.Count

# remove the 'No Session Configuration matches criteria' errors
for ($index = 0; $index -lt ($newErrorCount - $errorCount); $index ++)
{{
$error.RemoveAt(0)
}}

$qMessage = $queryForRegisterDefault -f ""{0}"",""Register-PSSessionConfiguration {0} -force""
if ((!$endpoint) -and
($force -or $pscmdlet.ShouldProcess($qMessage, $captionForRegisterDefault)))
{{
Register-Endpoint {0}
}}
Register-EndpointIfNotPresent {0}

# Create the default PSSession configuration, not tied to any specific PowerShell version.
Copy link
Contributor

Choose a reason for hiding this comment

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

Again, please add an example name in the comment to illustrate how the endpoint name should look. I think this will help other developers reading the code.

8000 Copy link
Contributor Author

Choose a reason for hiding this comment

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

Comment added.

$powershellNr = $PSVersionTable.PSVersion.ToString()
Copy link
Member

Choose a reason for hiding this comment

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

Can you change the Nr portion to a meaningful name

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed to $powershellVersionMajor.

$dotPos = $powershellNr.IndexOf(""."")
if ($dotPos -ne -1) {{
$powershellNr = $powershellNr.Substring(0, $dotPos)
}}
Register-Endpoint (""PowerShell."" + $powershellNr)
Register-EndpointIfNotPresent (""PowerShell."" + $powershellNr)

# PowerShell Workflow and WOW are not supported for PowerShell Core
if (![System.Management.Automation.Platform]::IsCoreCLR)
Expand Down
0