From e0b44475b02aa45297d3ddc1d9047d2947c585b2 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 11 Aug 2016 11:27:38 -0700 Subject: [PATCH 1/2] Update project.json to depend on Microsoft.NETCore.Runtime.CoreCLR.1.0.4 This new package contains 2 fixes that will unblock powershell remoting for windows OPS --- src/powershell-unix/project.json | 3 ++- src/powershell-win-core/project.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/powershell-unix/project.json b/src/powershell-unix/project.json index ad4b11370..aaf2f5a42 100644 --- a/src/powershell-unix/project.json +++ b/src/powershell-unix/project.json @@ -66,7 +66,8 @@ "define": [ "CORECLR" ] }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4" } } }, diff --git a/src/powershell-win-core/project.json b/src/powershell-win-core/project.json index 91d41b80f..6a64140c5 100644 --- a/src/powershell-win-core/project.json +++ b/src/powershell-win-core/project.json @@ -69,7 +69,8 @@ "define": [ "CORECLR" ] }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0" + "Microsoft.NETCore.App": "1.0.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.4" } } }, From 76ca7e5f52fa4446f18a506ae5a2287e75d6e410 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 11 Aug 2016 11:43:31 -0700 Subject: [PATCH 2/2] Update to depend on Newtonsoft.Json.9.0.1 --- src/Microsoft.PowerShell.Commands.Utility/project.json | 2 +- src/Microsoft.PowerShell.ConsoleHost/project.json | 2 +- src/System.Management.Automation/project.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index af085ef54..562aaf075 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -86,7 +86,7 @@ "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { "Microsoft.CodeAnalysis.CSharp": "1.1.1", - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1", "System.Diagnostics.TextWriterTraceListener": "4.0.0" } }, diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index 879fc82fc..d2f2a8f23 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -45,7 +45,7 @@ } }, "dependencies": { - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1", "System.Xml.XDocument": "4.0.11", "System.IO.MemoryMappedFiles": "4.0.0" } diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index f60feb16c..10b2effc6 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -144,7 +144,7 @@ "Microsoft.CSharp": "4.0.1", "Microsoft.Win32.Registry.AccessControl": "4.0.0", - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1", "System.Collections.Specialized": "4.0.1", "System.Collections.NonGeneric": "4.0.1", "System.ComponentModel.EventBasedAsync": "4.0.11",