Skip to content

Switching to 4 part Windows versions #13272

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
3 commits merged into from
Sep 1, 2020
Merged

Switching to 4 part Windows versions #13272

3 commits merged into from
Sep 1, 2020

Conversation

@sfoslund
Copy link
Member

@sfoslund sfoslund commented Aug 31, 2020 •
edited
Loading

Fixes #13266

@dsplaisted
Copy link
Member

dsplaisted commented Aug 31, 2020

This should fix #13266

@sfoslund Can you make sure it covers all those cases, including parsing Windows as the TargetPlatformIdentifier from the TargetFramework even if TargetPlatformVersion is explicitly specified.

Also, as @wli3 mentioned, the logic to match to the KnownFrameworkReference may need to be updated to match with the right version for Microsoft.Windows.SDK.NET.Ref.

@sfoslund sfoslund mentioned this pull request Aug 31, 2020
Closed
@wli3
Copy link

wli3 commented Aug 31, 2020

@sfoslund I think

sdk/src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs

Line 187 in 5cb7e1f

public void When_TargetPlatformVersion_is_set_higher_than_10_It_can_reference_cswinrt_api()
will fail. Could you runt that locally and check? Or you need to wait for extra 3 hours for tests

@wli3
Copy link

wli3 commented Aug 31, 2020 •
edited
Loading

If it fails just delete it. It is mostly the same coverage of as https://github.com/dotnet/installer/blob/ceb129f3455383f01d78052999b8a6d6201be261/test/EndToEnd/GivenWindows50App.cs

@sfoslund
Copy link
Member Author

sfoslund commented Aug 31, 2020

@wli3 it actually seems to be passing locally

@wli3
Copy link

wli3 commented Aug 31, 2020

hmm.... it might fail on stage 0 update. Anyway, that's better

@wli3
Copy link

wli3 commented Aug 31, 2020

tests failed

@sfoslund sfoslund force-pushed the windowsVersionNums branch from f28b6e5 to 82569d2 Compare August 31, 2020 22:04
dsplaisted
dsplaisted approved these changes Sep 1, 2020
View reviewed changes
src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs
[InlineData(new[] { "1.0", "1.1" }, "ios", "1.1", new[] { "IOS", "IOS1_1", "IOS1_0" })]
[InlineData(new[] { "11.11", "12.12", "13.13" }, "android", "12.12", new[] { "ANDROID", "ANDROID11_11", "ANDROID12_12" })]
[InlineData(new string[] { /* Use the built in SdkSupportedTargetPlatform items */}, "windows", "10.0.19041", new[] { "WINDOWS", "WINDOWS7_0", "WINDOWS8_0", "WINDOWS10_0_17763", "WINDOWS10_0_18362", "WINDOWS10_0_19041" })]
[InlineData(new string[] { /* Use the built in SdkSupportedTargetPlatform items */}, "windows", "10.0.19041.0", new[] { "WINDOWS", "WINDOWS7_0", "WINDOWS8_0", "WINDOWS10_0_17763_0", "WINDOWS10_0_18362_0", "WINDOWS10_0_19041_0" })]
Copy link
Member

@dsplaisted dsplaisted Sep 1, 2020

Choose a reason for hiding this comment

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

Ugh. This is a side effect I didn't consider. I think we probably want these to be based on the 3 part version if the 4th part is 0.

@terrajobst thoughts?

Copy link

@wli3 wli3 Sep 1, 2020

Choose a reason for hiding this comment

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

Once we decide on 4 parts, everything should be 4 parts.

@sfoslund sfoslund added auto-merge Automatically merge PR once CI passes. Auto-Merge If Tests Pass labels Sep 1, 2020
@ghost
Copy link

ghost commented Sep 1, 2020

Hello @sfoslund!

Because this pull request has the Auto-Merge If Tests Pass label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 4a120da into dotnet:release/5.0.1xx Sep 1, 2020
@sfoslund sfoslund deleted the windowsVersionNums branch September 1, 2020 18:04
@sfoslund sfoslund mentioned this pull request Sep 8, 2020
Closed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dsplaisted dsplaisted dsplaisted approved these changes

@joeloff joeloff joeloff approved these changes

+1 more reviewer

@wli3 wli3 wli3 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Auto-Merge If Tests Pass auto-merge Automatically merge PR once CI passes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sfoslund @dsplaisted @wli3 @joeloff