Converting CSharp ClientRuntime projects to CoreClr

begoldsm · Apr 13, 2016 · 646e72a · 646e72a
1 parent b73c784
commit 646e72a
Show file tree

Hide file tree

Showing 9 changed files with 169 additions and 118 deletions.
diff --git 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": "2.0.1-preview",
+  "version": "3.0.0-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" ],
@@ -15,20 +15,29 @@
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "[2.1.0,3.0)"
+    "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0)"
   },
 
   "frameworks": {
-    "dnxcore50": {
+    "net45": {
+      "dependencies": {
+        "Microsoft.IdentityModel.Clients.ActiveDirectory": "[2.18.206251556]"
+      }
+    },    
+    "netstandard1.1": {
       "compilationOptions": { "define": [ "PORTABLE" ] },
+      "imports": ["dnxcore50", "portable-net45+win8"],
       "dependencies": {
-        "Microsoft.Cci": "4.0.0-beta-23409",
+        "Microsoft.Cci": "4.0.0-rc2-23931",
         "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha"
       }
     },
-    "net45": {
+    "netstandard1.5": {
+      "compilationOptions": { "define": [ "PORTABLE" ] },
+      "imports": ["dnxcore50"],
       "dependencies": {
-        "Microsoft.IdentityModel.Clients.ActiveDirectory": "[2.18.206251556]"
+        "Microsoft.Cci": "4.0.0-rc2-23931",
+        "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha"
       }
     }
   }

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json
@@ -5,25 +5,19 @@
   "tags": [ "Microsoft AutoRest ClientRuntime REST" ],
   "projectUrl": "https://github.com/Azure/AutoRest",
   "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE",
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
+
+  "testRunner": "xunit",
   "frameworks": {
-    "dnxcore50": {
+    "netcoreapp1.0": {
       "compilationOptions": { "define": [ "PORTABLE" ] },
-      "dependencies": {
-        "System.Diagnostics.Tools": "4.0.0",
-        "System.Net.Http": "4.0.0",
-        "System.Threading.Tasks": "4.0.10",
-        "System.Xml.ReaderWriter": "4.0.10",
-        "Microsoft.CSharp": "4.0.0",
-        "xunit.runner.dnx": "2.1.0-rc1-build198"
-      }
+      "imports": ["dnxcore50", "portable-net45+win8"]
     }
   },
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime.Azure": "",
-    "Microsoft.Rest.ClientRuntime.Azure.Authentication": "",
-    "xunit": "2.1.0"
+    "Microsoft.NETCore.App": "1.0.0-rc2-24008",
+    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.0,5.0.0)",
+    "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.0-preview,4.0.0)",
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-dev-140469-38"
   }
 }
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.2.0",
+  "version": "4.0.0",
   "copyright": "Copyright (c) Microsoft Corporation",
   "iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890",
   "title": "Client Runtime for Microsoft Azure Libraries",
