updating packageindex with stable versions (dotnet/corefx#41511)

* updating packageindex with stable versions

* disabling harverst stable packages

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

diff --git a/eng/restore/runtime/runtime.depproj b/eng/restore/runtime/runtime.depproj
index a64a039..78303c3 100644 (file)
--- a/eng/restore/runtime/runtime.depproj
+++ b/eng/restore/runtime/runtime.depproj
@@ -12,9 +12,9 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <!-- These needs to be replaced once we have an official build -->
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview9-19407-2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <MicrosoftPrivateCorefxNETCoreAppVersion>4.6.0-preview9.19419.3</MicrosoftPrivateCorefxNETCoreAppVersion>
+    <!-- Non-shipping packages do not produce stable versions. -->
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-rc2.19462.14</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftPrivateCorefxNETCoreAppVersion>4.6.0-rc2.19462.14</MicrosoftPrivateCorefxNETCoreAppVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">

diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
index 17c7ace..0f08c41 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
@@ -24,10 +24,7 @@
       <TargetFramework>netcoreapp1.0</TargetFramework>
     </File>-->
 
-    <HarvestIncludePaths Include="runtimes/win8/lib/netstandard1.3">
-      <TargetPath>runtimes/win/lib/netcore50</TargetPath>
-    </HarvestIncludePaths>
-
+    <HarvestIncludePaths Include="runtimes/win/lib/netcore50" />
     <File Include="$(PlaceHolderFile)">
       <TargetPath>runtimes/win-aot/lib/uap10.0.16299</TargetPath>
     </File>

diff --git a/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj b/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj
index c20ee76..3a01e67 100644 (file)
--- a/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj
@@ -27,12 +27,8 @@
       <TargetFramework>netcoreapp1.0</TargetFramework>
     </File>  -->
     
-    <HarvestIncludePaths Include="runtimes/win8/lib/netstandard1.3">
-      <TargetPath>runtimes/win/lib/netcore50</TargetPath>
-    </HarvestIncludePaths>
-    <HarvestIncludePaths Include="runtimes/win8-aot/lib/netcore50">
-      <TargetPath>runtimes/win-aot/lib/netcore50</TargetPath>
-    </HarvestIncludePaths>
+    <HarvestIncludePaths Include="runtimes/win/lib/netcore50" />
+    <HarvestIncludePaths Include="runtimes/win-aot/lib/netcore50" />
 
     <File Include="$(PlaceHolderFile)">
       <TargetPath>runtimes/win-aot/lib/uap10.0.16299</TargetPath>

diff --git a/src/libraries/pkg/Directory.Build.props b/src/libraries/pkg/Directory.Build.props
index 84d827d..d5fe113 100644 (file)
--- a/src/libraries/pkg/Directory.Build.props
+++ b/src/libraries/pkg/Directory.Build.props
@@ -6,6 +6,7 @@
          For offline builds we still set OfficialBuildId but we need to build all the packages for a single
          leg only, so we also take DotNetBuildFromSource  into account. -->
     <BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' AND '$(OfficialBuildId)' != '' AND '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
+    <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
 
   <!-- Packages opt-in to automatic RID-specific builds by placing a *.RID.props next to their project

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 2b77eb7..bd45b44 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -74,7 +74,8 @@
         "4.3.0",
         "4.4.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -126,7 +127,8 @@
         "1.1.26",
         "1.1.28",
         "2.0.0",
-        "2.0.1"
+        "2.0.1",
+        "2.1.0"
       ],
       "BaselineVersion": "2.3.0",
       "InboxOn": {},
@@ -137,6 +139,9 @@
       }
     },
     "Microsoft.IO.Redist": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
@@ -167,7 +172,8 @@
         "2.1.5",
         "2.2.0",
         "2.2.1",
-        "2.2.2"
+        "2.2.2",
+        "3.0.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {}
@@ -188,7 +194,8 @@
         "1.1.3",
         "1.1.4",
         "2.0.0",
