From f7a8a6ebb5c5db3ce8f369e049d9053e8308d8e7 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Fri, 8 Jul 2016 14:19:28 -0700
Subject: [PATCH] Validate Xamarin frameworks

This adds validation for Xamarin frameworks and fixes some packages
which were not representing Xamarin correctly.


Commit migrated from https://github.com/dotnet/corefx/commit/e586f1b2f4eca793de97361aa4b981eb966d13ec
---
 src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj       | 4 ++--
 .../Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj       | 3 ++-
 .../pkg/Microsoft.Win32.Primitives.pkgproj                        | 4 ++--
 src/libraries/System.AppContext/pkg/System.AppContext.pkgproj     | 4 ++--
 src/libraries/System.Buffers/pkg/System.Buffers.pkgproj           | 2 +-
 .../pkg/System.Collections.Concurrent.pkgproj                     | 4 ++--
 .../pkg/System.Collections.Immutable.pkgproj                      | 2 +-
 .../pkg/System.Collections.NonGeneric.pkgproj                     | 4 ++--
 .../pkg/System.Collections.Specialized.pkgproj                    | 4 ++--
 src/libraries/System.Collections/pkg/System.Collections.pkgproj   | 4 ++--
 .../pkg/System.ComponentModel.Annotations.pkgproj                 | 4 ++--
 .../pkg/System.ComponentModel.EventBasedAsync.pkgproj             | 4 ++--
 .../pkg/System.ComponentModel.Primitives.pkgproj                  | 4 ++--
 .../pkg/System.ComponentModel.TypeConverter.pkgproj               | 4 ++--
 .../System.ComponentModel/pkg/System.ComponentModel.pkgproj       | 4 ++--
 .../pkg/System.Composition.AttributedModel.pkgproj                | 2 +-
 .../pkg/System.Composition.Convention.pkgproj                     | 2 +-
 .../pkg/System.Composition.Hosting.pkgproj                        | 2 +-
 .../pkg/System.Composition.Runtime.pkgproj                        | 2 +-
 .../pkg/System.Composition.TypedParts.pkgproj                     | 2 +-
 src/libraries/System.Console/pkg/System.Console.pkgproj           | 4 ++--
 src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj   | 4 ++--
 .../System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj       | 4 ++--
 .../pkg/System.Diagnostics.Contracts.pkgproj                      | 4 ++--
 .../pkg/System.Diagnostics.Debug.SymbolReader.pkgproj             | 2 +-
 .../System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj | 4 ++--
 .../pkg/System.Diagnostics.DiagnosticSource.pkgproj               | 2 +-
 .../pkg/System.Diagnostics.FileVersionInfo.pkgproj                | 4 ++--
 .../pkg/System.Diagnostics.Process.pkgproj                        | 4 ++--
 .../pkg/System.Diagnostics.StackTrace.pkgproj                     | 4 ++--
 .../pkg/System.Diagnostics.TextWriterTraceListener.pkgproj        | 4 ++--
 .../System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj | 4 ++--
 .../pkg/System.Diagnostics.TraceSource.pkgproj                    | 4 ++--
 .../pkg/System.Diagnostics.Tracing.pkgproj                        | 4 ++--
 .../pkg/System.Drawing.Primitives.pkgproj                         | 3 ++-
 .../System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj     | 4 ++--
 .../pkg/System.Globalization.Calendars.pkgproj                    | 4 ++--
 .../pkg/System.Globalization.Extensions.pkgproj                   | 4 ++--
 .../System.Globalization/pkg/System.Globalization.pkgproj         | 4 ++--
 .../pkg/System.IO.Compression.ZipFile.pkgproj                     | 4 ++--
 .../System.IO.Compression/pkg/System.IO.Compression.pkgproj       | 4 ++--
 .../pkg/System.IO.FileSystem.DriveInfo.pkgproj                    | 4 ++--
 .../pkg/System.IO.FileSystem.Primitives.pkgproj                   | 4 ++--
 .../pkg/System.IO.FileSystem.Watcher.pkgproj                      | 4 ++--
 .../System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj         | 4 ++--
 .../pkg/System.IO.IsolatedStorage.pkgproj                         | 4 ++--
 .../pkg/System.IO.MemoryMappedFiles.pkgproj                       | 4 ++--
 src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj | 2 +-
 .../pkg/System.IO.UnmanagedMemoryStream.pkgproj                   | 4 ++--
 src/libraries/System.IO/pkg/System.IO.pkgproj                     | 4 ++--
 .../System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj   | 4 ++--
 .../System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj         | 4 ++--
 .../System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj       | 4 ++--
 src/libraries/System.Linq/pkg/System.Linq.pkgproj                 | 4 ++--
 src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj         | 4 ++--
 .../pkg/System.Net.NameResolution.pkgproj                         | 4 ++--
 .../pkg/System.Net.NetworkInformation.pkgproj                     | 4 ++--
 src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj         | 4 +++-
 .../System.Net.Primitives/pkg/System.Net.Primitives.pkgproj       | 4 ++--
 src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj | 4 ++--
 src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj | 4 ++--
 src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj   | 4 ++--
 .../pkg/System.Net.WebHeaderCollection.pkgproj                    | 4 ++--
 .../pkg/System.Net.WebSockets.Client.pkgproj                      | 4 ++--
 .../System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj       | 4 ++--
 .../System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj   | 4 ++--
 src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj   | 4 ++--
 .../pkg/System.Reflection.Context.pkgproj                         | 4 +++-
 .../pkg/System.Reflection.DispatchProxy.pkgproj                   | 4 ++--
 .../pkg/System.Reflection.Emit.ILGeneration.pkgproj               | 5 ++++-
 .../pkg/System.Reflection.Emit.Lightweight.pkgproj                | 5 ++++-
 .../System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj     | 6 +++++-
 .../pkg/System.Reflection.Extensions.pkgproj                      | 4 ++--
 .../pkg/System.Reflection.Metadata.pkgproj                        | 2 +-
 .../pkg/System.Reflection.Primitives.pkgproj                      | 4 ++--
 .../pkg/System.Reflection.TypeExtensions.pkgproj                  | 4 ++--
 src/libraries/System.Reflection/pkg/System.Reflection.pkgproj     | 4 ++--
 .../System.Resources.Reader/pkg/System.Resources.Reader.pkgproj   | 2 +-
 .../pkg/System.Resources.ResourceManager.pkgproj                  | 4 ++--
 .../System.Resources.Writer/pkg/System.Resources.Writer.pkgproj   | 2 +-
 .../pkg/System.Runtime.CompilerServices.Unsafe.pkgproj            | 2 +-
 .../pkg/System.Runtime.CompilerServices.VisualC.pkgproj           | 4 ++--
 .../pkg/System.Runtime.Extensions.pkgproj                         | 4 ++--
 .../System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj     | 4 ++--
 .../pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj | 4 ++--
 .../pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj     | 6 +++---
 .../pkg/System.Runtime.InteropServices.pkgproj                    | 4 ++--
 .../System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj       | 1 +
 .../System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj   | 4 ++--
 .../pkg/System.Runtime.Serialization.Formatters.pkgproj           | 4 ++--
 .../pkg/System.Runtime.Serialization.Json.pkgproj                 | 4 ++--
 .../pkg/System.Runtime.Serialization.Primitives.pkgproj           | 4 ++--
 .../pkg/System.Runtime.Serialization.Xml.pkgproj                  | 4 ++--
 src/libraries/System.Runtime/pkg/System.Runtime.pkgproj           | 4 ++--
 .../System.Security.Claims/pkg/System.Security.Claims.pkgproj     | 4 ++--
 .../pkg/System.Security.Cryptography.Algorithms.pkgproj           | 4 ++--
 .../pkg/System.Security.Cryptography.Csp.pkgproj                  | 4 ++--
 .../pkg/System.Security.Cryptography.Encoding.pkgproj             | 4 ++--
 .../pkg/System.Security.Cryptography.OpenSsl.pkgproj              | 2 +-
 .../pkg/System.Security.Cryptography.Pkcs.pkgproj                 | 8 --------
 .../pkg/System.Security.Cryptography.Primitives.pkgproj           | 4 ++--
 .../pkg/System.Security.Cryptography.ProtectedData.pkgproj        | 2 +-
 .../pkg/System.Security.Cryptography.X509Certificates.pkgproj     | 4 ++--
 .../pkg/System.Security.Principal.pkgproj                         | 4 ++--
 .../pkg/System.Security.SecureString.pkgproj                      | 4 ++--
 .../pkg/System.Text.Encoding.CodePages.pkgproj                    | 4 ++--
 .../pkg/System.Text.Encoding.Extensions.pkgproj                   | 4 ++--
 .../System.Text.Encoding/pkg/System.Text.Encoding.pkgproj         | 4 ++--
 .../pkg/System.Text.Encodings.Web.pkgproj                         | 2 +-
 .../pkg/System.Text.RegularExpressions.pkgproj                    | 4 ++--
 .../pkg/System.Threading.Tasks.Dataflow.pkgproj                   | 2 +-
 .../pkg/System.Threading.Tasks.Extensions.pkgproj                 | 2 +-
 .../pkg/System.Threading.Tasks.Parallel.pkgproj                   | 4 ++--
 .../System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj     | 4 ++--
 .../System.Threading.Thread/pkg/System.Threading.Thread.pkgproj   | 4 ++--
 .../pkg/System.Threading.ThreadPool.pkgproj                       | 4 ++--
 .../System.Threading.Timer/pkg/System.Threading.Timer.pkgproj     | 4 ++--
 src/libraries/System.Threading/pkg/System.Threading.pkgproj       | 4 ++--
 src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj     | 2 +-
 .../System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj   | 4 ++--
 .../System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj         | 4 ++--
 .../pkg/System.Xml.XPath.XDocument.pkgproj                        | 4 ++--
 .../pkg/System.Xml.XPath.XmlDocument.pkgproj                      | 4 ++--
 src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj       | 4 ++--
 .../System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj     | 4 ++--
 .../System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj | 4 ++--
 126 files changed, 239 insertions(+), 230 deletions(-)

