Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Remove WindowsDesktop from Core-Setup, now dotnet/windowsdesktop#8494

Merged
dagood merged 3 commits intodotnet:masterfrom
dagood:rm-wd
Oct 7, 2019
Merged

Remove WindowsDesktop from Core-Setup, now dotnet/windowsdesktop#8494
dagood merged 3 commits intodotnet:masterfrom
dagood:rm-wd

Conversation

@dagood
Copy link
Member

@dagood dagood commented Oct 7, 2019

This shared framework will now be produced from dotnet/windowsdesktop instead of this repo. https://github.com/dotnet/core-setup/issues/5732.

The removed files here were already copied over by dotnet/windowsdesktop#1.

I have an example Core-SDK PR to change where it gets the WD sharedfx from from over at dotnet/installer#5161.

@dagood dagood requested a review from MichaelSimons October 7, 2019 17:19
@dagood dagood self-assigned this Oct 7, 2019
Copy link
Member

@MichaelSimons MichaelSimons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a quick search on WindowsDesktop across the repo. There are a few references that I'm curious if they are still needed. For the most part they seem benign but would make sense to cleanup.

  1. https://github.com/dotnet/core-setup/blob/6f12a57e3c1a5e0bc592745b2648b041819ae4ed/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs
  2. <!-- The following is necessary to crossgen WindowsDesktop. For NETCoreApp it's automatic because we're crossgenning CoreFX bits. -->

    etc...

@dagood
Copy link
Member Author

dagood commented Oct 7, 2019

https://github.com/dotnet/core-setup/blob/6f12a57e3c1a5e0bc592745b2648b041819ae4ed/src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs

Already deleted this with the second commit. 😄 4178fd8 Leaving this in actually causes a failure, as it should.

core-setup/src/pkg/packaging-tools/framework.dependency.targets

This file will be deleted when I switch Core-Setup to the tooling package, no need to clean up refs in that dir. https://github.com/dotnet/core-setup/issues/4787

@dagood dagood merged commit 5f54f88 into dotnet:master Oct 7, 2019
@dagood dagood deleted the rm-wd branch October 7, 2019 22:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants