Skip to content
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.

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

Update WPF to build against newest released version of the SDK (.NET 6.0 Preview1) #4123

Merged
merged 12 commits into from
Feb 3, 2021

Conversation

ryalanms
Copy link
Member

@ryalanms ryalanms commented Feb 2, 2021

WinForms is now building against .NET 6.0 Preview 1, and WPF cannot take WinForms updates until moving to 6.0.

Update WPF to build against newest released version of the SDK (.NET 6.0 Preview1). WPF was on 5.0.100.

Fixes #4122.

@ryalanms ryalanms requested a review from a team as a code owner February 2, 2021 03:33
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Feb 2, 2021
@ghost ghost requested review from fabiant3 and SamBent February 2, 2021 03:33
@ryalanms
Copy link
Member Author

ryalanms commented Feb 2, 2021

This will require one more update for platform compatibility validation. Attributes need to be added in a few more files.

@lindexi
Copy link
Member

lindexi commented Feb 3, 2021

Do the following documents also need to be changed?

  • Documentation/projects-and-assemblies.md
  • eng\WpfArcadeSdk\tools\ReferenceAssembly.targets Line:55
  • eng\WpfArcadeSdk\tools\SdkReferences.targets Line:205,208
  • packaging\Microsoft.DotNet.Arcade.Wpf.Sdk\Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj Line:4
  • packaging\Microsoft.DotNet.Wpf.GitHub\Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj Line:4
  • packaging\Microsoft.DotNet.Wpf.GitHub\Microsoft.DotNet.Wpf.GitHub.csproj Line:4
  • packaging\Microsoft.Dotnet.Wpf.ProjectTemplates\content\WpfApplication-CSharp.template.config\template.json Line:40
  • packaging\Microsoft.Dotnet.Wpf.ProjectTemplates\content\WpfApplication-VisualBasic.template.config\template.json Line:40
  • packaging\Microsoft.Dotnet.Wpf.ProjectTemplates\Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj Line:4
  • packaging\Microsoft.NET.Sdk.WindowsDesktop\Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj Line:4
  • packaging\Microsoft.NET.Sdk.WindowsDesktop\Sdk\Sdk.props Line:20

@ryalanms
Copy link
Member Author

ryalanms commented Feb 3, 2021

@lindexi: Yes, there are some paths that need to remain the same for the winforms package reference.

@ryalanms ryalanms merged commit 08d4776 into master Feb 3, 2021
@vishalmsft vishalmsft deleted the update.sdk.to.6.0.preview1 branch February 10, 2022 06:03
@ghost ghost locked as resolved and limited conversation to collaborators Apr 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WinForms is now building against .NET 6.0 Preview 1. WPF cannot take WinForms updates until moving to 6.0.
2 participants