Skip to content

Remove WinForms/WPF BlazorWebView controls #33410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Jun 10, 2021
Merged

Remove WinForms/WPF BlazorWebView controls #33410

merged 4 commits into from
Jun 10, 2021

Conversation

Eilon
Copy link
Contributor

@Eilon Eilon commented Jun 9, 2021

They are now in the dotnet/maui repo: dotnet/maui#1199

@Eilon
Remove WinForms/WPF BlazorWebView controls
b6a788a 
They are now in the dotnet/maui repo.
@Eilon Eilon requested review from dougbu, Pilchie and a team as code owners June 9, 2021 18:53
@SteveSandersonMS SteveSandersonMS mentioned this pull request Jun 9, 2021
Merged
SteveSandersonMS
SteveSandersonMS reviewed Jun 9, 2021
View reviewed changes
eng/ProjectReferences.props Outdated
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" ProjectPath="$(RepoRoot)src\Components\WebView\Platforms\WindowsForms\src\Microsoft.AspNetCore.Components.WebView.WindowsForms.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebView.Wpf" ProjectPath="$(RepoRoot)src\Components\WebView\Platforms\Wpf\src\Microsoft.AspNetCore.Components.WebView.Wpf.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebView" ProjectPath="$(RepoRoot)src\Components\WebView\WebView\src\Microsoft.AspNetCore.Components.WebView.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebView" ProjectPath="$(RepoRoot)src\Components\WebView\src\Microsoft.AspNetCore.Components.WebView.csproj" />
Copy link
Member

Choose a reason for hiding this comment

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

Would it be OK to leave this where it was so we can still have other platforms?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Restored.

SteveSandersonMS
SteveSandersonMS approved these changes Jun 9, 2021
View reviewed changes
Copy link
Member

@SteveSandersonMS SteveSandersonMS left a comment

Choose a reason for hiding this comment

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

Other than my request to not move the src project, this all looks good!

I mean, really it actually looks awful because you're killing all our beautiful code, it's a total bloodbath - our babies! - but I'll get counselling and carry on.

@Eilon
Copy link
Contributor Author

Eilon commented Jun 9, 2021

@dotnet/aspnet-build - how do I fix this build failure?

Found changes in 3 API baseline files
##[error]Detected modification to baseline API files. PublicAPI.Shipped.txt files should only be updated after a major release. See /docs/APIBaselines.md for more information.
error : Detected modification to baseline API files. PublicAPI.Shipped.txt files should only be updated after a major release. See /docs/APIBaselines.md for more information.
##[error]Modified API baseline files:
error : Modified API baseline files:
##[error]src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt
error : src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt
##[error]src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt
error : src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt
##[error]src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt
error : src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt

Summary:

   5 error(s)

error : Detected modification to baseline API files. PublicAPI.Shipped.txt files should only be updated after a major release. See /docs/APIBaselines.md for more information.
error : Modified API baseline files:
error : src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt
error : src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt
error : src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt

I am deleting projects that never shipped RTM. They did ship as preview, but they are being deleted from here because they moved to another repo.

@wtgodbe
Copy link
Member

wtgodbe commented Jun 9, 2021

If the only failure is that one in code-check, one of us can just use our admin privileges to merge this for you.

@Eilon
Copy link
Contributor Author

Eilon commented Jun 9, 2021

@wtgodbe - thanks! I still have some work in this PR so I'll let you know when it gets to that point.

@dougbu
Copy link
Contributor

dougbu commented Jun 9, 2021

@Eilon please also remove the now-useless block at https://github.com/dotnet/aspnetcore/blob/main/eng/Build.props#L46-L54

TanayParikh
TanayParikh reviewed Jun 9, 2021
View reviewed changes
AspNetCore.sln
Comment on lines -3 to +4
# Visual Studio Version 17
VisualStudioVersion = 17.0.31324.12
# Visual Studio Version 16
VisualStudioVersion = 16.0.31320.298
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have unintentionally not yet installed VS17. But I will do that soon. I assume this header flip-flops all the time anyway?

@Eilon
Copy link
Contributor Author

Eilon commented Jun 9, 2021

@SteveSandersonMS the folder structure is restored, so this is a more clean removal now.

@Eilon
Copy link
Contributor Author

Eilon commented Jun 10, 2021

@wtgodbe - can you super-admin merge this PR now? The code is done and it's signed off.

@wtgodbe wtgodbe merged commit 2cd96fe into main Jun 10, 2021
@wtgodbe wtgodbe deleted the eilon/remove-windows branch June 10, 2021 16:11
@ghost ghost added this to the 6.0-preview6 milestone Jun 10, 2021
@Eilon Eilon mentioned this pull request Jun 10, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TanayParikh TanayParikh TanayParikh left review comments

@SteveSandersonMS SteveSandersonMS SteveSandersonMS approved these changes

@javiercn javiercn Awaiting requested review from javiercn

@dougbu dougbu Awaiting requested review from dougbu

@Pilchie Pilchie Awaiting requested review from Pilchie

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
6.0-preview6
Development

Successfully merging this pull request may close these issues.
5 participants
@Eilon @wtgodbe @dougbu @SteveSandersonMS @TanayParikh