diff --git a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
index 22dae08..7874563 100644
--- a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
+++ b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.CSharp.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\Microsoft.CSharp.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10">
diff --git a/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj b/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
index 6ddf503..203a2f7 100644
--- a/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
+++ b/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.VisualBasic.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\Microsoft.VisualBasic.builds" />
     <InboxOnTargetFramework Include="net45">
@@ -15,6 +15,7 @@
     <InboxOnTargetFramework Include="win8" />
     <InboxOnTargetFramework Include="wpa81" />
     <InboxOnTargetFramework Include="portable-net45+win8+wpa81" />
+    <OutOfBoxFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj b/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj
index 8aebb4a..acb5465 100644
--- a/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj
+++ b/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.Win32.Primitives.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\Microsoft.Win32.Primitives.csproj">
       <AdditionalProperties>TargetGroup=net46</AdditionalProperties>
diff --git a/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj b/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj
index 112fa02..833348f 100644
--- a/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj
+++ b/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
@@ -11,7 +11,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.AppContext.csproj">
-      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.AppContext.builds"/>
   </ItemGroup>
diff --git a/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj b/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
index 6034472..c56360f 100644
--- a/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
+++ b/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Buffers.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj b/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj
index 99ff5cf..0b9de80 100644
--- a/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj
+++ b/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -12,7 +12,7 @@
       <SupportedFramework>net45;netcore45;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Collections.Concurrent.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Collections.Concurrent.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
