Merge pull request puppetlabs#214 from RandomNoun7/tickets/master/IMAGES-795-fix_assembly_loading_on_new_win_image

glennsarti · web-flow · commit ce456d1f19d9 · 2018-03-27T12:51:41.000+08:00
(IMAGES-795) 2008r2 template failing PowerShell module tests
diff --git a/lib/puppet_x/templates/powershell/init_ps.ps1 b/lib/puppet_x/templates/powershell/init_ps.ps1
@@ -748,6 +748,8 @@ function Start-PipeServer
     $Encoding
   )
 
+  Add-Type -AssemblyName "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+
   # this does not require versioning in the payload as client / server are tightly coupled
   $server = New-Object System.IO.Pipes.NamedPipeServerStream($CommandChannelPipeName,
     [System.IO.Pipes.PipeDirection]::InOut)

Original file line number	Diff line number	Diff line change
`@@ -748,6 +748,8 @@ function Start-PipeServer`
`748`	`748`	`$Encoding`
`749`	`749`	`)`
`750`	`750`
	`751`	`+ Add-Type -AssemblyName "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"`
	`752`	`+`
`751`	`753`	`# this does not require versioning in the payload as client / server are tightly coupled`
`752`	`754`	`$server = New-Object System.IO.Pipes.NamedPipeServerStream($CommandChannelPipeName,`
`753`	`755`	`[System.IO.Pipes.PipeDirection]::InOut)`