Skip to content

Commit

Permalink
Merge pull request Azure#1159 from hovsepm/master
Browse files Browse the repository at this point in the history
Downgraded C# ClientRuntime reference to Json.Net in net45 platform to 6.0.8
  • Loading branch information
Hovsep authored Jun 12, 2016
2 parents 31e5a52 + b3084e2 commit f8683d0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -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" ],
Expand All @@ -21,7 +21,7 @@
},

"dependencies": {
"Microsoft.Rest.ClientRuntime": "[3.0.2,4.0)"
"Microsoft.Rest.ClientRuntime": "[3.0.3,4.0)"
},

"frameworks": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -21,7 +21,7 @@
},

"dependencies": {
"Microsoft.Rest.ClientRuntime": "[3.0.2,4.0)"
"Microsoft.Rest.ClientRuntime": "[3.0.3,4.0)"
},

"frameworks": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -21,7 +21,7 @@
},

"dependencies": {
"Microsoft.Rest.ClientRuntime": "[3.0.2,4.0.0)"
"Microsoft.Rest.ClientRuntime": "[3.0.3,4.0.0)"
},

"frameworks": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},

Expand Down
11 changes: 6 additions & 5 deletions ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -20,10 +20,6 @@
"keyFile": "../../../Tools/MSSharedLibKey.snk"
},

"dependencies": {
"Newtonsoft.Json": "8.0.3"
},

"frameworks": {
"net45": {
"frameworkAssemblies": {
Expand All @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit f8683d0

Please sign in to comment.