index d6337cc..de4a823 100644
--- a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
+++ b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Collections.Immutable.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj b/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj
index acdeeff..e24458e 100644
--- a/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj
+++ b/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Collections.NonGeneric.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Collections.NonGeneric.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj b/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj
index 562a476..dbf999e 100644
--- a/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj
+++ b/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Collections.Specialized.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Collections.Specialized.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Collections/pkg/System.Collections.pkgproj b/src/libraries/System.Collections/pkg/System.Collections.pkgproj
index c439524..8b176c2 100644
--- a/src/libraries/System.Collections/pkg/System.Collections.pkgproj
+++ b/src/libraries/System.Collections/pkg/System.Collections.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Collections.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Collections.pkgproj" />
     <ProjectReference Include="aot\System.Collections.pkgproj" />
diff --git a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
index 78c2f9d..b9d68f9 100644
--- a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
+++ b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -9,7 +9,7 @@
       <SupportedFramework>net46</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.ComponentModel.Annotations.csproj">
-      <SupportedFramework>net461;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net461;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ComponentModel.Annotations.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj b/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj
index b826c4a..b638698 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.ComponentModel.EventBasedAsync.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ComponentModel.EventBasedAsync.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj b/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj
index 53bedd6..f803e16 100644
--- a/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj
+++ b/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ComponentModel.Primitives.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ComponentModel.Primitives.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj b/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj
index 779e648..0a04b74 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.ComponentModel.TypeConverter.csproj">
-      <SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net462;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ComponentModel.TypeConverter.builds" />
   </ItemGroup>  
diff --git a/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj b/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj
index c0b1bb5..91448b0 100644
--- a/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj
+++ b/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ComponentModel.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ComponentModel.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
index 2cf2552..e22a34c 100644
--- a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
+++ b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.AttributedModel.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
index d813f79..00d62cd 100644
--- a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
+++ b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Convention.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
index 38467b4..2958394 100644
--- a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
+++ b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Hosting.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
index 395007a..3aba2c7 100644
--- a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
+++ b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Runtime.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
index 9c0b96b..9ce42c7 100644
--- a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
+++ b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.TypedParts.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Console/pkg/System.Console.pkgproj b/src/libraries/System.Console/pkg/System.Console.pkgproj
index a642bba..7c62322 100644
--- a/src/libraries/System.Console/pkg/System.Console.pkgproj
+++ b/src/libraries/System.Console/pkg/System.Console.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Console.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Console.csproj">
       <AdditionalProperties>TargetGroup=net46</AdditionalProperties>
diff --git a/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj b/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj
index 9ee2e94..708805f 100644
--- a/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj
+++ b/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <!-- netcore45;wp8 are actually supported but not the corresponding netstandard versions,
          so use suppression to permit an implementation until buildtools adds a way to specify
          netstandard support explicitly -->
