Change TFM version to net7.0 by singhashish-wpf · Pull Request #5901 · dotnet/wpf

singhashish-wpf · 2022-01-03T11:39:41Z

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

dreddy-work

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.

dreddy-work · 2022-01-04T18:21:19Z

global.json

-        "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
-      ]
+    "tools": {
+        "dotnet": "7.0.100-alpha.1.21620.6",


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

ThomasGoulet73 · 2022-01-04T20:04:59Z

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

RussKie · 2022-01-04T23:35:43Z

The CI build can't find Windows Forms transport package: https://dev.azure.com/dnceng/public/_build/results?buildId=1532571&view=logs&j=f31845fc-af98-5c98-dbe9-1689ca1e1c28&t=24f32833-5885-5ad1-a6e7-070c33f7fc08&l=179 This package contains our analysers and MSBuild targets. It's produced and published during our build leg. Please check the required version exists on the required feeds. Try running build/pack locally and see if you can replicate the issue.

…

________________________________ From: ThomasGoulet73 ***@***.***> Sent: Wednesday, 5 January 2022 7:05 AM To: dotnet/wpf ***@***.***> Cc: Igor Velikorossov ***@***.***>; Mention ***@***.***> Subject: Re: [dotnet/wpf] Change TFM version to net7.0 (PR #5901) Updating https://github.com/singhashish-wpf/wpf/blob/tfm7.0change/eng/WpfArcadeSdk/tools/SdkReferences.targets#L9<https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fsinghashish-wpf%2Fwpf%2Fblob%2Ftfm7.0change%2Feng%2FWpfArcadeSdk%2Ftools%2FSdkReferences.targets%23L9&data=04%7C01%7Cigor.velikorossov%40microsoft.com%7Cf643039cd0dd44a60b9008d9cfbd83bb%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637769235148042876%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=OTljNcGVJZAaTUnbdF8lJUre4gKvcZrh%2BXNvOiW5RIk%3D&reserved=0> should fix the build error. It's missing Or '$(TargetFrameworkVersion)' == '7.0'. — Reply to this email directly, view it on GitHub<https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fdotnet%2Fwpf%2Fpull%2F5901%23issuecomment-1005131763&data=04%7C01%7Cigor.velikorossov%40microsoft.com%7Cf643039cd0dd44a60b9008d9cfbd83bb%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637769235148042876%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=HpllwlHKpsFAfBgaqpPxPPAFsq93yGHfywJaDD1WOzE%3D&reserved=0>, or unsubscribe<https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FABBTEXTP5XNEJIVHGQZ4SLTUUNHHPANCNFSM5LFBXOGA&data=04%7C01%7Cigor.velikorossov%40microsoft.com%7Cf643039cd0dd44a60b9008d9cfbd83bb%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637769235148042876%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=TQWW%2FMPDcnYDzRQ6b2Xs%2FpxgCvQqUKfmHR12c6b2Ljw%3D&reserved=0>. You are receiving this because you were mentioned.Message ID: ***@***.***>

ThomasGoulet73 · 2022-01-05T05:56:58Z

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).

This reverts commit 9fcd2a2.

singhashish-wpf · 2022-01-06T08:49:21Z

@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 · 2022-01-06T14:05:57Z

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

eng/WpfArcadeSdk/tools/SdkReferences.targets

dreddy-work

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

Change TFM version to net7.0

b5ae6f3

singhashish-wpf requested a review from a team as a code owner January 3, 2022 11:39

ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Jan 3, 2022

ghost requested review from SamBent, fabiant3 and ryalanms January 3, 2022 11:39

dreddy-work reviewed Jan 4, 2022

View reviewed changes

dreddy-work mentioned this pull request Jan 4, 2022

[main] Update dependencies from dotnet/winforms #5908

Merged

Update SDK reference Targets:

9fcd2a2

ThomasGoulet73 mentioned this pull request Jan 5, 2022

Use builtin MSBuild functions to compare versions #5910

Merged

singhashish-wpf added 2 commits January 5, 2022 16:08

Revert "Update SDK reference Targets:"

ecf81d2

This reverts commit 9fcd2a2.

update sdk/tools version to be in sync with winforms

fef8042

Include winforms for net7.0

0def49a

ThomasGoulet73 reviewed Jan 6, 2022

View reviewed changes

eng/WpfArcadeSdk/tools/SdkReferences.targets Outdated Show resolved Hide resolved

update fallback to 6.0

c56b5bb

singhashish-wpf requested review from dipeshmsft and vishalmsft January 7, 2022 05:20

dreddy-work approved these changes Jan 7, 2022

View reviewed changes

vishalmsft approved these changes Jan 7, 2022

View reviewed changes

singhashish-wpf merged commit fbaaa43 into dotnet:main Jan 7, 2022

singhashish-wpf mentioned this pull request Jan 21, 2022

Fix dlls not generated in native directory #5974

Merged

singhashish-wpf self-assigned this Feb 25, 2022

ghost locked as resolved and limited conversation to collaborators Apr 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change TFM version to net7.0#5901

Change TFM version to net7.0#5901
singhashish-wpf merged 6 commits intodotnet:mainfrom
singhashish-wpf:tfm7.0change

singhashish-wpf commented Jan 3, 2022

Uh oh!

dreddy-work left a comment

Uh oh!

dreddy-work Jan 4, 2022

Uh oh!

ThomasGoulet73 commented Jan 4, 2022 •

edited

Loading

Uh oh!

RussKie commented Jan 4, 2022 via email

Uh oh!

ThomasGoulet73 commented Jan 5, 2022 •

edited

Loading

Uh oh!

singhashish-wpf commented Jan 6, 2022

Uh oh!

ThomasGoulet73 commented Jan 6, 2022

Uh oh!

Uh oh!

dreddy-work left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

singhashish-wpf commented Jan 3, 2022

Description

Customer Impact

Regression

Testing

Risk

Uh oh!

dreddy-work left a comment

Choose a reason for hiding this comment

Uh oh!

dreddy-work Jan 4, 2022

Choose a reason for hiding this comment

Uh oh!

ThomasGoulet73 commented Jan 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RussKie commented Jan 4, 2022 via email

Uh oh!

ThomasGoulet73 commented Jan 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

singhashish-wpf commented Jan 6, 2022

Uh oh!

ThomasGoulet73 commented Jan 6, 2022

Uh oh!

Uh oh!

dreddy-work left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ThomasGoulet73 commented Jan 4, 2022 •

edited

Loading

ThomasGoulet73 commented Jan 5, 2022 •

edited

Loading