From c87d99bba0fee2d244f23b522eee2b7e147cfaae Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 14 Mar 2016 13:38:25 -0700 Subject: [PATCH 1/2] Bump omi-provider with AppContext.BaseDirectory fix --- src/omi-provider | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/omi-provider b/src/omi-provider index d9b7fde13..351dd4227 160000 --- a/src/omi-provider +++ b/src/omi-provider @@ -1 +1 @@ -Subproject commit d9b7fde13e159016f505081603a5f67bcd2b4871 +Subproject commit 351dd42278ba8ca27d29077e237f4d1b953b8554 From 5901e70dd06f66a96b3847e2976c9d68b410e7f8 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 14 Mar 2016 13:39:32 -0700 Subject: [PATCH 2/2] Revert work-around in Json.Tests.ps1 This resolves #627. --- test/powershell/Json.Tests.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/powershell/Json.Tests.ps1 b/test/powershell/Json.Tests.ps1 index a5157b9ae..53305d2a0 100644 --- a/test/powershell/Json.Tests.ps1 +++ b/test/powershell/Json.Tests.ps1 @@ -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)