-      <SupportedFramework>net451;netcore451;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net451;netcore451;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Data.Common.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
index c045ce1..e27fd32 100644
--- a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
+++ b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net451;</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Data.SqlClient.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Data.SqlClient.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj b/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj
index e960528..f1db80d 100644
--- a/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj
+++ b/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.Contracts.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Diagnostics.Contracts.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Diagnostics.Debug.SymbolReader/pkg/System.Diagnostics.Debug.SymbolReader.pkgproj b/src/libraries/System.Diagnostics.Debug.SymbolReader/pkg/System.Diagnostics.Debug.SymbolReader.pkgproj
index 08d4c20..62cee3e 100644
--- a/src/libraries/System.Diagnostics.Debug.SymbolReader/pkg/System.Diagnostics.Debug.SymbolReader.pkgproj
+++ b/src/libraries/System.Diagnostics.Debug.SymbolReader/pkg/System.Diagnostics.Debug.SymbolReader.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Diagnostics.Debug.SymbolReader.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj b/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
index aa9e762..0dca600 100644
--- a/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
+++ b/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Diagnostics.Debug.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="win\System.Diagnostics.Debug.pkgproj" />
     <ProjectReference Include="unix\System.Diagnostics.Debug.pkgproj" />
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 9de4c18..a6a50f9 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Diagnostics.DiagnosticSource.builds">
-      <SupportedFramework>net46;net45;netcore45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj b/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj
index 48822be..20aaca8 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.FileVersionInfo.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Diagnostics.FileVersionInfo.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj b/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj
index 1f83d50..079f4ba 100644
--- a/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj
+++ b/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.Process.csproj">
-      <SupportedFramework>net461;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\4.0\System.Diagnostics.Process.depproj">
       <SupportedFramework>net46</SupportedFramework>
diff --git a/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj b/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj
index f8282a4..cae0513 100644
--- a/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj
+++ b/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.StackTrace.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Diagnostics.StackTrace.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj
index 5d4dfce..0d2524f 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.TextWriterTraceListener.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Diagnostics.TextWriterTraceListener.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj b/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj
index ec3a8d9..8612d8c 100644
--- a/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj
+++ b/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.Tools.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Diagnostics.Tools.pkgproj" />
     <ProjectReference Include="aot\System.Diagnostics.Tools.pkgproj" />
diff --git a/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj b/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj
index 98d5a56..a1eea71 100644
--- a/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj
+++ b/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.TraceSource.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Diagnostics.TraceSource.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj b/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj
index 1e988e0..11d3bde 100644
--- a/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj
+++ b/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -12,7 +12,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Diagnostics.Tracing.csproj">
-      <SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net462;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Diagnostics.Tracing.csproj">
       <TargetGroup>net462</TargetGroup>
diff --git a/src/libraries/System.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj b/src/libraries/System.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj
index 1a69ab3..fbdbdbc 100644
--- a/src/libraries/System.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj
+++ b/src/libraries/System.Drawing.Primitives/pkg/System.Drawing.Primitives.pkgproj
@@ -3,10 +3,11 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Drawing.Primitives.csproj">
-    	<SupportedFramework>netcore45;net45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>netcore45;net45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Drawing.Primitives.builds">
     </ProjectReference>
+    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj b/src/libraries/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj
index e2f3cf4..fd51a29 100644
--- a/src/libraries/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj
+++ b/src/libraries/System.Dynamic.Runtime/pkg/System.Dynamic.Runtime.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Dynamic.Runtime.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Dynamic.Runtime.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj b/src/libraries/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj
index cd645ee..61e4e63 100644
--- a/src/libraries/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj
+++ b/src/libraries/System.Globalization.Calendars/pkg/System.Globalization.Calendars.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Globalization.Calendars.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Globalization.Calendars.csproj">
       <TargetGroup>net46</TargetGroup>
diff --git a/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj b/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj
index 50a1807..5df4084 100644
--- a/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj
+++ b/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Globalization.Extensions.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Globalization.Extensions.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj b/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj
index 6a5eda1..17d33bb 100644
--- a/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj
+++ b/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Globalization.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Globalization.pkgproj" />
     <ProjectReference Include="aot\System.Globalization.pkgproj" />
diff --git a/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj b/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj
index efd8365..97db260 100644
--- a/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj
+++ b/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Compression.ZipFile.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.Compression.ZipFile.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj b/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj
index f6332e5..98bd33d 100644
--- a/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj
+++ b/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.IO.Compression.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.Compression.builds" />
     <InboxOnTargetFramework Include="net45">
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj b/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj
index 277282d..1db8776 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.FileSystem.DriveInfo.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.FileSystem.DriveInfo.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj b/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj
index 6a69734..620ba15 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.FileSystem.Primitives.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.FileSystem.Primitives.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj b/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj
index 095bc24..750e799 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.FileSystem.Watcher.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.FileSystem.Watcher.builds" />
 