@@ -19,47 +19,91 @@
   "frameworks": {
     "net45": {
       "frameworkAssemblies": {
+        "mscorlib": "",
         "System": "",
         "System.Net": "",
         "System.Net.Http": "",
         "System.Net.Http.WebRequest": "",
         "System.Xml": ""
       }
     },
-    ".NETPortable,Version=v4.5,Profile=Profile111": {
+    "netstandard1.1": {
       "compilationOptions": { "define": [ "PORTABLE" ] },
-      "frameworkAssemblies": {
-        "System": "",
-        "System.Collections": "",
-        "System.Diagnostics.Debug": "",
-        "System.Diagnostics.Tools": "",
-        "System.Globalization": "",
-        "System.IO": "",
-        "System.Linq": "",
-        "System.Linq.Expressions": "",
-        "System.Net": "",
-        "System.Net.Http": "",
-        "System.Net.Primitives": "",
-        "System.ObjectModel": "",
-        "System.Reflection": "",
-        "System.Reflection.Extensions": "",
-        "System.Resources.ResourceManager": "",
-        "System.Runtime": "",
-        "System.Runtime.Extensions": "",
-        "System.Runtime.Serialization": "",
-        "System.Text.Encoding": "",
-        "System.Threading": "",
-        "System.Threading.Tasks": "",
-        "System.Xml": "",
-        "System.Xml.XmlSerializer": ""
+      "imports": ["dnxcore50", "portable-net45+win8"],
+      "dependencies": {
+        "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
+        "Microsoft.NETCore.Runtime": "1.0.2-rc2-23931",
+        "System.Collections": "4.0.11-rc2-23931",
+        "System.Collections.Concurrent": "4.0.12-rc2-23931",
+        "System.Diagnostics.Debug": "4.0.11-rc2-23931",
+        "System.Diagnostics.Tools": "4.0.1-rc2-23931",
+        "System.Diagnostics.Tracing": "4.1.0-rc2-23931",
+        "System.Globalization": "4.0.11-rc2-23931",
+        "System.IO": "4.1.0-rc2-23931",
+        "System.IO.Compression": "4.1.0-rc2-23931",
+        "System.Linq": "4.1.0-rc2-23931",
+        "System.Linq.Expressions": "4.0.11-rc2-23931",
+        "System.Net.Http": "4.0.1-rc2-23931",
+        "System.Net.Primitives": "4.0.11-rc2-23931",
+        "System.ObjectModel": "4.0.12-rc2-23931",
+        "System.Reflection": "4.1.0-rc2-23931",
+        "System.Reflection.Extensions": "4.0.1-rc2-23931",
+        "System.Reflection.Primitives": "4.0.1-rc2-23931",
+        "System.Resources.ResourceManager": "4.0.1-rc2-23931",
+        "System.Runtime": "4.1.0-rc2-23931",
+        "System.Runtime.Extensions": "4.1.0-rc2-23931",
+        "System.Runtime.InteropServices": "4.1.0-rc2-23931",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931",
+        "System.Runtime.Numerics": "4.0.1-rc2-23931",
+        "System.Text.Encoding": "4.0.11-rc2-23931",
+        "System.Text.Encoding.Extensions": "4.0.11-rc2-23931",
+        "System.Text.RegularExpressions": "4.0.12-rc2-23931",
+        "System.Threading": "4.0.11-rc2-23931",
+        "System.Threading.Tasks": "4.0.11-rc2-23931",
+        "System.Xml.ReaderWriter": "4.0.11-rc2-23931",
+        "System.Xml.XDocument": "4.0.11-rc2-23931"
       }
     },
-    "dnxcore50": {
-      "compilationOptions": { "define": [ "PORTABLE" ] }
+    "netstandard1.5": {
+      "compilationOptions": { "define": [ "PORTABLE" ] },
+      "imports": ["dnxcore50"],
+      "dependencies": {
+        "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
+        "Microsoft.NETCore.Runtime": "1.0.2-rc2-23931",
+        "System.Collections": "4.0.11-rc2-23931",
+        "System.Collections.Concurrent": "4.0.12-rc2-23931",
+        "System.Diagnostics.Debug": "4.0.11-rc2-23931",
+        "System.Diagnostics.Tools": "4.0.1-rc2-23931",
+        "System.Diagnostics.Tracing": "4.1.0-rc2-23931",
+        "System.Globalization": "4.0.11-rc2-23931",
+        "System.IO": "4.1.0-rc2-23931",
+        "System.IO.Compression": "4.1.0-rc2-23931",
+        "System.Linq": "4.1.0-rc2-23931",
+        "System.Linq.Expressions": "4.0.11-rc2-23931",
+        "System.Net.Http": "4.0.1-rc2-23931",
+        "System.Net.Primitives": "4.0.11-rc2-23931",
+        "System.ObjectModel": "4.0.12-rc2-23931",
+        "System.Reflection": "4.1.0-rc2-23931",
+        "System.Reflection.Extensions": "4.0.1-rc2-23931",
+        "System.Reflection.Primitives": "4.0.1-rc2-23931",
+        "System.Resources.ResourceManager": "4.0.1-rc2-23931",
+        "System.Runtime": "4.1.0-rc2-23931",
+        "System.Runtime.Extensions": "4.1.0-rc2-23931",
+        "System.Runtime.InteropServices": "4.1.0-rc2-23931",
+        "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931",
+        "System.Runtime.Numerics": "4.0.1-rc2-23931",
+        "System.Text.Encoding": "4.0.11-rc2-23931",
+        "System.Text.Encoding.Extensions": "4.0.11-rc2-23931",
+        "System.Text.RegularExpressions": "4.0.12-rc2-23931",
+        "System.Threading": "4.0.11-rc2-23931",
+        "System.Threading.Tasks": "4.0.11-rc2-23931",
+        "System.Xml.ReaderWriter": "4.0.11-rc2-23931",
+        "System.Xml.XDocument": "4.0.11-rc2-23931"
+      }
     }
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "[2.1.0,3.0)"
+    "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0)"
   }
 }
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-preview",
+  "version": "2.0.0-preview",
   "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png",
   "title": "ETW Logger for Microsoft AutoRest Generated Clients",
   "summary": "Provides ETW tracing of \"Microsoft.Rest\" Client Library events.",
@@ -24,6 +24,6 @@
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": ""
+    "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0.0)"
   }
 }
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-preview",
+  "version": "2.0.0-preview",
   "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png",
   "title": "Log4Net Logger for Microsoft AutoRest Generated Clients",
   "summary": "Provides Log4Net logging for AutoRest generated client libraries.",
