Merge pull request #2667 from StephenBonikowsky/stebon/uwp6.1/PortUpd…

…ateUapVNextTFM Merge pull request #2649 from joperezr/UpdateUAPTFM
dotnet · Mar 12, 2018 · 71c2573 · 71c2573
2 parents ee80b13 + 3a85358
commit 71c2573
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/dir.props b/dir.props
@@ -11,7 +11,7 @@
 
   <!-- Define vNext UAP Moniker -->
   <PropertyGroup>
-    <UAPvNextVersion>10.0.15138</UAPvNextVersion>
+    <UAPvNextVersion>10.0.16300</UAPvNextVersion>
     <UAPvNextTFMFull>UAP,Version=v$(UAPvNextVersion)</UAPvNextTFMFull>
     <UAPvNextTFM>uap$(UAPvNextVersion)</UAPvNextTFM>
   </PropertyGroup>

diff --git a/pkg/baseline/packageIndex.json b/pkg/baseline/packageIndex.json
@@ -33,7 +33,9 @@
         "4.3.0"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.1.1.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.0.1",
@@ -51,7 +53,9 @@
         "4.3.0"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.1.3.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "3.9.0.0": "3.9.0",
         "4.0.0.0": "4.0.0",
@@ -69,7 +73,9 @@
         "4.3.0"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.1.3.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.1.0.0": "4.1.0",
@@ -86,7 +92,9 @@
         "4.3.0"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.2.1.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "3.9.0.0": "3.9.0",
         "4.0.0.0": "4.0.0",
@@ -104,7 +112,9 @@
         "4.3.0"
       ],
       "BaselineVersion": "4.5.0",
-      "InboxOn": {},
+      "InboxOn": {
+        "uap10.0.16299": "4.0.4.0"
+      },
       "AssemblyVersionInPackageVersion": {
         "3.9.0.0": "3.9.0",
         "4.0.0.0": "4.0.0",

diff --git a/src/System.ServiceModel.Http/pkg/System.ServiceModel.Http.pkgproj b/src/System.ServiceModel.Http/pkg/System.ServiceModel.Http.pkgproj
@@ -27,6 +27,11 @@
       <!-- Supported inbox by all ns1.0-1.2 frameworks -->
       <Value>.NETStandard,Version=v1.0;.NETStandard,Version=v1.1;.NETStandard,Version=v1.2</Value>
     </ValidatePackageSuppression>
+    <!-- Implementation shipped inbox on UAP but we want to keep it as out of box so that we can keep
+    making API changes -->
+    <ValidatePackageSuppression Include="TreatAsOutOfBox">
+      <Value>UAP</Value>
+    </ValidatePackageSuppression>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
diff --git a/src/System.ServiceModel.NetTcp/pkg/System.ServiceModel.NetTcp.pkgproj b/src/System.ServiceModel.NetTcp/pkg/System.ServiceModel.NetTcp.pkgproj
@@ -26,6 +26,11 @@
       <!-- Supported inbox by all ns1.0-1.2 frameworks -->
       <Value>.NETStandard,Version=v1.1;.NETStandard,Version=v1.2</Value>
     </ValidatePackageSuppression>
+    <!-- Implementation shipped inbox on UAP but we want to keep it as out of box so that we can keep
+    making API changes -->
+    <ValidatePackageSuppression Include="TreatAsOutOfBox">
+      <Value>UAP</Value>
+    </ValidatePackageSuppression>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>