Update packageIndex.json with packages from release branches (dotnet/corefx#37600)

* Update packageIndex.json with packages from release branches

* Fixing last packaging validation errors

Commit migrated from https://github.com/dotnet/corefx/commit/8d0428194d69a8d7fb249a9f4ef780cb4cd54de4

diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
index 6aa81ad..6c91f09 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
+++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
@@ -215,6 +215,5 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Text.Encoding.Extensions" />
-    <Reference Include="System.Security.Permissions" />
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/CatalogReflectionContextAttribute.cs b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/CatalogReflectionContextAttribute.cs
index bb7df2a..4f88acd 100644 (file)
--- a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/CatalogReflectionContextAttribute.cs
+++ b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/CatalogReflectionContextAttribute.cs
@@ -6,9 +6,6 @@ using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Microsoft.Internal;
 
-using PermissionSet = System.Security.PermissionSet;
-using PermissionState = System.Security.Permissions.PermissionState;
-
 namespace System.ComponentModel.Composition
 {
     /// <summary>
@@ -34,11 +31,6 @@ namespace System.ComponentModel.Composition
                 throw new ArgumentNullException(nameof(_reflectionContextType));
             }
 
-            if (!_reflectionContextType.IsPublic)
-            {
-                new PermissionSet(PermissionState.Unrestricted).Demand();
-            }
-
             ReflectionContext reflectionContext = null;
             try
             {

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
index eabb650..e6ed4e3 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
@@ -17,22 +17,5 @@
       <Value>.NETCoreApp;UAP</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-
-  <!-- This target is a work-around and should be removed by 6/2019 (by then a fixed version of System.Memory
-       should be available so that System.Memory does not reference NetStandard1.X)
-       See Eric St John for details. -->
-
-  <Target Name="RemoveSystemMemoryNetStandard1x" AfterTargets="GetNuGetPackageDependencies">
-    <!-- System.Memory is causing a cycle when used for netstandard1.x.
-         This is due to S.M referencing the NETStandard.Library metapackage for netstandard1.x
-         and that meta-package includes this package (System.Diagnostics.DiagnosticSource) in 
-         its closure.
-         Remove the dependency for now until we can get a new build of System.Memory that doesn't 
-         reference the NETStandard.Library metapackage. -->
-    <ItemGroup>
-      <Dependency Remove="@(Dependency)" Condition="'%(Identity)' == 'System.Memory' AND $([System.String]::new('%(TargetFramework)').StartsWith('netstandard1.'))" />
-    </ItemGroup>
-  </Target>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>

diff --git a/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj b/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
index 386bd83..7d2b398 100644 (file)
--- a/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
+++ b/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Pipelines.csproj">
-        <SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.Pipelines.csproj" />
     <HarvestIncludePaths Include="lib/netstandard1.3" />

diff --git a/src/libraries/System.Reflection.Context/Directory.Build.props b/src/libraries/System.Reflection.Context/Directory.Build.props
index 14f75a5..6bf7e56 100644 (file)
--- a/src/libraries/System.Reflection.Context/Directory.Build.props
+++ b/src/libraries/System.Reflection.Context/Directory.Build.props
@@ -3,5 +3,6 @@
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
+    <IsUAP>true</IsUAP>
   </PropertyGroup>
 </Project>

diff --git a/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj b/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj
index 66dc14a..2c2d133 100644 (file)
--- a/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj
+++ b/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj
@@ -8,6 +8,14 @@
     <InboxOnTargetFramework Include="net45">
       <AsFrameworkReference>true</AsFrameworkReference>
     </InboxOnTargetFramework>
+    <!-- Since UAP are package based we still want to enable
+         OOBing libraries that happen to overlap with their framework package.
+         This avoids us having to lock the API in our NuGet packages just
+         to match what shipped inbox: since we can provide a new library
+         we can update it to add API without raising the netstandard version. -->
+    <ValidatePackageSuppression Include="TreatAsOutOfBox">
+      <Value>UAP</Value>
+    </ValidatePackageSuppression>
 
     <HarvestIncludePaths Include="ref/netcore50;lib/netcore50;ref/portable-net45+win8;lib/portable-net45+win8" />
   </ItemGroup>

diff --git a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
index 2c51583..64ac4be 100644 (file)
--- a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
+++ b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
@@ -5,8 +5,6 @@
          plan on shipping a new desktop version out of band. Instead add API
          to a different assembly. -->
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <!-- uap10.0.16300 will pick netcore50 otherwise -->
-    <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.0.16300</PackageTargetFramework>
     <Configurations>netstandard-Debug;netstandard-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/libraries/external/harvestPackages/harvestPackages.props b/src/libraries/external/harvestPackages/harvestPackages.props
index 5c0caeb..4458f9d 100644 (file)
--- a/src/libraries/external/harvestPackages/harvestPackages.props
+++ b/src/libraries/external/harvestPackages/harvestPackages.props
@@ -1,4 +1,4 @@
-<Project>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <!-- The versions can be updated by running UpdateToLatestStablePackages target in harvestPackages.depproj -->
 <ItemGroup>
 <PackageReference Include="Microsoft.CSharp">
@@ -62,10 +62,10 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Data.SqlClient">
-  <Version>4.5.1</Version>
+  <Version>4.6.1</Version>
 </PackageReference>
 <PackageReference Include="System.Diagnostics.DiagnosticSource">
-  <Version>4.5.0</Version>
+  <Version>4.5.1</Version>
 </PackageReference>
 <PackageReference Include="System.Diagnostics.PerformanceCounter">
   <Version>4.5.0</Version>
@@ -80,7 +80,7 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Drawing.Common">
-  <Version>4.5.0</Version>
+  <Version>4.5.1</Version>
 </PackageReference>
 <PackageReference Include="System.IO.FileSystem.AccessControl">
   <Version>4.5.0</Version>
@@ -89,7 +89,7 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.IO.Pipelines">
-  <Version>4.5.0</Version>
+  <Version>4.5.3</Version>
 </PackageReference>
 <PackageReference Include="System.IO.Ports">
   <Version>4.5.0</Version>
@@ -101,10 +101,10 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Net.Http.WinHttpHandler">
-  <Version>4.5.0</Version>
+  <Version>4.5.3</Version>
 </PackageReference>
 <PackageReference Include="System.Net.WebSockets.WebSocketProtocol">
-  <Version>4.5.1</Version>
+  <Version>4.5.3</Version>
 </PackageReference>
 <PackageReference Include="System.Numerics.Tensors">
   <Version>0.1.0</Version>
@@ -122,13 +122,13 @@
   <Version>1.6.0</Version>
 </PackageReference>
 <PackageReference Include="System.Reflection.TypeExtensions">
-  <Version>4.5.0</Version>
+  <Version>4.5.1</Version>
 </PackageReference>
 <PackageReference Include="System.Runtime.Caching">
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-  <Version>4.5.1</Version>
+  <Version>4.5.2</Version>
 </PackageReference>
 <PackageReference Include="System.Runtime.WindowsRuntime">
   <Version>4.3.0</Version>
@@ -143,10 +143,10 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Security.Cryptography.OpenSsl">
-  <Version>4.5.0</Version>
+  <Version>4.5.1</Version>
 </PackageReference>
 <PackageReference Include="System.Security.Cryptography.Pkcs">
-  <Version>4.5.0</Version>
+  <Version>4.5.2</Version>
 </PackageReference>
 <PackageReference Include="System.Security.Cryptography.ProtectedData">
   <Version>4.5.0</Version>
@@ -158,7 +158,7 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Security.Principal.Windows">
-  <Version>4.5.0</Version>
+  <Version>4.5.1</Version>
 </PackageReference>
 <PackageReference Include="System.ServiceModel.Syndication">
   <Version>4.5.0</Version>
@@ -167,7 +167,7 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Text.Encoding.CodePages">
-  <Version>4.5.0</Version>
+  <Version>4.5.1</Version>
 </PackageReference>
 <PackageReference Include="System.Text.Encodings.Web">
   <Version>4.5.0</Version>
@@ -182,7 +182,7 @@
   <Version>4.9.0</Version>
 </PackageReference>
 <PackageReference Include="System.Threading.Tasks.Extensions">
-  <Version>4.5.1</Version>
+  <Version>4.5.2</Version>
 </PackageReference>
 <PackageReference Include="System.ValueTuple">
   <Version>4.5.0</Version>

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index e012d82..dbf8940 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -80,7 +80,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
@@ -113,7 +113,7 @@
         "4.0.1.0": "4.0.1",
         "4.0.2.0": "4.3.0",
         "4.0.3.0": "4.4.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.5.0"
       }
     },
     "Microsoft.Devices.Sensors": {
@@ -151,9 +151,14 @@
         "1.0.2",
         "1.1.0",
         "2.0.0",
-        "2.1.0"
-      ],
-      "BaselineVersion": "2.0.0",
+        "2.1.0",
+        "2.1.1",
+        "2.1.2",
+        "2.1.3",
+        "2.1.4",
+        "2.2.0"
+      ],
+      "BaselineVersion": "3.0.0",
       "InboxOn": {}
     },
     "Microsoft.NETCore.Targets": {
@@ -165,7 +170,7 @@
         "2.0.0",
         "2.1.0"
       ],
-      "BaselineVersion": "2.0.0",
+      "BaselineVersion": "3.0.0",
       "InboxOn": {}
     },
     "Microsoft.Phone": {
@@ -234,7 +239,7 @@
         "10.0.1.0": "10.0.1",
         "10.0.2.0": "10.1.0",
         "10.0.3.0": "10.2.0",
-        "10.0.4.0": "10.4.0"
+        "10.0.4.0": "10.3.0"
       }
     },
     "Microsoft.VisualBasic.Compatibility": {
@@ -296,7 +301,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -313,7 +318,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -327,7 +332,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -336,13 +341,16 @@
     },
     "Microsoft.Windows.Compatibility": {
       "StableVersions": [
-        "2.0.0"
+        "2.0.0",
+        "2.0.1",
+        "2.1.0"
       ],
       "InboxOn": {}
     },
     "Microsoft.Windows.Compatibility.Shims": {
       "StableVersions": [
-        "2.0.0"
+        "2.0.0",
+        "2.0.1"
       ],
       "InboxOn": {}
     },
@@ -512,7 +520,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {}
     },
     "runtime.native.System.IO.Ports": {
@@ -661,7 +669,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -756,7 +764,7 @@
         "1.4.0",
         "1.5.0"
       ],
-      "BaselineVersion": "1.5.0",
+      "BaselineVersion": "1.6.0",
       "InboxOn": {
         "netcoreapp2.0": "1.2.2.0",
         "netcoreapp2.1": "1.2.3.0",
@@ -874,7 +882,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
@@ -907,7 +915,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "monoandroid10": "Any",
@@ -919,7 +927,7 @@
         "xamarinwatchos10": "Any"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.5.0"
       }
     },
     "System.ComponentModel.Composition.Registration": {
@@ -1047,7 +1055,7 @@
         "1.1.0",
         "1.2.0"
       ],
-      "BaselineVersion": "1.2.0",
+      "BaselineVersion": "1.3.0",
       "InboxOn": {}
     },
     "System.Composition.AttributedModel": {
@@ -1056,7 +1064,7 @@
         "1.1.0",
         "1.2.0"
       ],
-      "BaselineVersion": "1.2.0",
+      "BaselineVersion": "1.3.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.31.0": "1.0.31",
@@ -1071,7 +1079,7 @@
         "1.1.0",
         "1.2.0"
       ],
-      "BaselineVersion": "1.2.0",
+      "BaselineVersion": "1.3.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.31.0": "1.0.31",
@@ -1086,7 +1094,7 @@
         "1.1.0",
         "1.2.0"
       ],
-      "BaselineVersion": "1.2.0",
+      "BaselineVersion": "1.3.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.31.0": "1.0.31",
@@ -1101,7 +1109,7 @@
         "1.1.0",
         "1.2.0"
       ],
-      "BaselineVersion": "1.2.0",
+      "BaselineVersion": "1.3.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.31.0": "1.0.31",
@@ -1116,7 +1124,7 @@
         "1.1.0",
         "1.2.0"
       ],
-      "BaselineVersion": "1.2.0",
+      "BaselineVersion": "1.3.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.31.0": "1.0.31",
@@ -1137,7 +1145,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -1253,7 +1261,7 @@
         "uap10.0.16300": "4.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.5.0"
       }
     },
     "System.Data.Entity": {
@@ -1276,7 +1284,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -1320,9 +1328,12 @@
         "4.1.0",
         "4.3.0",
         "4.4.0",
-        "4.5.1"
+        "4.5.1",
+        "4.5.0",
+        "4.6.0",
+        "4.6.1"
       ],
-      "BaselineVersion": "4.5.1",
+      "BaselineVersion": "4.7.0",
       "InboxOn": {
         "net461": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1341,6 +1352,7 @@
         "4.2.0.0": "4.4.0",
         "4.4.0.0": "4.5.0",
         "4.5.0.0": "4.6.0",
+        "4.5.0.1": "4.6.1",
         "4.6.0.0": "4.7.0"
       }
     },
@@ -1452,12 +1464,13 @@
         "4.0.0",
         "4.3.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.5.1"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.1",
-        "netcoreapp2.1": "4.0.3.0",
+        "netcoreapp2.1": "4.0.3.1",
         "netcoreapp3.0": "4.0.4.0"
       },
       "AssemblyVersionInPackageVersion": {
@@ -1466,6 +1479,7 @@
         "4.0.2.0": "4.4.0",
         "4.0.2.1": "4.4.1",
         "4.0.3.0": "4.5.0",
+        "4.0.3.1": "4.5.1",
         "4.0.4.0": "4.6.0"
       }
     },
@@ -1473,6 +1487,7 @@
       "StableVersions": [
         "4.5.0"
       ],
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -1507,7 +1522,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -1717,36 +1732,36 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.5.0"
       }
     },
     "System.DirectoryServices.AccountManagement": {
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.5.0"
       }
     },
     "System.DirectoryServices.Protocols": {
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.5.0"
       }
     },
     "System.Drawing": {
@@ -1759,9 +1774,10 @@
     },
     "System.Drawing.Common": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.5.1"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -1772,6 +1788,7 @@
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
+        "4.0.0.1": "4.5.1",
         "4.0.1.0": "4.6.0"
       }
     },
@@ -2131,7 +2148,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -2277,7 +2294,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -2289,12 +2306,16 @@
     },
     "System.IO.Pipelines": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.5.1",
+        "4.5.2",
+        "4.5.3"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
+        "4.0.0.1": "4.5.2",
         "4.0.1.0": "4.6.0"
       }
     },
@@ -2338,14 +2359,14 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "uap10.0.16299": "4.0.1.0",
         "uap10.0.16300": "4.0.2.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
-        "4.0.1.0": "4.6.0",
+        "4.0.1.0": "4.5.0",
         "4.0.2.0": "4.6.0"
       }
     },
@@ -2380,7 +2401,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -2518,7 +2539,7 @@
         "4.0.1",
         "4.3.0"
       ],
-      "BaselineVersion": "4.3.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "net45": "4.0.0.0",
@@ -2555,12 +2576,12 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.5.0"
       }
     },
     "System.Management.Instrumentation": {
@@ -2571,8 +2592,11 @@
     "System.Memory": {
       "StableVersions": [
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.5.2",
+        "4.5.3"
       ],
+      "BaselineVersion": "4.5.3",
       "InboxOn": {
         "netcoreapp2.1": "4.1.0.0",
         "netcoreapp3.0": "4.2.0.0",
@@ -2585,7 +2609,9 @@
         "xamarinwatchos10": "Any"
       },
       "AssemblyVersionInPackageVersion": {
+        "4.0.0.0": "4.4.0",
         "4.0.1.0": "4.5.0",
+        "4.0.1.1": "4.5.3",
         "4.1.0.0": "4.6.0"
       }
     },
@@ -2717,15 +2743,20 @@
         "4.0.1",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.5.1",
+        "4.5.2",
+        "4.5.3"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
+        "4.0.3.1": "4.5.1",
+        "4.0.3.2": "4.5.3",
         "4.0.4.0": "4.6.0"
       }
     },
@@ -3099,12 +3130,17 @@
     },
     "System.Net.WebSockets.WebSocketProtocol": {
       "StableVersions": [
-        "4.5.1"
+        "4.5.1",
+        "4.5.0",
+        "4.5.2",
+        "4.5.3"
       ],
-      "BaselineVersion": "4.5.1",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
+        "4.0.0.1": "4.5.2",
+        "4.0.0.2": "4.5.3",
         "4.0.1.0": "4.6.0"
       }
     },
@@ -3133,6 +3169,7 @@
       "StableVersions": [
         "0.1.0"
       ],
+      "BaselineVersion": "0.2.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "0.1.0.0": "0.1.0",
@@ -3170,7 +3207,7 @@
         "4.1.1.0": "4.1.1",
         "4.1.2.0": "4.3.0",
         "4.1.3.0": "4.4.0",
-        "4.1.4.0": "4.5.0",
+        "4.1.4.0": "4.5.0"
       }
     },
     "System.Numerics.Vectors.WindowsRuntime": {
@@ -3319,11 +3356,12 @@
         "4.0.0",
         "4.3.0"
       ],
-      "BaselineVersion": "4.3.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "portable46-net451+win81": "4.0.0.0",
         "portable45-net45+win8": "4.0.0.0",
+        "uap10.0.16299": "4.0.3.0",
         "win8": "4.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
@@ -3339,9 +3377,10 @@
         "4.0.1",
         "4.3.0",
         "4.4.0",
-        "4.5.1"
+        "4.5.1",
+        "4.5.0"
       ],
-      "BaselineVersion": "4.5.1",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
@@ -3370,7 +3409,7 @@
         "4.0.1",
         "4.3.0"
       ],
-      "BaselineVersion": "4.3.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
@@ -3491,7 +3530,7 @@
         "1.5.0",
         "1.6.0"
       ],
-      "BaselineVersion": "1.6.0",
+      "BaselineVersion": "1.7.0",
       "InboxOn": {
         "netcoreapp2.0": "1.4.2.0",
         "netcoreapp2.1": "1.4.3.0",
@@ -3562,9 +3601,10 @@
         "4.1.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.5.1"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.1.2.0",
         "netcoreapp2.1": "4.1.3.0",
@@ -3731,7 +3771,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3742,16 +3782,17 @@
         "xamarinwatchos10": "Any"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.5.0"
       }
     },
     "System.Runtime.CompilerServices.Unsafe": {
       "StableVersions": [
         "4.4.0",
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.5.2"
       ],
-      "BaselineVersion": "4.5.1",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.5.0",
         "uap10.0.16300": "4.0.5.0"
@@ -3759,6 +3800,7 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.3.0": "4.4.0",
         "4.0.4.0": "4.5.0",
+        "4.0.4.1": "4.5.2",
         "4.0.5.0": "4.6.0"
       }
     },
