Update UAP System.Private.CoreLib to unblock UAP builds (#27805)

nattress · web-flow · commit 671b10bb2166 · 2018-03-08T16:40:00.000-08:00
* Update UAP targeting pack To fix the flow from CoreCLR and CoreFX into TFS, update the targeting pack with a version of System.Private.CoreLib that has an updated signature for Stream.WriteAsync. This should be sufficient to re-enable uapaot builds so we can get a new set of uap packages. * Revert "Disable uapaot builds on several projects" This reverts commit ebe1468.
diff --git a/dependencies.props b/dependencies.props
@@ -34,7 +34,7 @@
     <CoreFxExpectedPrerelease>preview2-26308-02</CoreFxExpectedPrerelease>
     <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26308-02</MicrosoftNETCorePlatformsPackageVersion>
     <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview2-26308-06</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <ProjectNTfsExpectedPrerelease>beta-26306-00</ProjectNTfsExpectedPrerelease>
+    <ProjectNTfsExpectedPrerelease>beta-26306-01</ProjectNTfsExpectedPrerelease>
     <ProjectNTfsTestILCExpectedPrerelease>beta-26306-00</ProjectNTfsTestILCExpectedPrerelease>
     <ProjectNTfsTestILCPackageVersion>1.0.0-beta-26306-00</ProjectNTfsTestILCPackageVersion>
     <MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26306-04</MicrosoftNETCoreDotNetHostPackageVersion>
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
@@ -182,10 +182,16 @@
           SkipUnchangedFiles="true"/>
   </Target>
 
+<!--
+  
+  Disable this check until we get the CoreCLR and TFS versions of System.Private.CoreLib back in sync after recent breaking changes.
+  https://github.com/dotnet/corefx/issues/27619
+
   <Target Name="VerifyMatchingProjectNVersions"
           BeforeTargets="Build">
     <Error Condition="'$(ProjectNTfsExpectedPrerelease)' != '$(ProjectNTfsTestILCExpectedPrerelease)'" Text="The versions of ProjectN Targeting pack and TestILC have gone out of sync. Please make sure both of the prerelease versions on dependencies.props match." />
   </Target>
+-->
 
   <Target Name="CopyTestILCToolsToTestHost"
           AfterTargets="RestorePackages"
diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
@@ -50,6 +50,12 @@
         System.Security.Principal.Windows;
       </Value>
     </ValidatePackageSuppression>
+    <!-- Permit missing Inbox since this used to be a shim and it is now OOB -->
+    <ValidatePackageSuppression Include="PermitMissingInbox">
+        <Value>
+            System.ComponentModel.Composition;
+        </Value>
+    </ValidatePackageSuppression>
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
@@ -12,8 +12,7 @@
     <LibBinDir>$(UAPPackageRuntimePath)</LibBinDir>
     <LibBinDir Condition="$(PackageTargetRuntime.EndsWith('-aot'))">$(UAPAOTPackageRuntimePath)</LibBinDir>
 
-    <!-- <IsFrameworkPackage>true</IsFrameworkPackage> -->
-    <SkipValidatePackage>true</SkipValidatePackage>
+    <IsFrameworkPackage>true</IsFrameworkPackage>
 
     <!-- Private packages need symbols -->
     <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
@@ -67,6 +66,12 @@
         System.Private.Reflection.Metadata.Ecma335;
       </Value>
     </ValidatePackageSuppression>
+    <!-- Permit missing Inbox since this used to be a shim and it is now OOB -->
+    <ValidatePackageSuppression Include="PermitMissingInbox">
+        <Value>
+            System.ComponentModel.Composition;
+        </Value>
+    </ValidatePackageSuppression>
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -4504,7 +4504,6 @@
         "portable45-net45+wp8": "3.9.0.0",
         "portable46-net451+win81": "4.0.0.0",
         "portable46-win81+wp81": "3.9.0.0",
-        "uap10.0.16299": "4.0.0.0",
         "win8": "4.0.0.0",
         "wp8": "3.9.0.0",
         "xamarinios10": "Any",
@@ -4540,7 +4539,6 @@
         "net45": "4.0.0.0",
         "portable45-net45+win8": "4.0.0.0",
         "portable46-net451+win81": "4.0.0.0",
-        "uap10.0.16299": "4.1.1.0",
         "win8": "4.0.0.0",
         "xamarinios10": "Any",
         "xamarinmac20": "Any",
@@ -4559,7 +4557,6 @@
         "portable45-net45+wp8": "3.9.0.0",
         "portable46-net451+win81": "4.0.0.0",
         "portable46-win81+wp81": "3.9.0.0",
-        "uap10.0.16299": "4.1.3.0",
         "win8": "4.0.0.0",
         "wp8": "3.9.0.0",
         "xamarinios10": "Any",
@@ -4585,7 +4582,6 @@
         "net45": "4.0.0.0",
         "portable45-net45+win8": "4.0.0.0",
         "portable46-net451+win81": "4.0.0.0",
-        "uap10.0.16299": "4.1.3.0",
         "win8": "4.0.0.0",
         "xamarinios10": "Any",
         "xamarinmac20": "Any",
@@ -4603,7 +4599,6 @@
         "portable45-net45+wp8": "3.9.0.0",
         "portable46-net451+win81": "4.0.0.0",
         "portable46-win81+wp81": "3.9.0.0",
-        "uap10.0.16299": "4.2.1.0",
         "win8": "4.0.0.0",
         "wp8": "3.9.0.0",
         "xamarinios10": "Any",
@@ -4627,7 +4622,6 @@
         "portable45-net45+wp8": "3.9.0.0",
         "portable46-net451+win81": "4.0.0.0",
         "portable46-win81+wp81": "3.9.0.0",
-        "uap10.0.16299": "4.0.4.0",
         "win8": "4.0.0.0",
         "wp8": "3.9.0.0",
         "xamarinios10": "Any",
@@ -4659,7 +4653,6 @@
         "portable46-win81+wp81+wpa81": "4.0.0.0",
         "portable46-win81+wpa81": "4.0.0.0",
         "portable46-wp81+wpa81": "4.0.0.0",
-        "uap10.0.16299": "4.0.0.0",
         "uap10.0.16300": "4.0.0.0",
         "win8": "4.0.0.0",
         "wp8": "2.0.5.0",
@@ -5034,7 +5027,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.1.0",
         "netcoreapp2.1": "4.2.0.0",
-        "uap10.0.16300": "4.1.2.0"
+        "uap10.0.16300": "4.2.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
diff --git a/src/System.Collections/src/Configurations.props b/src/System.Collections/src/Configurations.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
-      <!-- uapaot-Windows_NT; -->
+      uapaot-Windows_NT;
       netcoreapp-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
diff --git a/src/System.Linq.Expressions/src/Configurations.props b/src/System.Linq.Expressions/src/Configurations.props
@@ -4,7 +4,7 @@
     <BuildConfigurations>
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
-      <!-- uapaot-Windows_NT; -->
+      uapaot-Windows_NT;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
diff --git a/src/System.Linq.Expressions/tests/Configurations.props b/src/System.Linq.Expressions/tests/Configurations.props
@@ -4,8 +4,8 @@
     <BuildConfigurations>
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
-      <!-- uapaot-Windows_NT; -->
-      <!-- uap-Windows_NT; -->
+      uapaot-Windows_NT;
+      uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/src/System.Runtime.Extensions/src/Configurations.props b/src/System.Runtime.Extensions/src/Configurations.props
@@ -4,7 +4,7 @@
     <BuildConfigurations>
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
-      <!-- uapaot-Windows_NT; -->
+      uapaot-Windows_NT;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
diff --git a/src/System.Runtime.WindowsRuntime/src/Configurations.props b/src/System.Runtime.WindowsRuntime/src/Configurations.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       uap-Windows_NT;
-      <!-- uapaot-Windows_NT; -->
+      uapaot-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/src/System.Runtime/src/Configurations.props b/src/System.Runtime/src/Configurations.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
-      <!-- uapaot-Windows_NT; -->
+      uapaot-Windows_NT;
       netcoreapp-Windows_NT;
       netcoreapp-Unix;
       uap-Windows_NT;
diff --git a/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj b/src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
@@ -12,6 +12,7 @@
     <ProjectReference Include="..\src\System.Threading.Tasks.Extensions.csproj" />
 
     <InboxOnTargetFramework Include="netcoreapp2.1" />
+    <InboxOnTargetFramework Include="$(UAPvNextTFM)" />
 
     <!-- this package is part of the implementation closure of NETStandard.Library
          therefore it cannot reference NETStandard.Library -->
diff --git a/src/System.Threading.Thread/src/Configurations.props b/src/System.Threading.Thread/src/Configurations.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
-      <!-- uapaot-Windows_NT; -->
+      uapaot-Windows_NT;
       uap-Windows_NT;
       netcoreapp-Windows_NT;
       netcoreapp-Unix;
diff --git a/src/System.Threading/src/Configurations.props b/src/System.Threading/src/Configurations.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       uap-Windows_NT;
-      <!-- uapaot-Windows_NT; -->
+      uapaot-Windows_NT;
       netcoreapp-Windows_NT;
       netcoreapp-Unix;
     </BuildConfigurations>
diff --git a/src/shims/ApiCompat.proj b/src/shims/ApiCompat.proj
@@ -23,8 +23,7 @@
     <BaselineApiCompat Condition="'$(BaselineApiCompat)' == ''">false</BaselineApiCompat>
     <_RunApiCompat>true</_RunApiCompat>
     <!-- Disable running apicompat for uap scenarios because the RuntimePath is not correctly setup in BuildAllConfigurations mode -->
-    <!-- <_RunApiCompat Condition="'$(BuildAllConfigurations)' == 'true' and $(TargetGroup.StartsWith('uap'))">false</_RunApiCompat> -->
-    <_RunApiCompat Condition="$(TargetGroup.StartsWith('uap'))">false</_RunApiCompat>
+    <_RunApiCompat Condition="'$(BuildAllConfigurations)' == 'true' and $(TargetGroup.StartsWith('uap'))">false</_RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/shims/manual/System.csproj b/src/shims/manual/System.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
-      <!-- uap; -->
+      uap;
     </BuildConfigurations>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsUAP>true</IsUAP>
diff --git a/src/shims/manual/mscorlib.csproj b/src/shims/manual/mscorlib.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
-      <!-- uap; -->
+      uap;
     </BuildConfigurations>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsUAP>true</IsUAP>
