diff options
| author | Simon Nattress <nattress@gmail.com> | 2018-03-09 03:40:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-09 03:40:00 +0300 |
| commit | 671b10bb21668d8432f066a4307c269a98a66ea8 (patch) | |
| tree | e2242fa4d6f949beb65e15236daa9e8c928caebd /external | |
| parent | 2a160877d0a57df458fd51948164062cdfb8fae8 (diff) | |
Update UAP System.Private.CoreLib to unblock UAP builds (#27805)
* 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 ebe14686a89d26d1d34d359f7a636d6e9a36a624.
Diffstat (limited to 'external')
| -rw-r--r-- | external/test-runtime/XUnit.Runtime.depproj | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj index f009697544..5ce36a5e8b 100644 --- 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" |