@@ -3931,7 +3973,7 @@
         "4.0.1",
         "4.3.0"
       ],
-      "BaselineVersion": "4.3.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "net45": "4.0.0.0",
@@ -4253,7 +4295,7 @@
         "4.0.0",
         "4.3.0"
       ],
-      "BaselineVersion": "4.3.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "portable46-win81+wpa81": "4.0.0.0",
@@ -4283,7 +4325,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "uap10.0.16299": "4.1.1.0"
       },
@@ -4291,7 +4333,7 @@
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.1.0.0": "4.4.0",
-        "4.1.1.0": "4.6.0",
+        "4.1.1.0": "4.5.0",
         "4.1.2.0": "4.6.0"
       }
     },
@@ -4354,7 +4396,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -4428,15 +4470,17 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.5.1"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.1.0.0": "4.4.0",
         "4.1.1.0": "4.5.0",
+        "4.1.1.1": "4.5.1",
         "4.1.2.0": "4.6.0"
       }
     },
@@ -4445,15 +4489,19 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.5.1",
+        "4.5.2"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
+        "4.0.3.1": "4.5.1",
+        "4.0.3.2": "4.5.2",
         "4.0.4.0": "4.6.0",
         "4.1.0.0": "4.6.0"
       }
@@ -4489,7 +4537,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -4536,7 +4584,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -4549,7 +4597,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -4602,9 +4650,10 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.5.1"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "uap10.0.16299": "4.1.1.0"
       },
@@ -4612,7 +4661,8 @@
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.1.0.0": "4.4.0",
-        "4.1.1.0": "4.6.0",
+        "4.1.1.0": "4.5.0",
+        "4.1.1.1": "4.5.1",
         "4.1.2.0": "4.6.0"
       }
     },
@@ -4780,7 +4830,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -4828,7 +4878,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.1.0.0": "4.1.0",
@@ -4892,9 +4942,10 @@
         "4.0.1",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.5.1"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -4964,7 +5015,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.4.0"
       },
@@ -5079,7 +5130,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -5093,7 +5144,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.5.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -5171,7 +5222,7 @@
         "4.8.0",
         "4.9.0"
       ],
-      "BaselineVersion": "4.9.0",
+      "BaselineVersion": "4.10.0",
       "InboxOn": {
         "netcoreapp2.0": "4.6.2.0",
         "netcoreapp2.1": "4.6.3.0",
@@ -5193,9 +5244,11 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.1"
+        "4.5.1",
+        "4.5.2",
+        "4.5.0"
       ],
-      "BaselineVersion": "4.5.1",
+      "BaselineVersion": "4.5.2",
       "InboxOn": {
         "netcoreapp2.0": "4.1.1.0",
         "netcoreapp2.1": "4.3.0.0",
@@ -5971,4 +6024,4 @@
       "System.Xml.XDocument"
     ]
   }
-}
\ No newline at end of file
+}

diff --git a/src/libraries/pkg/test/packageSettings/System.Diagnostics.DiagnosticSource/workaroundMissingSystemMemory.targets b/src/libraries/pkg/test/packageSettings/System.Diagnostics.DiagnosticSource/workaroundMissingSystemMemory.targets
deleted file mode 100644 (file)
index fdb725f..0000000
--- a/src/libraries/pkg/test/packageSettings/System.Diagnostics.DiagnosticSource/workaroundMissingSystemMemory.targets
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<!-- This file is a work-around and should be removed by 6/2019 (by then a fixed version of System.Memory
-     should be available so that System.Memory does not reference NetStandard1.X)
-     See Eric St John for details. -->
-
-<Project>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard1.')) OR $(TargetFramework.StartsWith('netcoreapp1.'))">
-    <PackageReference Include="System.Memory" Version="4.5.1" />
-  </ItemGroup>
-</Project>