Merge pull request #659 from PowerShell/appcontext
Fix AppContext.BaseDirectory when remoting
This commit is contained in:
commit
c541b2bc21
2 changed files with 2 additions and 7 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit d9b7fde13e159016f505081603a5f67bcd2b4871
|
Subproject commit 351dd42278ba8ca27d29077e237f4d1b953b8554
|
|
@ -6,12 +6,7 @@
|
||||||
|
|
||||||
Describe "Json.NET LINQ Parsing" {
|
Describe "Json.NET LINQ Parsing" {
|
||||||
# load third party Json.NET library
|
# load third party Json.NET library
|
||||||
if ([string]::IsNullOrEmpty($env:CORE_ROOT)) {
|
$base = [System.AppContext]::BaseDirectory
|
||||||
$base = [System.AppContext]::BaseDirectory
|
|
||||||
} else {
|
|
||||||
$base = $env:CORE_ROOT
|
|
||||||
}
|
|
||||||
|
|
||||||
$path = Join-Path $base Newtonsoft.Json.dll
|
$path = Join-Path $base Newtonsoft.Json.dll
|
||||||
[Microsoft.PowerShell.CoreCLR.AssemblyExtensions]::LoadFrom($path)
|
[Microsoft.PowerShell.CoreCLR.AssemblyExtensions]::LoadFrom($path)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue