diff --git a/eng/Packaging.props b/eng/Packaging.props
index 1c9b46a4d301..3a583aa83f9e 100644
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -47,8 +47,14 @@
     <PackageConfigurations>$(BuildConfigurations)</PackageConfigurations>
   </PropertyGroup>
 
-  <Import Condition="Exists('../pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/baseline/baseline.props" />
+  <Import Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.props" />
 
+  <PropertyGroup>
+    <!-- Set PackageIndexFile to point to our local repo's index.  This tells the packaging targets
+         which index should be used for updates -->
+    <PackageIndexFile>$(MSBuildThisFileDirectory)../pkg/Microsoft.Private.PackageBaseline/packageIndex.json</PackageIndexFile>
+  </PropertyGroup>
+  
   <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
     <!--
       Building packages fails for two reasons.
diff --git a/eng/Packaging.targets b/eng/Packaging.targets
index e5599dbcba84..98b48363e00b 100644
--- a/eng/Packaging.targets
+++ b/eng/Packaging.targets
@@ -34,7 +34,23 @@
                       '$(_excludeCompile)' == 'true' AND
                       '%(Dependency.Identity)' != '_._'" />
   </Target>
- 
+
+  <Target Name="BlockStable" Condition="'$(BlockStable)' == 'true'" AfterTargets="CalculatePackageVersion">
+    <!-- DO NOT ship this packages as stable -->
+    <Error Condition="!$(PackageVersion.Contains('-'))" Text="Package $(Id) should not be built stable" />
+  </Target>
+
+  <!-- Get the package version without pre-release -->
+  <Target Name="GetPackageIdentityWithoutPrerelease"
+          Returns="@(_PackageIdentityWithoutPrerelease)">
+    <ItemGroup>
+      <_PackageIdentityWithoutPrerelease Include="$(Id)">
+        <Version>$(PackageVersion)</Version>
+        <BlockStable>$(BlockStable)</BlockStable>
+      </_PackageIdentityWithoutPrerelease>
+    </ItemGroup>
+  </Target>
+
   <PropertyGroup>
     <VersionSuffix>$(_PreReleaseLabel)$(_BuildNumberLabels)</VersionSuffix>
   </PropertyGroup>
diff --git a/external/harvestPackages/harvestPackages.depproj b/external/harvestPackages/harvestPackages.depproj
index e84f2406779b..4196795b85fc 100644
--- a/external/harvestPackages/harvestPackages.depproj
+++ b/external/harvestPackages/harvestPackages.depproj
@@ -3,7 +3,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <Import Project="$(RepoRoot)pkg/baseline/baseline.props" />
 
   <!-- only restore this project during the build, don't copy any of it's packages
        The sole purpose of this project is to download packages that can be examined
@@ -17,7 +16,7 @@
       </_AllPkgProjs>
     </ItemGroup>
 
-    <MSBuild Projects="@(_AllPkgProjs)" Targets="GetPackageIdentityIfStable" Properties="$(ProjectProperties)">
+    <MSBuild Projects="@(_AllPkgProjs)" Targets="GetPackageIdentityWithoutPrerelease" Properties="$(ProjectProperties)">
       <Output TaskParameter="TargetOutputs" ItemName="_AllPkgProjsWithVersion" />
     </MSBuild>
   </Target>
diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props
index 972590c539c4..3b113a42569a 100644
--- a/pkg/Directory.Build.props
+++ b/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/pkg/baseline/baseline.props b/pkg/baseline/baseline.props
deleted file mode 100644
index a496dfa4dc84..000000000000
--- a/pkg/baseline/baseline.props
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project>
-  <Import Project="..\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.props" />
-
-  <PropertyGroup>
-    <!-- Set PackageIndexFile to point to our local repo's index.  This tells the packaging targets
-         which index should be used for updates -->
-    <PackageIndexFile>$(MSBuildThisFileDirectory)..\Microsoft.Private.PackageBaseline\packageIndex.json</PackageIndexFile>
-  </PropertyGroup>
-
-  <!--
-    Below targets should moved to packaging.targets in BuildTools but keeping in corefx for convenience right now
-  -->
-
-  <Target Name="BlockStable" Condition="'$(BlockStable)' == 'true'" AfterTargets="CalculatePackageVersion">
-    <!-- DO NOT ship this packages as stable -->
-    <Error Condition="!$(PackageVersion.Contains('-'))" Text="Package $(Id) should not be built stable" />
-  </Target>
-
-  <!-- Get the package version if it isn't marked as block stable -->
-  <Target Name="GetPackageIdentityIfStable"
-          Returns="@(_StablePackageIdentity)">
-
-    <ItemGroup Condition="'$(BlockStable)' != 'true'">
-      <_StablePackageIdentity Include="$(Id)">
-        <Version>$(PackageVersion)</Version>
-      </_StablePackageIdentity>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/pkg/baseline/packageBaseline.1.1.json b/pkg/baseline/packageBaseline.1.1.json
deleted file mode 100644
index c1b6c58d7aa1..000000000000
--- a/pkg/baseline/packageBaseline.1.1.json
+++ /dev/null
@@ -1,449 +0,0 @@
-{
-  "Packages": {
-    "Microsoft.CSharp": {
-      "BaselineVersion": "4.3.0"
-    },
-    "Microsoft.NETCore.Platforms": {
-      "BaselineVersion": "1.1.0"
-    },
-    "Microsoft.NETCore.Targets": {
-      "BaselineVersion": "1.1.0"
-    },
-    "Microsoft.VisualBasic": {
-      "BaselineVersion": "10.1.0"
-    },
-    "Microsoft.Win32.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "Microsoft.Win32.Registry": {
-      "BaselineVersion": "4.3.0"
-    },
-    "Microsoft.Win32.Registry.AccessControl": {
-      "BaselineVersion": "4.3.0"
-    },
-    "NETStandard.Library": {
-      "BaselineVersion": "1.6.1"
-    },
-    "System.AppContext": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Buffers": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Collections": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Collections.Concurrent": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Collections.Immutable": {
-      "BaselineVersion": "1.3.0"
-    },
-    "System.Collections.NonGeneric": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Collections.Specialized": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ComponentModel": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ComponentModel.Annotations": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ComponentModel.EventBasedAsync": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ComponentModel.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ComponentModel.TypeConverter": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Console": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Data.Common": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Data.SqlClient": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.Contracts": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.Debug": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.DiagnosticSource": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.FileVersionInfo": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.Process": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.StackTrace": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.TextWriterTraceListener": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.Tools": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.TraceSource": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Diagnostics.Tracing": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Drawing.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Dynamic.Runtime": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Globalization": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Globalization.Calendars": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Globalization.Extensions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.Compression": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.Compression.ZipFile": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.FileSystem": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.FileSystem.AccessControl": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.FileSystem.DriveInfo": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.FileSystem.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.FileSystem.Watcher": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.IsolatedStorage": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.MemoryMappedFiles": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.Packaging": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.Pipes": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.IO.UnmanagedMemoryStream": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Linq": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Linq.Expressions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Linq.Parallel": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Linq.Queryable": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Http": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Http.Rtc": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Http.WinHttpHandler": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.NameResolution": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.NetworkInformation": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Ping": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Requests": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Security": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.Sockets": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.WebHeaderCollection": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.WebSockets": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Net.WebSockets.Client": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Numerics.Vectors": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Numerics.Vectors.WindowsRuntime": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ObjectModel": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Private.DataContractSerialization": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Private.Uri": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.Context": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.DispatchProxy": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.Emit": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.Emit.ILGeneration": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.Emit.Lightweight": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.Extensions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.Metadata": {
-      "BaselineVersion": "1.4.1"
-    },
-    "System.Reflection.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Reflection.TypeExtensions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Resources.Reader": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Resources.ResourceManager": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Resources.Writer": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.CompilerServices.Unsafe": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.CompilerServices.VisualC": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Extensions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Handles": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.InteropServices": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.InteropServices.RuntimeInformation": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.InteropServices.WindowsRuntime": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Loader": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Numerics": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Serialization.Json": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Serialization.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Serialization.Xml": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.WindowsRuntime": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.WindowsRuntime.UI.Xaml": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.AccessControl": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Claims": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.Algorithms": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.Cng": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.Csp": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.Encoding": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.OpenSsl": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.Pkcs": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.Primitives": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.ProtectedData": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Cryptography.X509Certificates": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Principal": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.Principal.Windows": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Security.SecureString": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ServiceProcess.ServiceController": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Text.Encoding": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Text.Encoding.CodePages": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Text.Encoding.Extensions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Text.Encodings.Web": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Text.RegularExpressions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.AccessControl": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.Overlapped": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.Tasks": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.Tasks.Dataflow": {
-      "BaselineVersion": "4.7.0"
-    },
-    "System.Threading.Tasks.Extensions": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.Tasks.Parallel": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.Thread": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.ThreadPool": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Threading.Timer": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Xml.ReaderWriter": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Xml.XDocument": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Xml.XmlDocument": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Xml.XmlSerializer": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Xml.XPath": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Xml.XPath.XDocument": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Xml.XPath.XmlDocument": {
-      "BaselineVersion": "4.3.0"
-    },
-    "Microsoft.Private.PackageBaseline": {
-      "BaselineVersion": "1.0.1"
-    },
-    "System.Composition.AttributedModel": {
-      "BaselineVersion": "1.0.31"
-    },
-    "System.Composition.Convention": {
-      "BaselineVersion": "1.0.31"
-    },
-    "System.Composition.Hosting": {
-      "BaselineVersion": "1.0.31"
-    },
-    "System.Composition.Runtime": {
-      "BaselineVersion": "1.0.31"
-    },
-    "System.Composition.TypedParts": {
-      "BaselineVersion": "1.0.31"
-    },
-    "System.Composition": {
-      "BaselineVersion": "1.0.31"
-    },
-    "System.IO.Pipes.AccessControl": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.Runtime.Serialization.Formatters": {
-      "BaselineVersion": "4.3.0"
-    },
-    "System.ValueTuple": {
-      "BaselineVersion": "4.3.0"
-    }
-  },
-  "ModulesToPackages": {}
-}
diff --git a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
index dff6b293fd54..5e00f038b4c5 100644
--- a/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
+++ b/src/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
@@ -1,7 +1,6 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
-    <PackageIndex Include="$(RepoRoot)\pkg\baseline\packageBaseline.1.1.json" />
     <ProjectReference Include="..\ref\System.Runtime.CompilerServices.Unsafe.csproj">
       <SupportedFramework>net45;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj b/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
