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.

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

Change TFM version to net7.0 #5901

Merged
merged 6 commits into from
Jan 7, 2022
Merged

Change TFM version to net7.0 #5901

merged 6 commits into from
Jan 7, 2022

Conversation

singhashish-wpf
Copy link
Member

Fixes #5801

Main PR

Description

Change Target Framework Version to net7.0 and move TargetFramework to Directory.Build.Props.

Customer Impact

None

Regression

None

Testing

CI Build

Risk

None

@singhashish-wpf singhashish-wpf requested a review from a team as a code owner January 3, 2022 11:39
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Jan 3, 2022
@ghost ghost requested review from fabiant3, ryalanms and SamBent January 3, 2022 11:39
dreddy-work
dreddy-work reviewed Jan 4, 2022
View reviewed changes
Copy link
Member

@dreddy-work dreddy-work left a comment

Choose a reason for hiding this comment

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

Failures seems to be with the flow defined in this: #4605. I yet to understand this flow and meanwhile, adding the owner @RussKie if he gets a chance ( he is on vacation now ). Otherwise, I will take a look again sometime this week to understand why thos eimports or props missing.

global.json Outdated
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
]
"tools": {
"dotnet": "7.0.100-alpha.1.21620.6",
Copy link
Member

Choose a reason for hiding this comment

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

go with 7.0.100-alpha.1.22053.1 . an updated one available and winforms adapted this. So we can be in sync.

@ThomasGoulet73
Copy link
Contributor

ThomasGoulet73 commented Jan 4, 2022 •
edited
Loading

Updating https://github.com/singhashish-wpf/wpf/blob/tfm7.0change/eng/WpfArcadeSdk/tools/SdkReferences.targets#L9 should fix the build error. It's missing Or '$(TargetFrameworkVersion)' == 'v7.0' which prevents Microsoft.Private.Winforms from being imported.

EDIT:
Turns out that there is a couple more changes necessary. I created a patch that you can apply if you want: https://gist.github.com/ThomasGoulet73/65ed09f88e4a985d816882ad6f31184a

@dreddy-work dreddy-work mentioned this pull request Jan 4, 2022
Merged
@RussKie
Copy link
Member

RussKie commented Jan 4, 2022 via email

@ThomasGoulet73 ThomasGoulet73 mentioned this pull request Jan 5, 2022
Merged
@ThomasGoulet73
Copy link
Contributor

ThomasGoulet73 commented Jan 5, 2022 •
edited
Loading

I opened #5910 which would reduce the diff if it's merged before this PR (Removes the need to update some changes in SdkReferences.targets and a couple other files).

@singhashish-wpf
Copy link
Member Author

@RussKie @dreddy-work
This is also failing locally, with the accessibility related errors, this is from the winforms private package. I see that the is already present in the corresponding csproj files.
Do we have anything more to be modified from WPF side to import it properly?

@ThomasGoulet73
Copy link
Contributor

@singhashish-wpf These changes are still necessary after #5910: 9fcd2a2#diff-81ead0bf7ccc56bf258c3cdbe1031c8a0b16b9894256e8a67d5999fa680e5869L205-R208

dreddy-work
dreddy-work approved these changes Jan 7, 2022
View reviewed changes
Copy link
Member

@dreddy-work dreddy-work left a comment

Choose a reason for hiding this comment

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

LGTM. lets get this propagated and unblock winfomrs to verify further.

@singhashish-wpf singhashish-wpf merged commit fbaaa43 into dotnet:main Jan 7, 2022
@singhashish-wpf singhashish-wpf mentioned this pull request Jan 21, 2022
Merged
@singhashish-wpf singhashish-wpf self-assigned this Feb 25, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Apr 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ThomasGoulet73 ThomasGoulet73 ThomasGoulet73 left review comments

@dreddy-work dreddy-work dreddy-work approved these changes

@vishalmsft vishalmsft vishalmsft approved these changes

@fabiant3 fabiant3 Awaiting requested review from fabiant3

@ryalanms ryalanms Awaiting requested review from ryalanms

@SamBent SamBent Awaiting requested review from SamBent

@dipeshmsft dipeshmsft Awaiting requested review from dipeshmsft

Assignees

@singhashish-wpf singhashish-wpf

Labels
PR metadata: Label to tag PRs, to facilitate with triage
Projects
No open projects
WPF .NET7
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Switch to net7.0 tfm
5 participants
@singhashish-wpf @ThomasGoulet73 @RussKie @dreddy-work @vishalmsft