-        "2.1.0"
+        "2.1.0",
+        "3.0.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {}
@@ -311,7 +318,8 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -328,7 +336,8 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -342,7 +351,8 @@
     },
     "Microsoft.Win32.SystemEvents": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -361,7 +371,8 @@
     "Microsoft.XmlSerializer.Generator": {
       "StableVersions": [
         "1.0.0",
-        "2.0.0"
+        "2.0.0",
+        "2.1.0"
       ],
       "BaselineVersion": "2.3.0",
       "InboxOn": {},
@@ -527,12 +538,16 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {}
     },
     "runtime.native.System.IO.Ports": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {}
     },
@@ -660,7 +675,8 @@
     "System.CodeDom": {
       "StableVersions": [
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -757,7 +773,8 @@
         "1.3.1",
         "1.3.2",
         "1.4.0",
-        "1.5.0"
+        "1.5.0",
+        "1.6.0"
       ],
       "BaselineVersion": "1.8.0",
       "InboxOn": {
@@ -876,7 +893,8 @@
         "4.3.0",
         "4.4.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -909,7 +927,8 @@
     },
     "System.ComponentModel.Composition": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -927,6 +946,9 @@
       }
     },
     "System.ComponentModel.Composition.Registration": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0"
@@ -1050,7 +1072,8 @@
       "StableVersions": [
         "1.0.31",
         "1.1.0",
-        "1.2.0"
+        "1.2.0",
+        "1.3.0"
       ],
       "BaselineVersion": "1.5.0",
       "InboxOn": {}
@@ -1059,7 +1082,8 @@
       "StableVersions": [
         "1.0.31",
         "1.1.0",
-        "1.2.0"
+        "1.2.0",
+        "1.3.0"
       ],
       "BaselineVersion": "1.5.0",
       "InboxOn": {},
@@ -1074,7 +1098,8 @@
       "StableVersions": [
         "1.0.31",
         "1.1.0",
-        "1.2.0"
+        "1.2.0",
+        "1.3.0"
       ],
       "BaselineVersion": "1.5.0",
       "InboxOn": {},
@@ -1089,7 +1114,8 @@
       "StableVersions": [
         "1.0.31",
         "1.1.0",
-        "1.2.0"
+        "1.2.0",
+        "1.3.0"
       ],
       "BaselineVersion": "1.5.0",
       "InboxOn": {},
@@ -1104,7 +1130,8 @@
       "StableVersions": [
         "1.0.31",
         "1.1.0",
-        "1.2.0"
+        "1.2.0",
+        "1.3.0"
       ],
       "BaselineVersion": "1.5.0",
       "InboxOn": {},
@@ -1119,7 +1146,8 @@
       "StableVersions": [
         "1.0.31",
         "1.1.0",
-        "1.2.0"
+        "1.2.0",
+        "1.3.0"
       ],
       "BaselineVersion": "1.5.0",
       "InboxOn": {},
@@ -1141,7 +1169,8 @@
       "StableVersions": [
         "4.4.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -1282,7 +1311,8 @@
     },
     "System.Data.Odbc": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -1292,6 +1322,9 @@
       }
     },
     "System.Data.OleDb": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
@@ -1336,7 +1369,8 @@
         "4.5.0",
         "4.5.1",
         "4.6.0",
