admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
src/omi-provider
+1 -1
Submodule src/omi-provider updated: d9b7fde13e...351dd42278
test/powershell/Json.Tests.ps1
+1 -6
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)