Skip to content

Commit

Permalink
Merge pull request Azure#1136 from hovsepm/ClientRuntimeVersionUpdate
Browse files Browse the repository at this point in the history
Changed minor version bump to patch update for RC2 migration
  • Loading branch information
Hovsep committed Jun 3, 2016
2 parents 14a2cdf + 6b34175 commit cd47ac1
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 74 deletions.
2 changes: 1 addition & 1 deletion AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"CSharp.Tests": "2.0.0",
"Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)",
"Microsoft.Rest.ClientRuntime.Azure": "[4.0.1,5.0.0)",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10015"
}
Expand Down
2 changes: 1 addition & 1 deletion AutoRest/Generators/CSharp/CSharp.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"version": "1.0.0-rc2-*"
},
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)",
"Microsoft.Rest.ClientRuntime": "[3.0.1,4.0)",
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
"Microsoft.Extensions.Logging.Filter": "1.0.0-rc2-final",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.1.0-preview",
"version": "3.0.1-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.1.0,4.0)"
"Microsoft.Rest.ClientRuntime": "[3.0.1,4.0)"
},

"frameworks": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"version": "1.0.0-rc2-*"
},
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)",
"Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)",
"Microsoft.Rest.ClientRuntime.Azure": "[4.0.1,5.0.0)",
"Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.1-preview,4.0.0)",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10015"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "4.1.0",
"version": "4.0.1",
"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 @@ -20,6 +20,10 @@
"keyFile": "../../../Tools/MSSharedLibKey.snk"
},

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

"frameworks": {
"net45": {
"frameworkAssemblies": {
Expand All @@ -38,34 +42,20 @@
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Runtime": "1.0.2-rc2-24027",
"System.Collections": "4.0.11-rc2-24027",
"System.Collections.Concurrent": "4.0.12-rc2-24027",
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
"System.Diagnostics.Tracing": "4.1.0-rc2-24027",
"System.Globalization": "4.0.11-rc2-24027",
"System.IO": "4.1.0-rc2-24027",
"System.IO.Compression": "4.1.0-rc2-24027",
"System.Linq": "4.1.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Net.Http": "4.0.1-rc2-24027",
"System.Net.Primitives": "4.0.11-rc2-24027",
"System.ObjectModel": "4.0.12-rc2-24027",
"System.Reflection": "4.1.0-rc2-24027",
"System.Reflection.Extensions": "4.0.1-rc2-24027",
"System.Reflection.Primitives": "4.0.1-rc2-24027",
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
"System.Runtime": "4.1.0-rc2-24027",
"System.Runtime.Extensions": "4.1.0-rc2-24027",
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027",
"System.Runtime.Numerics": "4.0.1-rc2-24027",
"System.Text.Encoding": "4.0.11-rc2-24027",
"System.Text.Encoding.Extensions": "4.0.11-rc2-24027",
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
"System.Threading": "4.0.11-rc2-24027",
"System.Threading.Tasks": "4.0.11-rc2-24027",
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
"System.Xml.XDocument": "4.0.11-rc2-24027"
}
},
"netstandard1.5": {
Expand All @@ -75,39 +65,21 @@
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Runtime": "1.0.2-rc2-24027",
"System.Collections": "4.0.11-rc2-24027",
"System.Collections.Concurrent": "4.0.12-rc2-24027",
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
"System.Diagnostics.Tracing": "4.1.0-rc2-24027",
"System.Globalization": "4.0.11-rc2-24027",
"System.IO": "4.1.0-rc2-24027",
"System.IO.Compression": "4.1.0-rc2-24027",
"System.Linq": "4.1.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Net.Http": "4.0.1-rc2-24027",
"System.Net.Primitives": "4.0.11-rc2-24027",
"System.ObjectModel": "4.0.12-rc2-24027",
"System.Reflection": "4.1.0-rc2-24027",
"System.Reflection.Extensions": "4.0.1-rc2-24027",
"System.Reflection.Primitives": "4.0.1-rc2-24027",
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
"System.Runtime": "4.1.0-rc2-24027",
"System.Runtime.Extensions": "4.1.0-rc2-24027",
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027",
"System.Runtime.Numerics": "4.0.1-rc2-24027",
"System.Text.Encoding": "4.0.11-rc2-24027",
"System.Text.Encoding.Extensions": "4.0.11-rc2-24027",
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
"System.Threading": "4.0.11-rc2-24027",
"System.Threading.Tasks": "4.0.11-rc2-24027",
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
"System.Xml.XDocument": "4.0.11-rc2-24027"
}
}
},

"dependencies": {
"Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.1.0-preview",
"version": "2.0.1-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 @@ -20,15 +20,15 @@
"keyFile": "../../../Tools/MSSharedLibKey.snk"
},

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

"frameworks": {
"net45": {
"frameworkAssemblies": {
"System": ""
}
}
},

"dependencies": {
"Microsoft.Rest.ClientRuntime": "[3.1.0,4.0.0)"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.1.0-preview",
"version": "2.0.1-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 @@ -19,6 +19,11 @@
"keyFile": "../../../Tools/MSSharedLibKey.snk"
},

"dependencies": {
"Microsoft.Rest.ClientRuntime": "[3.0.1,4.0.0)",
"log4net": "2.0.3"
},

"frameworks": {
"net45": {
"frameworkAssemblies": {
Expand All @@ -30,9 +35,4 @@
}
}
},

"dependencies": {
"Microsoft.Rest.ClientRuntime": "[3.1.0,4.0.0)",
"log4net": "2.0.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"version": "1.0.0-rc2-*"
},
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)",
"Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)",
"Microsoft.Rest.ClientRuntime.Azure": "[4.0.1,5.0.0)",
"Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.1-preview,4.0.0)",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10015"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Runtime": "1.0.2-rc2-24027",
"Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.41",
"Microsoft.Rest.ClientRuntime.Log4Net": "[2.1.0-preview,3.0.0)",
"Microsoft.Rest.ClientRuntime.Etw": "[2.1.0-preview,3.0.0)",
"Microsoft.Rest.ClientRuntime.Log4Net": "[2.0.1-preview,3.0.0)",
"Microsoft.Rest.ClientRuntime.Etw": "[2.0.1-preview,3.0.0)",
"Newtonsoft.Json": "8.0.3",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10015"
Expand Down
44 changes: 24 additions & 20 deletions ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.1.0",
"version": "3.0.1",
"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,6 +20,10 @@
"keyFile": "../../../Tools/MSSharedLibKey.snk"
},

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

"frameworks": {
"net45": {
"frameworkAssemblies": {
Expand All @@ -31,16 +35,29 @@
"System.Runtime.Serialization": "",
"System.Xml": ""
},
"dependencies": {
"Newtonsoft.Json": "8.0.3"
}
},
"netstandard1.1": {
"buildOptions": { "define": [ "PORTABLE" ] },
"imports": ["dnxcore50", "portable-net45+win8"],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"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",
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
"System.Diagnostics.Tracing": "4.1.0-rc2-24027",
"System.Globalization": "4.0.11-rc2-24027",
"System.Linq": "4.1.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Net.Http": "4.0.1-rc2-24027",
"System.Net.Primitives": "4.0.11-rc2-24027",
"System.ObjectModel": "4.0.12-rc2-24027",
"System.Reflection.Extensions": "4.0.1-rc2-24027",
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
"System.Runtime.Extensions": "4.1.0-rc2-24027",
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
"System.Threading": "4.0.11-rc2-24027",
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
}
},
"netstandard1.5": {
Expand All @@ -50,34 +67,21 @@
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Runtime": "1.0.2-rc2-24027",
"System.Collections": "4.0.11-rc2-24027",
"System.Collections.Concurrent": "4.0.12-rc2-24027",
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
"System.Diagnostics.Tracing": "4.1.0-rc2-24027",
"System.Globalization": "4.0.11-rc2-24027",
"System.IO": "4.1.0-rc2-24027",
"System.IO.Compression": "4.1.0-rc2-24027",
"System.Linq": "4.1.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Net.Http": "4.0.1-rc2-24027",
"System.Net.Primitives": "4.0.11-rc2-24027",
"System.ObjectModel": "4.0.12-rc2-24027",
"System.Reflection": "4.1.0-rc2-24027",
"System.Reflection.Extensions": "4.0.1-rc2-24027",
"System.Reflection.Primitives": "4.0.1-rc2-24027",
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
"System.Runtime": "4.1.0-rc2-24027",
"System.Runtime.Extensions": "4.1.0-rc2-24027",
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027",
"System.Runtime.Numerics": "4.0.1-rc2-24027",
"System.Text.Encoding": "4.0.11-rc2-24027",
"System.Text.Encoding.Extensions": "4.0.11-rc2-24027",
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
"System.Threading": "4.0.11-rc2-24027",
"System.Threading.Tasks": "4.0.11-rc2-24027",
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
"System.Xml.XDocument": "4.0.11-rc2-24027",
"Newtonsoft.Json": "8.0.3"
}
}
}
Expand Down

0 comments on commit cd47ac1

Please sign in to comment.