@@ -28,7 +28,7 @@
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "",
+    "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0.0)",
     "log4net": "2.0.3"
   }
 }
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json
@@ -5,24 +5,19 @@
   "tags": [ "Microsoft AutoRest ClientRuntime REST" ],
   "projectUrl": "https://github.com/Azure/AutoRest",
   "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE",
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
+
+  "testRunner": "xunit",
   "frameworks": {
-    "dnxcore50": {
-      "dependencies": {
-        "System.Diagnostics.Tools": "4.0.0",
-        "System.Net.Http": "4.0.0",
-        "System.Threading.Tasks": "4.0.10",
-        "System.Xml.ReaderWriter": "4.0.10",
-        "Microsoft.CSharp": "4.0.0",
-        "xunit.runner.dnx": "2.1.0-rc1-build198"
-      }
+    "netcoreapp1.0": {
+      "compilationOptions": { "define": [ "PORTABLE" ] },
+      "imports": ["dnxcore50", "portable-net45+win8"]
     }
   },
-
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "",
-    "xunit": "2.1.0"
+    "Microsoft.NETCore.App": "1.0.0-rc2-24008",
+    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.0,5.0.0)",
+    "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.0-preview,4.0.0)",
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-dev-140469-38"
   }
 }
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json
@@ -6,21 +6,18 @@
   "projectUrl": "https://github.com/Azure/AutoRest",
   "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE",
 
+  "testRunner": "xunit",
   "frameworks": {
     "net45": {
-      "frameworkAssemblies": {
-        "System": "",
-        "System.Runtime": "",
-        "System.Threading": ""
-      }
+      "imports": ["netcoreapp1.0", "dnxcore50"]
     }
   },
-
   "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.visualstudio": "2.1.0",
+    "Microsoft.NETCore.App": "1.0.0-rc2-24008",
     "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.39",
-    "Microsoft.Rest.ClientRuntime.Log4Net": "",
-    "Microsoft.Rest.ClientRuntime.Etw": ""
+    "Microsoft.Rest.ClientRuntime.Log4Net": "[2.0.0-preview,3.0.0)",
+    "Microsoft.Rest.ClientRuntime.Etw": "[2.0.0-preview,3.0.0)",
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-dev-140469-38"
   }
 }