diff --git a/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj b/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj
index 5d314da..95cfb47 100644
--- a/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj
+++ b/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.FileSystem.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.FileSystem.csproj">
       <TargetGroup>net46</TargetGroup>
diff --git a/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj b/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj
index 64dde7f..5a941a2 100644
--- a/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj
+++ b/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.IsolatedStorage.csproj">
-      <SupportedFramework>netcore50</SupportedFramework>
+      <SupportedFramework>netcore50;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.IsolatedStorage.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj b/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj
index ae62794..b16c509 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.MemoryMappedFiles.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.MemoryMappedFiles.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
index eb9bd7f..bf0ee8c 100644
--- a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
+++ b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Packaging.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.Packaging.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj b/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj
index e50e668..64f8a2e 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.UnmanagedMemoryStream.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.UnmanagedMemoryStream.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.IO/pkg/System.IO.pkgproj b/src/libraries/System.IO/pkg/System.IO.pkgproj
index 9397deb..01f1fa1 100644
--- a/src/libraries/System.IO/pkg/System.IO.pkgproj
+++ b/src/libraries/System.IO/pkg/System.IO.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -9,7 +9,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.IO.csproj">
-      <SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net462;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.csproj">
       <TargetGroup>net462</TargetGroup>
diff --git a/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj b/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj
index c8c6603..8c7e1a2 100644
--- a/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj
+++ b/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -9,7 +9,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Linq.Expressions.csproj">
-      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Linq.Expressions.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj b/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj
index 5fa98f9..8f0f92e 100644
--- a/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj
+++ b/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Linq.Parallel.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Linq.Parallel.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj b/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj
index ebd13fe..ec89b81 100644
--- a/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj
+++ b/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Linq.Queryable.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Linq.Queryable.builds" />
     <InboxOnTargetFramework Include="monoandroid10" />
diff --git a/src/libraries/System.Linq/pkg/System.Linq.pkgproj b/src/libraries/System.Linq/pkg/System.Linq.pkgproj
index e880abe..2c8a720 100644
--- a/src/libraries/System.Linq/pkg/System.Linq.pkgproj
+++ b/src/libraries/System.Linq/pkg/System.Linq.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Linq.csproj">
-      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Linq.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj b/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj
index 13dac40..1ad881e 100644
--- a/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj
+++ b/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Net.Http.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.Http.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj b/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj
index 57fe97f..f336d89 100644
--- a/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj
+++ b/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.NameResolution.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.NameResolution.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj b/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj
index 2606924..26d093d 100644
--- a/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj
+++ b/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Net.NetworkInformation.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.NetworkInformation.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj b/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj
index 82019b6..4ea50cd 100644
--- a/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj
+++ b/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.Ping.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.Ping.builds" />
   </ItemGroup>
@@ -14,6 +14,8 @@
     <InboxOnTargetFramework Include="MonoTouch10" />
     <InboxOnTargetFramework Include="xamarinios10" />
     <InboxOnTargetFramework Include="xamarinmac20" />
+    <InboxOnTargetFramework Include="xamarintvos10" />
+    <InboxOnTargetFramework Include="xamarinwatchos10" />
 
     <NotSupportedOnTargetFramework Include="netcore50">
       <PackageTargetRuntime>win7</PackageTargetRuntime>
diff --git a/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj b/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj
index f51aa7f..6c6cf7d 100644
--- a/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj
+++ b/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -12,7 +12,7 @@
       <SupportedFramework>net45;netcore45;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Net.Primitives.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <InboxOnTargetFramework Include="MonoAndroid10" />
     <InboxOnTargetFramework Include="MonoTouch10" />
diff --git a/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj b/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj
index 1ada30c..97fce60 100644
--- a/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj
+++ b/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -12,7 +12,7 @@
       <SupportedFramework>net45;netcore45;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Net.Requests.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.Requests.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj b/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj
index bc320a7..7455d08 100644
--- a/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj
+++ b/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.Security.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.Security.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj b/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
index 9194f1a..eff9249 100644
--- a/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
+++ b/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.Sockets.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.Sockets.csproj">
       <TargetGroup>net46</TargetGroup>
diff --git a/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj b/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj
index 914c1ab..9bf08ad 100644
--- a/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj
+++ b/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.WebHeaderCollection.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.WebHeaderCollection.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj b/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj
index 81687b8..07be55b 100644
--- a/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj
+++ b/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.WebSockets.Client.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.WebSockets.Client.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj b/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj
index af68a6b..2c15f3f 100644
--- a/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj
+++ b/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.WebSockets.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.WebSockets.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
index c579bd6..15a1423 100644
--- a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
+++ b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Numerics.Vectors.csproj">
-      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Numerics.Vectors.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj b/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj
index b9edf45..5977192 100644
--- a/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj
+++ b/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.13.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.ObjectModel.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ObjectModel.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
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 a2e82c4..4b5415d 100644
--- a/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj
+++ b/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj
@@ -6,12 +6,14 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.Context.csproj">
-      <SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.Context.builds" />
     <InboxOnTargetFramework Include="net45" />
     <InboxOnTargetFramework Include="win8" />
     <InboxOnTargetFramework Include="portable-net45+win8" />