-        "4.6.1"
+        "4.6.1",
+        "4.7.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -1472,7 +1506,8 @@
         "4.4.0",
         "4.4.1",
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -1492,7 +1527,8 @@
     },
     "System.Diagnostics.EventLog": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -1527,7 +1563,8 @@
     },
     "System.Diagnostics.PerformanceCounter": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -1737,7 +1774,8 @@
     },
     "System.DirectoryServices": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -1749,7 +1787,8 @@
     },
     "System.DirectoryServices.AccountManagement": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -1761,7 +1800,8 @@
     },
     "System.DirectoryServices.Protocols": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -1782,7 +1822,8 @@
     "System.Drawing.Common": {
       "StableVersions": [
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -2153,7 +2194,8 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2302,7 +2344,8 @@
         "4.3.0",
         "4.4.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2319,7 +2362,8 @@
         "4.5.0",
         "4.5.1",
         "4.5.2",
-        "4.5.3"
+        "4.5.3",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -2367,7 +2411,8 @@
     "System.IO.Ports": {
       "StableVersions": [
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -2409,7 +2454,8 @@
     "System.Json": {
       "StableVersions": [
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -2585,7 +2631,8 @@
     },
     "System.Management": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -2774,7 +2821,8 @@
         "4.5.1",
         "4.5.2",
         "4.5.3",
-        "4.5.4"
+        "4.5.4",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -3172,7 +3220,8 @@
         "4.5.0",
         "4.5.1",
         "4.5.2",
-        "4.5.3"
+        "4.5.3",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -3400,7 +3449,8 @@
       "StableVersions": [
         "4.0.0",
         "4.0.1",
-        "4.3.0"
+        "4.3.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -3424,7 +3474,8 @@
         "4.3.0",
         "4.4.0",
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -3453,7 +3504,8 @@
       "StableVersions": [
         "4.0.0",
         "4.0.1",
-        "4.3.0"
+        "4.3.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -3463,8 +3515,8 @@
         "netstandard2.1": "4.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
-        "xamarinmac20": "Any",
         "xamarinios10": "Any",
+        "xamarinmac20": "Any",
         "xamarintvos10": "Any",
         "xamarinwatchos10": "Any"
       },
@@ -3479,7 +3531,8 @@
       "StableVersions": [
         "4.0.0",
         "4.0.1",
-        "4.3.0"
+        "4.3.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -3506,7 +3559,8 @@
       "StableVersions": [
         "4.0.0",
         "4.0.1",
-        "4.3.0"
+        "4.3.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -3580,7 +3634,8 @@
         "1.4.2",
         "1.4.3",
         "1.5.0",
-        "1.6.0"
+        "1.6.0",
+        "1.7.0"
       ],
       "BaselineVersion": "1.9.0",
       "InboxOn": {
@@ -3602,6 +3657,9 @@
       }
     },
     "System.Reflection.MetadataLoadContext": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
@@ -3655,7 +3713,8 @@
         "4.3.0",
         "4.4.0",
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -3681,6 +3740,9 @@
       }
     },
     "System.Resources.Extensions": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
@@ -3826,7 +3888,8 @@
     },
     "System.Runtime.Caching": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -3849,7 +3912,8 @@
         "4.4.0",
         "4.5.0",
         "4.5.1",
-        "4.5.2"
+        "4.5.2",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4330,7 +4394,8 @@
         "4.0.0",
         "4.0.10",
         "4.0.11",
-        "4.3.0"
+        "4.3.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4359,7 +4424,8 @@
       "StableVersions": [
         "4.0.0",
         "4.0.1",
-        "4.3.0"
+        "4.3.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4390,7 +4456,8 @@
         "4.3.0",
         "4.4.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4463,7 +4530,8 @@
         "4.2.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4542,7 +4610,8 @@
         "4.3.1",
         "4.4.0",
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -4562,7 +4631,8 @@
         "4.4.0",
         "4.5.0",
         "4.5.1",
-        "4.5.2"
+        "4.5.2",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -4606,7 +4676,8 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4659,7 +4730,8 @@
         "4.4.0",
         "4.4.1",
         "4.4.2",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -4673,7 +4745,8 @@
       "StableVersions": [
         "4.4.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -4730,7 +4803,8 @@
         "4.4.0",
         "4.4.1",
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4907,7 +4981,8 @@
     },
     "System.ServiceModel.Syndication": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -4956,7 +5031,8 @@
         "4.3.0",
         "4.4.0",
         "4.4.1",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -5023,7 +5099,8 @@
         "4.3.0",
         "4.4.0",
         "4.5.0",
-        "4.5.1"
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -5096,7 +5173,8 @@
         "4.3.0",
         "4.3.1",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -5112,6 +5190,9 @@
       }
     },
     "System.Text.Json": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.0.0",
@@ -5215,7 +5296,8 @@
         "4.0.0",
         "4.3.0",
         "4.4.0",
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
@@ -5229,7 +5311,8 @@
     },
     "System.Threading.Channels": {
       "StableVersions": [
-        "4.5.0"
+        "4.5.0",
+        "4.6.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -5318,7 +5401,8 @@
         "4.6.0",
         "4.7.0",
         "4.8.0",
-        "4.9.0"
+        "4.9.0",
+        "4.10.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -5659,6 +5743,9 @@
       }
     },
     "System.Windows.Extensions": {
+      "StableVersions": [
+        "4.6.0"
+      ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {