diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-20 20:32:49 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-20 20:32:49 +0300 |
| commit | 855ca3172712656f6cb3984e14c6ec88ec27fd6d (patch) | |
| tree | 54b8c3a514328797b30e2211d1bee220f06aa402 /pkg | |
| parent | 76676dc565873fdd46d545fadfbbdfe8fd9d464e (diff) | |
| parent | dbe7c50ee859bd444443f4af192ded06ce64df63 (diff) | |
Merge branch upstream/master
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/Microsoft.Private.PackageBaseline/packageIndex.json | 15 | ||||
| -rw-r--r-- | pkg/descriptions.json | 10 |
2 files changed, 18 insertions, 7 deletions
diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index 0e2ef95b8f..758e7ac0c3 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -1141,7 +1141,6 @@ "BaselineVersion": "4.0.1", "AssemblyVersionInPackageVersion": { "4.0.1.0": "4.0.1", - "4.0.2.0": "4.3.0", "4.0.0.0": "4.0.0" } }, @@ -1155,6 +1154,11 @@ "4.0.1.0": "4.3.0" } }, + "System.Net.Mime": { + "AssemblyVersionInPackageVersion": { + "4.0.0.0": "4.3.0" + } + }, "System.Net.NameResolution": { "StableVersions": [ "4.0.0" @@ -1584,8 +1588,7 @@ ], "BaselineVersion": "4.0.0", "AssemblyVersionInPackageVersion": { - "4.0.0.0": "4.0.0", - "4.0.1.0": "4.3.0" + "4.0.0.0": "4.0.0" } }, "System.Runtime.Numerics": { @@ -1654,8 +1657,7 @@ "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", "4.0.10.0": "4.0.10", - "4.0.11.0": "4.0.11", - "4.0.12.0": "4.3.0" + "4.0.11.0": "4.0.11" } }, "System.Runtime.WindowsRuntime.UI.Xaml": { @@ -1666,7 +1668,6 @@ "BaselineVersion": "4.0.1", "AssemblyVersionInPackageVersion": { "4.0.1.0": "4.0.1", - "4.0.2.0": "4.3.0", "4.0.0.0": "4.0.0" } }, @@ -2012,7 +2013,7 @@ "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", "4.0.10.0": "4.0.10", - "4.1.0.0": "4.0.11", + "4.1.0.0": "4.3.0", "4.0.11.0": "4.0.11" } }, diff --git a/pkg/descriptions.json b/pkg/descriptions.json index c53adc143f..33a2135f6e 100644 --- a/pkg/descriptions.json +++ b/pkg/descriptions.json @@ -861,6 +861,16 @@ ] }, { + "Name": "System.Net.Mime", + "Description": "Provides types that are used to represent Multipurpose Internet Mail Exchange (MIME) headers.", + "CommonTypes": [ + "System.Net.Mime.ContentDisposition", + "System.Net.Mime.ContentType", + "System.Net.Mime.DispositionTypeNames", + "System.Net.Mime.MediaTypeNames" + ] + }, + { "Name": "System.Net.NameResolution", "Description": "Provides the System.Net.Dns class, which enables developers to perform simple domain name resolution.", "CommonTypes": [ |