+    <!-- Xamarin doesn't include a DLL for this but is getting placeholders from portable-net45+win8 -->
+    <OutOfBoxFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj b/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
index 8d92e38..362e31b 100644
--- a/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
+++ b/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.DispatchProxy.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.DispatchProxy.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.pkgproj b/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.pkgproj
index 5588a96..6552140 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.pkgproj
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.pkgproj
@@ -6,12 +6,15 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.Emit.ILGeneration.csproj">
-      <SupportedFramework>net45;netcoreapp1.0;wp8</SupportedFramework>
+      <SupportedFramework>net45;netcoreapp1.0;wp8;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.Emit.ILGeneration.builds" />
     <InboxOnTargetFramework Include="net45" />
     <InboxOnTargetFramework Include="wp80" />
     <InboxOnTargetFramework Include="portable-net45+wp8" />
+    <!-- MonoTouch, Xamarin.iOS, Xamarin.TVOS, and Xamarain.WatchOS don't actually support this, 
+         but do support a PCL profile that contained it so we must treat as inbox -->
+    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
     <!-- ensure that no lib is in scope for AOT since this isn't supported -->
     <File Include="$(PlaceholderFile)">
       <TargetPath>runtimes/aot/lib/netcore50</TargetPath>
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj b/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj
index 2b5af07..930062f 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj
+++ b/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj
@@ -6,12 +6,15 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.Emit.Lightweight.csproj">
-      <SupportedFramework>net45;netcoreapp1.0;wp8</SupportedFramework>
+      <SupportedFramework>net45;netcoreapp1.0;wp8;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.Emit.Lightweight.builds" />
     <InboxOnTargetFramework Include="net45" />
     <InboxOnTargetFramework Include="wp80" />
     <InboxOnTargetFramework Include="portable-net45+wp8" />
+    <!-- MonoTouch, Xamarin.iOS, Xamarin.TVOS, and Xamarain.WatchOS don't actually support this, 
+         but do support a PCL profile that contained it so we must treat as inbox -->
+    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
     <!-- This dependency is not suported on AOT, but that is OK since this package is
          restricted from AOT via runtime.json -->
     <SuppressDependencyError Include="System.Reflection.Emit.ILGeneration">
diff --git a/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj b/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj
index 48a5544..9f87755 100644
--- a/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj
+++ b/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.pkgproj
@@ -6,12 +6,16 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.Emit.csproj">
-      <SupportedFramework>net45;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore50;netcoreapp1.0;MonoAndroid10;xamarinmac20</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.Emit.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
     <InboxOnTargetFramework Include="net45" />
     <InboxOnTargetFramework Include="xamarinmac20" />
+    <NotSupportedOnTargetFramework Include="monotouch10" />
+    <NotSupportedOnTargetFramework Include="xamarinios10" />
+    <NotSupportedOnTargetFramework Include="xamarintvos10" />
+    <NotSupportedOnTargetFramework Include="xamarinwatchos10" />
     <!-- ensure that no lib is in scope for AOT since this isn't supported 
     <File Include="$(PlaceholderFile)">
       <TargetPath>runtimes/aot/lib/netcore50</TargetPath>
diff --git a/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj b/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj
index c6c1d12..5da42b4 100644
--- a/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj
+++ b/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.Extensions.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Reflection.Extensions.pkgproj" />
     <ProjectReference Include="aot\System.Reflection.Extensions.pkgproj" />
diff --git a/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj b/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
index 67f2622..00d2fc6 100644
--- a/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
+++ b/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Reflection.Metadata.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <Dependency Include="System.Collections.Immutable">
       <TargetFramework>portable-net45+win8</TargetFramework>
diff --git a/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj b/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj
index 5f68a27..cd61fa0 100644
--- a/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj
+++ b/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.Primitives.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Reflection.Primitives.pkgproj" />
     <ProjectReference Include="aot\System.Reflection.Primitives.pkgproj" />
diff --git a/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj b/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
index 92a3bae..c9495fca 100644
--- a/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
+++ b/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Reflection.TypeExtensions.csproj">
-      <SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net462;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.TypeExtensions.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj b/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj
index 62dea02..da4b05b 100644
--- a/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj
+++ b/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -9,7 +9,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Reflection.csproj">
-      <SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net462;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Reflection.csproj">
       <TargetGroup>net462</TargetGroup>
diff --git a/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj b/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj
index 701a9c5..77afaa5 100644
--- a/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj
+++ b/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Resources.Reader.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj b/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj
index 5fed5fa..d964797 100644
--- a/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj
+++ b/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Resources.ResourceManager.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Resources.ResourceManager.pkgproj" />
     <ProjectReference Include="aot\System.Resources.ResourceManager.pkgproj" />
diff --git a/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj b/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj
index 9ceb836..ee856e4 100644
--- a/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj
+++ b/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Resources.Writer.builds">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
index ffb4815..98ecbee 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Runtime.CompilerServices.Unsafe.ilproj">
-      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj b/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj
index ae1ee9f..6729661 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.CompilerServices.VisualC.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.CompilerServices.VisualC.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj b/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
index e7e73fc..7d99dcd 100644
--- a/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
+++ b/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -9,7 +9,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Runtime.Extensions.csproj">
-      <SupportedFramework>netcoreapp1.0;net462</SupportedFramework>
+      <SupportedFramework>netcoreapp1.0;net462;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Extensions.csproj">
       <TargetGroup>net462</TargetGroup>
diff --git a/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj b/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj
index e6d018d..dd5bf77 100644
--- a/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj
+++ b/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.Handles.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Runtime.Handles.pkgproj" />
     <ProjectReference Include="aot\System.Runtime.Handles.pkgproj" />
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj
index 1713bb1..24f41f0 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.InteropServices.RuntimeInformation.csproj">
-      <SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.InteropServices.RuntimeInformation.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj
index 2674f79..07f643e 100644
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.InteropServices.WindowsRuntime.csproj">
-      <SupportedFramework>net45;netcoreapp1.0;netcore45;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcoreapp1.0;netcore45;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.InteropServices.WindowsRuntime.builds" />
     <InboxOnTargetFramework Include="net45" />
@@ -14,7 +14,7 @@
     <InboxOnTargetFramework Include="wp80" />
     <InboxOnTargetFramework Include="wpa81" />
     <InboxOnTargetFramework Include="portable-net45+win8+wp8+wpa81" />
-    <NotSupportedOnTargetFramework Include="xamarinios1" />
+    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj b/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
index e43e92d..29516a6 100644
--- a/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -15,7 +15,7 @@
       <SupportedFramework>net462</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Runtime.InteropServices.csproj">
-      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\redist\net462\System.Runtime.InteropServices.depproj">
       <TargetGroup>net462</TargetGroup>
diff --git a/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj b/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj
index 0cecb0e..46da53f 100644
--- a/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj
+++ b/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj
@@ -9,6 +9,7 @@
     <ProjectReference Include="..\src\System.Runtime.Loader.builds"/>
     
     <NotSupportedOnTargetFramework Include="net462" />
+    <NotSupportedOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
   
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj b/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj
index 139e680..253dbfa 100644
--- a/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj
+++ b/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.Numerics.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Numerics.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj b/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj
index 0b6d100..906c8a8 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>  
     <ProjectReference Include="..\ref\System.Runtime.Serialization.Formatters.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Serialization.Formatters.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj b/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj
index 0f5173b..af12513 100644
--- a/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.3.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.Serialization.Json.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Serialization.Json.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj b/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj
index 526e90f..1da6d0a 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Runtime.Serialization.Primitives.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Serialization.Primitives.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj b/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj
index b33463b..956524a 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Runtime.Serialization.Xml.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Serialization.Xml.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj b/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj
index f9ba487..9663dce 100644
--- a/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj
+++ b/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -12,7 +12,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Runtime.csproj">
-      <SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net462;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.csproj">
       <TargetGroup>net462</TargetGroup>
diff --git a/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj b/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj
index 743551d..12c51ea 100644
--- a/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj
+++ b/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Claims.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Claims.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj b/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj
index 9a9854b..0febb63 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -9,7 +9,7 @@
       <SupportedFramework>net461;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Algorithms.csproj">
-      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.Algorithms.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj b/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj
index 189fdef..7989650 100644
--- a/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Csp.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.Csp.builds" />
     <NotSupportedOnTargetFramework Include="netcore50">
diff --git a/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj b/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj
index 88da850..b854773 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Encoding.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.Encoding.builds" />
 
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj
index 86c481e..e030ecb 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.OpenSsl.csproj">
-      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.OpenSsl.builds" />
 
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj b/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj
index 96fe875..44d3cd9 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj
@@ -8,14 +8,6 @@
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.Pkcs.builds" />
   </ItemGroup>