index 17c7ace24531..55df101da535 100644
--- a/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
+++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
@@ -24,9 +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>
diff --git a/src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj b/src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj
index c20ee7643e44..3a01e670dd65 100644
--- a/src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj
+++ b/src/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/packages.builds b/src/packages.builds
index 5db0a5a44648..18bebf4150fe 100644
--- a/src/packages.builds
+++ b/src/packages.builds
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <BuildAllPackages>false</BuildAllPackages>
+    <BuildAllPackages>true</BuildAllPackages>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(BuildAllPackages)' == 'true'">
@@ -31,9 +31,6 @@
     <!-- add specific builds / pkgproj's here to include in servicing builds -->
   </ItemGroup>
 
-  <!-- Need the PackageIndexFile file property from baseline.props -->
-  <Import Project="../pkg/baseline/baseline.props" />
-
   <UsingTask TaskName="UpdatePackageIndex" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
 
   <!--
@@ -55,7 +52,7 @@
       <PkgProjects Include="*\pkg\**\*.pkgproj" />
     </ItemGroup>
 
-    <MSBuild Targets="GetPackageIdentityIfStable"
+    <MSBuild Targets="GetPackageIdentityWithoutPrerelease"
              BuildInParallel="$(BuildInParallel)"
              Projects="@(PkgProjects)"
              RemoveProperties="Configuration">
@@ -67,7 +64,8 @@
 
     <UpdatePackageIndex
       PackageIndexFile="$(PackageIndexFile)"
-      StablePackages="@(_StablePackages)" />
+      StablePackages="@(_StablePackages)"
+      Condition="'%(_StablePackages.BlockStable)' != 'true'" />
 
   </Target>