From b3084e2b7470c914d54aaac09495f7731a388646 Mon Sep 17 00:00:00 2001 From: Hovsep Mkrtchyan Date: Sat, 11 Jun 2016 13:12:34 -0700 Subject: [PATCH] Downgraded C# ClientRuntime reference to Json.Net in net45 platform to 6.0.8 --- .../project.json | 4 ++-- .../Microsoft.Rest.ClientRuntime.Azure/project.json | 4 ++-- .../Microsoft.Rest.ClientRuntime.Etw/project.json | 4 ++-- .../Microsoft.Rest.ClientRuntime.Log4Net/project.json | 4 ++-- .../CSharp/Microsoft.Rest.ClientRuntime/project.json | 11 ++++++----- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json index a8a4b2bf9a0c8..eb879183e3db8 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json @@ -1,5 +1,5 @@ { - "version": "3.0.2-preview", + "version": "3.0.3-preview", "title": "Authentication for Azure Management Clients", "description": "Provides ADAL based authentication for Azure management client libraries \nSupported Platforms:\n - Portable Class Libraries\n - .NET Framework 4.5\n - Windows 8\n - Windows Phone 8.1\n - DotNet Core", "authors": [ "Microsoft" ], @@ -21,7 +21,7 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0)" + "Microsoft.Rest.ClientRuntime": "[3.0.3,4.0)" }, "frameworks": { diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json index 3faa12b27722a..71fd9a7ae1d5f 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json @@ -1,5 +1,5 @@ { - "version": "4.0.2", + "version": "4.0.3", "copyright": "Copyright (c) Microsoft Corporation", "title": "Client Runtime for Microsoft Azure Libraries", "description": "Provides common error handling, tracing, and HTTP/REST-based pipeline manipulation. \nSupported Platforms:\n - Portable Class Libraries\n - .NET Framework 4.5\n - Windows 8\n - Windows Phone 8.1\n - DotNet Core", @@ -21,7 +21,7 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0)" + "Microsoft.Rest.ClientRuntime": "[3.0.3,4.0)" }, "frameworks": { diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json index 376c137a5e5f3..782055795c0ed 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json @@ -1,5 +1,5 @@ { - "version": "2.0.2-preview", + "version": "2.0.3-preview", "title": "ETW Logger for Microsoft AutoRest Generated Clients", "description": "Enables tracing of event messages for AutoRest generated client libraries events via ETW (Event Tracing for Windows). ETW events can be captured by subscribing to the \"Microsoft.Rest\" event source.", "copyright": "Copyright (c) Microsoft Corporation", @@ -21,7 +21,7 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0.0)" + "Microsoft.Rest.ClientRuntime": "[3.0.3,4.0.0)" }, "frameworks": { diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json index aa382c3102d4a..b4c872642c464 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json @@ -1,5 +1,5 @@ { - "version": "2.0.2-preview", + "version": "2.0.3-preview", "title": "Log4Net Logger for Microsoft AutoRest Generated Clients", "description": "Enables logging of event messages for AutoRest generated client libraries via Log4Net.", "copyright": "Copyright (c) Microsoft Corporation", @@ -20,7 +20,7 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0.0)", + "Microsoft.Rest.ClientRuntime": "[3.0.3,4.0.0)", "log4net": "2.0.3" }, diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json index f4e6772247cf9..9547f91a20353 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json @@ -1,5 +1,5 @@ { - "version": "3.0.2", + "version": "3.0.3", "copyright": "Copyright (c) Microsoft Corporation", "title": "Client Runtime Library for Microsoft AutoRest Generated Clients", "description": "Infrastructure for error handling, tracing, and HttpClient pipeline configuration. Required by client libraries generated using AutoRest. \nSupported Platforms:\n - Portable Class Libraries\n - .NET Framework 4.5\n - Windows 8\n - Windows Phone 8.1\n - DotNet Core", @@ -20,10 +20,6 @@ "keyFile": "../../../Tools/MSSharedLibKey.snk" }, - "dependencies": { - "Newtonsoft.Json": "8.0.3" - }, - "frameworks": { "net45": { "frameworkAssemblies": { @@ -35,11 +31,15 @@ "System.Runtime.Serialization": "", "System.Xml": "" }, + "dependencies": { + "Newtonsoft.Json": "6.0.8" + }, }, "netstandard1.1": { "buildOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { + "Newtonsoft.Json": "8.0.3", "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", "System.Collections": "4.0.11-rc2-24027", @@ -64,6 +64,7 @@ "buildOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50"], "dependencies": { + "Newtonsoft.Json": "8.0.3", "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", "System.Collections": "4.0.11-rc2-24027",