This repository was archived by the owner on Jan 23, 2023. It is now read-only.
[release/3.0] Fix up the set of Windows compatibility libraries exposed in WindowsDesktop - #7372
Closed
dagood wants to merge 7 commits into
Closed
[release/3.0] Fix up the set of Windows compatibility libraries exposed in WindowsDesktop#7372dagood wants to merge 7 commits into
dagood wants to merge 7 commits into
Conversation
ericstj
approved these changes
Jul 24, 2019
Member
|
Looks to me like something is still going wrong with fetching the platform manifest. Builds are failing because x86 isn't finding x64 manifest, and vice-versa. |
ericstj
reviewed
Jul 24, 2019
Includes making depproj respect OrderProjectReferences, so that the windowsdesktop.depproj can cleanly depend on the platform manifest from netcoreapp.depproj.
Member
Author
|
List diffs: https://gist.github.com/dagood/c13bf4309bab2a76da0d066f04840738 Same as last time, but:
|
Member
Author
|
Reference for the WinForms version of |
dagood
added a commit
that referenced
this pull request
Jul 26, 2019
…ed in WindowsDesktop (#7372) * Fix up compat libraries exposed in WindowsDesktop * Exclude System.IO.Pipes.AccessControl runtime * Keep System.Security.Permissions * Use PackageConflictPlatformManifests for exclusion * Update new versions to match current state * Fix assumption that other archs' manifests built * Better fix: one platform manifest for all Includes making depproj respect OrderProjectReferences, so that the windowsdesktop.depproj can cleanly depend on the platform manifest from netcoreapp.depproj. * Fix pre-merge TODO: sort dependencies and version props into main lists.
Member
Author
|
Merged by 5ebe419. (I resolved the TODOs in that commit.) |
This was referenced Jul 26, 2019
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Port of #7324 to
release/3.0. For https://github.com/dotnet/core-setup/issues/7290.The WindowsBase version issue is not a problem in
release/3.0. WindowsDesktop has:and NETCoreApp has:
After the port, a new error exposed an issue where
netcoreapp.depprojwas building forwin-x86, which doesn't match the set platform ,x64. Inmaster, this issue didn't result in an error, maybe because the Arcade SDK version is different. I think it probably caused undesired behavior that just wasn't as easy to see. To fix this, I changed howPlatformManifestProjectReferenceworks a bit:windowsdesktop.depprojbuildsnetcoreapp.depprojinside the RID-specific MSBuild call, the forcedRuntimeIdentifierprop causes thenetcoreapp.depprojbuild to fail.OrderProjectReference, which builds before the RID-specific package build, so the build runs with the defaultRuntimeIdentifierand it hits the MSBuild cache.