Merge pull request dotnet/corefx#28034 from weshaggard/AddXamarinPlac…

…eholders Add Xamarin placeholders for System.Memory package Commit migrated from dotnet/corefx@c4f2317
picenka21 · Mar 14, 2018 · 5f6196e · 5f6196e
2 parents e0b3be1 + 2a754d3
commit 5f6196e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/libraries/System.Memory/pkg/System.Memory.pkgproj b/src/libraries/System.Memory/pkg/System.Memory.pkgproj
@@ -7,11 +7,11 @@
       <SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Memory.csproj" />
-
+    <InboxOnTargetFramework  Include="$(AllXamarinFrameworks)" />
     <!-- Since UAP and .NETCoreApp are package based we still want to enable
          OOBing libraries that happen to overlap with their framework package.
-         This avoids us having to lock the API in our NuGet packages just 
-         to match what shipped inbox: since we can provide a new library 
+         This avoids us having to lock the API in our NuGet packages just
+         to match what shipped inbox: since we can provide a new library
          we can update it to add API without raising the netstandard version. -->
     <ValidatePackageSuppression Include="TreatAsOutOfBox">
       <Value>.NETCoreApp;UAP</Value>

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -2461,8 +2461,14 @@
     },
     "System.Memory": {
       "InboxOn": {
+        "monoandroid10": "Any",
+        "monotouch10": "Any",
         "netcoreapp2.1": "4.0.1.0",
-        "uap10.0.16300": "4.0.1.0"
+        "uap10.0.16300": "4.0.1.0",
+        "xamarinios10": "Any",
+        "xamarinmac20": "Any",
+        "xamarintvos10": "Any",
+        "xamarinwatchos10": "Any"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",