maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #659 from PowerShell/appcontext

Browse source 
Fix AppContext.BaseDirectory when remoting
This commit is contained in:
Andy Schwartzmeyer 2016-03-14 13:54:50 -07:00
parent 02184b3c96 5901e70dd0
commit c541b2bc21
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/omi-provider

@ -1 +1 @@
Subproject commit d9b7fde13e159016f505081603a5f67bcd2b4871
Subproject commit 351dd42278ba8ca27d29077e237f4d1b953b8554

7
test/powershell/Json.Tests.ps1
View file

@ -6,12 +6,7 @@
Describe "Json.NET LINQ Parsing" {
# load third party Json.NET library
if ([string]::IsNullOrEmpty($env:CORE_ROOT)) {
$base = [System.AppContext]::BaseDirectory
} else {
$base = $env:CORE_ROOT
}
$base = [System.AppContext]::BaseDirectory
$path = Join-Path $base Newtonsoft.Json.dll
[Microsoft.PowerShell.CoreCLR.AssemblyExtensions]::LoadFrom($path)