Merge remote-tracking branch 'corefx/master'

1 files changed, 62 insertions, 1 deletions

diff --git a/pkg/descriptions.json b/pkg/descriptions.json
index 59635ee10e..7c54589fa3 100644
--- a/pkg/descriptions.json
+++ b/pkg/descriptions.json
@@ -47,7 +47,7 @@
     },
     {
         "Name": "Microsoft.NETCore.Portable.Compatibility",
-        "Description": "Enables compatibility with portable libraries targeting previous .NET releases like .NET Framework 4.0 and Silverlight.\nThis package supports retargeting references to classic reference assemblies (mscorlib.dll, system.dll, etc) to new contract assemblies (System.Runtime.dll, System.IO, etc).  It does this in a pay-for-play way to prevent consuming assemblies from having to reference all of the contracts that happen to overlap with mscorlib.  As such, when using this package you may encounter errors like\n\terror CS0012: The type 'WebRequest' is defined in an assembly that is not referenced. You must add a reference to assembly 'System.Net.Requests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.\nTo resolve these errors install the package with the same name name as the missing assembly.",
+        "Description": "Enables compatibility with portable libraries targeting previous .NET releases like .NET Framework 4.0 and Silverlight.\nThis package supports retargeting references to classic reference assemblies (mscorlib.dll, system.dll, etc) to new contract assemblies (System.Runtime.dll, System.IO, etc).  It does this in a pay-for-play way to prevent consuming assemblies from having to reference all of the contracts that happen to overlap with mscorlib.  As such, when using this package you may encounter errors like\n\terror CS0012: The type 'WebRequest' is defined in an assembly that is not referenced. You must add a reference to assembly 'System.Net.Requests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.\nTo resolve these errors install the package with the same name as the missing assembly.",
         "CommonTypes": [ ]
     },
     {
@@ -331,6 +331,60 @@
         ]
     },
     {
+        "Name": "System.Composition",
+        "Description": "This packages provides a version of the Managed Extensibility Framework (MEF) that is lightweight and specifically optimized for high throughput scenarios, such as the web.",
+        "CommonTypes": [
+            "System.Composition.ExportAttribute",
+            "System.Composition.ImportAttribute",
+            "System.Composition.Convention.ConventionBuilder",
+            "System.Composition.Hosting.CompositionHost",
+            "System.Composition.CompositionContext",
+            "System.Composition.CompositionContextExtensions",
+        ]
+    },
+    {
+        "Name": "System.Composition.AttributedModel",
+        "Description": "Provides common attributes used by System.Composition types.",
+        "CommonTypes": [
+            "System.Composition.ExportAttribute",
+            "System.Composition.ImportAttribute",
+            "System.Composition.Convention.AttributedModelProvider"
+        ]
+    },
+    {
+        "Name": "System.Composition.Convention",
+        "Description": "Provides types that support using Managed Extensibility Framework with a convention-based configuration model.",
+        "CommonTypes": [
+            "System.Composition.Convention.ConventionBuilder",
+            "System.Composition.Convention.ExportConventionBuilder",
+            "System.Composition.Convention.ImportConventionBuilder",
+            "System.Composition.Convention.PartConventionBuilder",
+            "System.Composition.Convention.ParameterImportConventionBuilder"
+        ]
+    },
+    {
+        "Name": "System.Composition.Hosting",
+        "Description": "Provides Managed Extensibility Framework types that are useful to developers of extensible applications, or hosts.",
+        "CommonTypes": [
+            "System.Composition.Hosting.CompositionHost"
+        ]
+    },
+    {
+        "Name": "System.Composition.Runtime",
+        "Description": "Contains runtime components of the Managed Extensibility Framework.",
+        "CommonTypes": [
+            "System.Composition.CompositionContext"
+        ]
+    },
+    {
+        "Name": "System.Composition.TypedParts",
+        "Description": "Provides some extension methods for the Managed Extensibility Framework.",
+        "CommonTypes": [
+            "System.Composition.CompositionContextExtensions",
+            "System.Composition.Hosting.ContainerConfiguration"
+        ]
+    },
+    {
         "Name": "System.Console",
         "Description": "Provides the System.Console class, which represents the standard input, output and error streams for console applications.",
         "CommonTypes": [
@@ -414,6 +468,13 @@
         ]
     },
     {
+        "Name": "System.Diagnostics.Debug.SymbolReader",
+        "Description": "Provides the System.Diagnostics.Debug.SymbolReader class, which allows extraction of a debug information from portable pdb files.",
+        "CommonTypes": [
+            "System.Diagnostics.Debug.SymbolReader"
+        ]
+    },
+    {
         "Name": "System.Diagnostics.FileVersionInfo",
         "Description": "Provides the System.Diagnostics.FileVersionInfo class, which allows access to Win32 version resource information for a physical file on disk.",
         "CommonTypes": [