Migrate WindowsDesktop code from dotnet/core-setup to dotnet/windowsdesktop#1
Merged
Migrate WindowsDesktop code from dotnet/core-setup to dotnet/windowsdesktop#1
Conversation
This is a squashed mix of changes that make the infra use the new sharedfx tooling SDK, trim out obviously unnecessary code, and build bits that seem to work. Unfortunately, this does contain a few segments that are copied from Core-Setup. Because the directory structure of this repo is different, some files don't exist, so the contents had to move to an existing file.
Member
Author
|
Added a couple of publish fixes from official build testing. |
MichaelSimons
approved these changes
Oct 3, 2019
Member
MichaelSimons
left a comment
There was a problem hiding this comment.
LGTM - I just have a few minor comments.
Member
Author
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Copies the code producing the Microsoft.WindowsDesktop.App shared framework from Core-Setup to the WindowsDesktop repo. For https://github.com/dotnet/core-setup/issues/5732.
Known non-blocking issues:
Fix package validation (reference closure check) to work with nonlocal NETCoreApp #3:
windowsdesktop/pkg/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
Lines 20 to 27 in 6c6432c
The [...].versions.txt file in the NuGet packages says the commit comes from core-setup #4: The
Microsoft.WindowsDesktop.App.versions.txtfiles in the nupkgs saycore-setup <commit hash>. This is defined in the sfx tooling SDK, missed it.Remove leftover code after the migration from the Core-Setup repo #5: Unnecessary code. There are dependencies in
Version.Details.props, andVersions.propsthat aren't used, to start with. There are references to non-Windows platforms that aren't applicable in this repo. I removed a little of this, but there's a decent amount left.Code that should be shared in the shared framework tooling SDK, but isn't. This can be added over time, however there are also plans to make a good version of this SDK anyway that repos like ASP.NET Core could share. https://github.com/dotnet/core-setup/issues/4787 may track this from the Core-Setup side, but there's a possibility Create targets and tasks for authoring a shared framework arcade#2704 obviates it.
Next steps are to get the official build running, plugged into BAR, and change Core-SDK to consume this repo's outputs rather than Core-Setup. Then Core-Setup should be able to remove its WindowsDesktop build and dependencies.
I tried to split the commits up to highlight interesting changes. The last one has the change to the shared framework tooling SDK and fixes to make everything work.
/cc @jaredpar @vatsan-madhavan @zsd4yr