-  <ItemGroup>
-    <InboxOnTargetFramework Include="MonoAndroid10" />
-    <InboxOnTargetFramework Include="MonoTouch10" />
-    <InboxOnTargetFramework Include="xamarinios10" />
-    <InboxOnTargetFramework Include="xamarinmac20" />
-    <InboxOnTargetFramework Include="xamarintvos10" />
-    <InboxOnTargetFramework Include="xamarinwatchos10" />
-  </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
diff --git a/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj b/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj
index bf432f8..d521c7e 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Primitives.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.Primitives.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
index 3c11801..671fc7e 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.ProtectedData.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.ProtectedData.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj b/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj
index c1a221a..3b0d258 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net46</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Security.Cryptography.X509Certificates.csproj">
-      <SupportedFramework>net461;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net461;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.X509Certificates.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj b/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj
index bd7aa2f..5bbb099 100644
--- a/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj
+++ b/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Principal.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Principal.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj b/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj
index dffaeab..ade6d27 100644
--- a/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj
+++ b/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.SecureString.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.SecureString.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
index 4cc5771..3255d46 100644
--- a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
+++ b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Text.Encoding.CodePages.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Text.Encoding.CodePages.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj b/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj
index ef01aaa..d9c2d65 100644
--- a/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj
+++ b/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Text.Encoding.Extensions.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Text.Encoding.Extensions.pkgproj" />
     <ProjectReference Include="aot\System.Text.Encoding.Extensions.pkgproj" />
diff --git a/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj b/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj
index 8b45390..30d9ad1 100644
--- a/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj
+++ b/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Text.Encoding.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Text.Encoding.pkgproj" />
     <ProjectReference Include="aot\System.Text.Encoding.pkgproj" />
diff --git a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
index 17ed019..c10fd25 100644
--- a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
+++ b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Text.Encodings.Web.builds">
-      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
index 6148189..39dd35d 100644
--- a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
+++ b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -9,7 +9,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Text.RegularExpressions.csproj">
-      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Text.RegularExpressions.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj b/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj
index c2813e9..89f530d 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Threading.Tasks.Dataflow.csproj">
-      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Threading.Tasks.Dataflow.WP8.csproj" />
   </ItemGroup>
diff --git a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
index 679c402..fbc0b58 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.Threading.Tasks.Extensions.builds" >
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;wp8</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;wp8;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj b/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj
index d551f7a..075d33c 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Threading.Tasks.Parallel.csproj">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Threading.Tasks.Parallel.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj b/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj
index a7e28d6..808f152 100644
--- a/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj
+++ b/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Threading.Tasks.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Threading.Tasks.pkgproj" />
     <ProjectReference Include="aot\System.Threading.Tasks.pkgproj" />
diff --git a/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj b/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj
index bf3ffb5..51d5002 100644
--- a/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj
+++ b/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Threading.Thread.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Threading.Thread.builds" />
     <NotSupportedOnTargetFramework Include="netcore50" />
diff --git a/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj b/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj
index ec315f2..2d2c8c4 100644
--- a/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj
+++ b/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Threading.ThreadPool.csproj">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Threading.ThreadPool.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj b/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj
index 98ddc95..da6b060 100644
--- a/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj
+++ b/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.2.0</Version>
@@ -6,7 +6,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Threading.Timer.csproj">
-      <SupportedFramework>net451;netcore451;netcoreapp1.0;wpa81</SupportedFramework>
+      <SupportedFramework>net451;netcore451;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Threading.Timer.pkgproj" />
     <ProjectReference Include="aot\System.Threading.Timer.pkgproj" />
diff --git a/src/libraries/System.Threading/pkg/System.Threading.pkgproj b/src/libraries/System.Threading/pkg/System.Threading.pkgproj
index a88a0a8..50d89d2 100644
--- a/src/libraries/System.Threading/pkg/System.Threading.pkgproj
+++ b/src/libraries/System.Threading/pkg/System.Threading.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Threading.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Threading.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
index e769c52..d8c69f7 100644
--- a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
+++ b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\System.ValueTuple.builds">
-      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj b/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj
index 68100c1..3547336 100644
--- a/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj
+++ b/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
@@ -6,7 +6,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Xml.ReaderWriter.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Xml.ReaderWriter.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj b/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj
index 87fc27f..6ab882f 100644
--- a/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj
+++ b/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Xml.XDocument.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Xml.XDocument.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj b/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj
index 0f0ac45..afc857f 100644
--- a/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj
+++ b/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Xml.XPath.XDocument.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Xml.XPath.XDocument.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj b/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj
index e0bb802..29cb98c 100644
--- a/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj
+++ b/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Xml.XPath.XmlDocument.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Xml.XPath.XmlDocument.builds" />
     <!-- nothing special required for desktop - pure plib with no type conflicts. -->
diff --git a/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj b/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj
index f919fb1..d535a01 100644
--- a/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj
+++ b/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Xml.XPath.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Xml.XPath.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj b/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj
index 6a86400..09a8595 100644
--- a/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj
+++ b/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Xml.XmlDocument.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Xml.XmlDocument.builds" />
   </ItemGroup>
diff --git a/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj b/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj
index 2b6d575..b34599c 100644
--- a/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj
+++ b/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Version>4.0.12.0</Version>
@@ -9,7 +9,7 @@
       <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Xml.XmlSerializer.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Xml.XmlSerializer.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
-- 
2.7.4