Upgrade to .NET Framework 4.6.1, add .NET Core 3.0 target #219

hez2010 · 2019-10-22T09:34:10Z

Some tests failed due to float-point precision (Microsoft has upgrade their float-point number IEEE standard), please fixes them after merging this pull request.
.NET Framework 4.6.1 as minimal version is required to target both .NET Framework and .NET Core.
Only support Visual Studio 2019, because Visual Studio 2017 has no build target file for Sdk Microsoft.NET.Sdk.WindowsDesktop.

Closes New languages migration #208
Closes WPF support on .NET Core 3.0 #209
Closes Test failure in VS2019 #217

TODO (by @ForNeVeR)

Make sure the tests are green
Review the NuGet packaging instructions
Verify that Test failure in VS2019 #217 is really fixed in VS
Final review
Create new issues for the remaining TODOs

ForNeVeR · 2019-10-22T09:41:31Z

Wow, thanks a lot! I'll take a look at the changes tonight.

The issue with the number formatting in tests is known, we'll do something about it.

Deprecating VS2017 is okay, but I'm not so sure about deprecating older .NET Frameworks. Our current policy is to support all the framework versions supported by Microsoft (that means, starting with 4.5.2). I think we could make 4.5.2-compatibility mode non-default and somehow make it available only for CI builds. I'll try to invent something :)

hez2010 · 2019-10-22T09:45:45Z

.NET Framework 4.5.2 lacks the assembly System.Core, therefore there's no way to support both .NET Framework 4.5.2 and .NET Core at the same time.
However, I think you can create a new package for .NET Framework 4.5.2 only.

src/WpfMath/WpfMath.csproj

src/WpfMath.Tests/WpfMath.Tests.fsproj

hez2010 · 2019-10-22T15:30:09Z

BTW, I have upgraded the language version to C# 8 and F# 4.7, would you like to opt-in Nullable Reference Type? It may throw cause plenty of warnings at this timeframe, but all nullable related issues will go away once all these warning are resolved. @ForNeVeR

ForNeVeR · 2019-10-22T15:53:18Z

Yes I want to enable them (and generally all the new stuff, all of it! 😏), but let's restrict scope of this PR to .NET Core 3.0 only at the moment.

appveyor.yml

ForNeVeR

Alright, here's a checklist for me:

I don't like losing of compatibility with .NET 4.5.2; we aren't doing that. Probably we could implement a hacky solution (e.g. another csproj in the same directory, but based on the old project model)
Tests should definitely be green (but I'm okay if you omit netcoreapp3.0 tests for now)

ForNeVeR · 2019-10-22T16:07:25Z

I could take over this PR (and finish the remaining tasks) at any moment, please inform me after you've finished.

hez2010 · 2019-10-22T16:13:25Z

I've finished.

Tests should definitely be green (but I'm okay if you omit netcoreapp3.0 tests for now)

dotnet test will test both net461 and netcoreapp3.0 targets

ForNeVeR · 2019-10-22T16:14:29Z

Okay, could you please run script scripts/approve-all.ps1 after running the tests locally? It will copy the new test data so you could update it

hez2010 · 2019-10-22T16:18:36Z

Okay, could you please run script scripts/approve-all.ps1 after running the tests locally? It will copy the new test data so you could update it

Done via 5ae0b22

ForNeVeR · 2019-10-22T16:20:51Z

Ok, I'll fix the remaining now. Seems like the CI server still has troubles, I'll take a look.

Thanks a lot for your work!

hez2010 · 2019-10-22T16:23:01Z

Ok, I'll fix the remaining now. Seems like the CI server still has troubles, I'll take a look.

Thanks a lot for your work!

My local test result:

Microsoft (R) Test Execution Command Line Tool Version 16.3.0
Copyright (c) Microsoft Corporation.  All rights reserved.

Starting test execution, please wait...

A total of 1 test files matched the specified pattern.
cmd /c move /Y "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.wideItemInMatrixBox.received.txt" "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.wideItemInMatrixBox.approved.txt"
cmd /c move /Y "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.nestedMatrixBox.received.txt" "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.nestedMatrixBox.approved.txt"
  X WpfMath.Tests.BoxTests.wideItemInMatrixBox [116ms]
  Error Message:
   Assert.Equal() Failure
                                 ↓ (pos 45647)
Expected: ···": 4.2924428999999993,\r\n                      "Italic": 0.027···
Actual:   ···": 4.292442899999999,\r\n                      "Italic": 0.0277···
                                 ↑ (pos 45647)
  Stack Trace:
     at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertEqual(String approvedContent, String receivedContent)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertFileContents(String approved, String received)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Approvers.FileApprover.ReportFailure(IApprovalFailureReporter reporter)
   at ApprovalTests.Core.Approver.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer, IApprovalNamer namer, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer)
   at ApprovalTests.Approvals.Verify(String text, Func`2 scrubber)
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-1.Invoke(String arg00) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-2.Invoke(Object x) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.BoxTests.verifyBox(String source) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 97
   at WpfMath.Tests.BoxTests.wideItemInMatrixBox() in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 113
  X WpfMath.Tests.BoxTests.nestedMatrixBox [43ms]
  Error Message:
   Assert.Equal() Failure
                                 ↓ (pos 2331)
Expected: ···: 0.99444400000000011,\r\n          "TotalWidth": 0.500002,\r\n  ···
Actual:   ···: 0.9944440000000001,\r\n          "TotalWidth": 0.500002,\r\n   ···
                                 ↑ (pos 2331)
  Stack Trace:
     at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertEqual(String approvedContent, String receivedContent)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertFileContents(String approved, String received)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Approvers.FileApprover.ReportFailure(IApprovalFailureReporter reporter)
   at ApprovalTests.Core.Approver.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer, IApprovalNamer namer, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer)
   at ApprovalTests.Approvals.Verify(String text, Func`2 scrubber)
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-1.Invoke(String arg00) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-2.Invoke(Object x) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.BoxTests.verifyBox(String source) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 97
   at WpfMath.Tests.BoxTests.nestedMatrixBox() in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 109
cmd /c move /Y "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.casesBox.received.txt" "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.casesBox.approved.txt"
cmd /c move /Y "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.simpleMatrixBox.received.txt" "C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\TestResults\BoxTests.simpleMatrixBox.approved.txt"
  X WpfMath.Tests.BoxTests.casesBox [41ms]
  Error Message:
   Assert.Equal() Failure
                                 ↓ (pos 3217)
Expected: ···: 0.78055500000000011,\r\n              "TotalWidth": 0.52859,\r···
Actual:   ···: 0.7805550000000001,\r\n              "TotalWidth": 0.52859,\r\n···
                                 ↑ (pos 3217)
  Stack Trace:
     at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertEqual(String approvedContent, String receivedContent)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertFileContents(String approved, String received)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Approvers.FileApprover.ReportFailure(IApprovalFailureReporter reporter)
   at ApprovalTests.Core.Approver.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer, IApprovalNamer namer, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer)
   at ApprovalTests.Approvals.Verify(String text, Func`2 scrubber)
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-1.Invoke(String arg00) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-2.Invoke(Object x) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.BoxTests.verifyBox(String source) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 97
   at WpfMath.Tests.BoxTests.casesBox() in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 105
  X WpfMath.Tests.BoxTests.simpleMatrixBox [38ms]
  Error Message:
   Assert.Equal() Failure
                                 ↓ (pos 3594)
Expected: ···: 0.99444400000000011,\r\n              "TotalWidth": 0.500002,···
Actual:   ···: 0.9944440000000001,\r\n              "TotalWidth": 0.500002,\r···
                                 ↑ (pos 3594)
  Stack Trace:
     at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertEqual(String approvedContent, String receivedContent)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.AssertFileContents(String approved, String received)
   at ApprovalTests.Reporters.TestFrameworks.AssertReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Reporters.FirstWorkingReporter.Report(String approved, String received)
   at ApprovalTests.Approvers.FileApprover.ReportFailure(IApprovalFailureReporter reporter)
   at ApprovalTests.Core.Approver.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalApprover approver, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer, IApprovalNamer namer, IApprovalFailureReporter reporter)
   at ApprovalTests.Approvals.Verify(IApprovalWriter writer)
   at ApprovalTests.Approvals.Verify(String text, Func`2 scrubber)
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-1.Invoke(String arg00) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.ApprovalTestUtils.verifyObject@55-2.Invoke(Object x) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\ApprovalTestUtils.fs:line 55
   at WpfMath.Tests.BoxTests.verifyBox(String source) in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 97
   at WpfMath.Tests.BoxTests.simpleMatrixBox() in C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\BoxTests.fs:line 101

Total tests: 164
     Passed: 160
     Failed: 4
 Total time: 5.7043 Seconds
Test run for C:\Users\hez20\source\repos\wpf-math\src\WpfMath.Tests\bin\Debug\net461\WpfMath.Tests.dll(.NETFramework,Version=v4.6.1)
Microsoft (R) Test Execution Command Line Tool Version 16.3.0
Copyright (c) Microsoft Corporation.  All rights reserved.

Starting test execution, please wait...

A total of 1 test files matched the specified pattern.

Test Run Successful.
Total tests: 164
     Passed: 164
 Total time: 5.5285 Seconds

All tests for net461 have passed, but not for netcoreapp3.0

src/WpfMath.Tests/WpfMath.Tests.fsproj

…208)

The project won't build on .NET Core 3.0 SDK because the F# compiler there is slightly outdated and won't build a code fragment `member private _.`

ForNeVeR · 2019-12-08T19:21:38Z

This PR was superseded by #228. Thanks for your work, I'll make sure to preserve your contribution and your name on the commits.

If target framework is less than .NET 4.6.1, System.Tuple is used instead of System.ValueTuple : - dotnet/sdk#3770 - y-iihoshi/ThScoreFileConverter#22 - ForNeVeR/xaml-math#219

Add conditional code to use Tuple instead of ValueTuple If target framework is less than .NET 4.6.1, System.Tuple is used instead of System.ValueTuple : * dotnet/sdk#3770 * y-iihoshi/ThScoreFileConverter#22 * ForNeVeR/xaml-math#219

Upgrade to .NET Framework 4.6.1, add .NET Core 3.0 target

d895412

ForNeVeR self-requested a review October 22, 2019 09:37

hez2010 mentioned this pull request Oct 22, 2019

WPF support on .NET Core 3.0 #209

Closed

ForNeVeR reviewed Oct 22, 2019

View reviewed changes

src/WpfMath/WpfMath.csproj Outdated Show resolved Hide resolved

src/WpfMath/WpfMath.csproj Outdated Show resolved Hide resolved

src/WpfMath.Tests/WpfMath.Tests.fsproj Show resolved Hide resolved

ForNeVeR assigned hez2010 Oct 22, 2019

Add FSharp.Core.Fluent back

a08a4e8

Drop support for Visual Studio 2017, add .NET Core 3.0 tests

9fb4b9f

ForNeVeR reviewed Oct 22, 2019

View reviewed changes

appveyor.yml Outdated Show resolved Hide resolved

Use dotnet cli for build and test

cf4f356

ForNeVeR reviewed Oct 22, 2019

View reviewed changes

appveyor.yml Outdated Show resolved Hide resolved

ForNeVeR requested changes Oct 22, 2019

View reviewed changes

Use debug build to prevent methods being inlined in tests

ace9c35

Update test data

5ae0b22

ForNeVeR assigned ForNeVeR and unassigned hez2010 Oct 22, 2019

ForNeVeR reviewed Oct 22, 2019

View reviewed changes

src/WpfMath.Tests/WpfMath.Tests.fsproj Outdated Show resolved Hide resolved

ForNeVeR added 4 commits December 8, 2019 21:14

Remove the LangVersion for an F# project because of a bug in the SDK (#…

3be93a2

…208)

Compile for .NET 4.5.2 as well as for .NET Core 3.0 (#209)

0edc6b4

Migrate to F# 4.7, state requirement for .NET Core 3.1 SDK (#208)

6bc54b6

The project won't build on .NET Core 3.0 SDK because the F# compiler there is slightly outdated and won't build a code fragment `member private _.`

Custom double formatting to overcome minor framework differences (#217)

309f12b

Install the .NET Core 3.1 SDK on Appveyor (#209)

6ce76e8

ForNeVeR mentioned this pull request Dec 8, 2019

WPF support for .NET Core 3.0 #228

Merged

7 tasks

ForNeVeR closed this Dec 8, 2019

GuillaumeLebeau mentioned this pull request Jan 9, 2020

Remove System.ValueTuple dependency AgileoAutomation/UnitsNet#16

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to .NET Framework 4.6.1, add .NET Core 3.0 target #219

Upgrade to .NET Framework 4.6.1, add .NET Core 3.0 target #219

hez2010 commented Oct 22, 2019 •

edited by ForNeVeR

Loading

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019 •

edited

Loading

hez2010 commented Oct 22, 2019 •

edited

Loading

ForNeVeR commented Oct 22, 2019

ForNeVeR left a comment •

edited

Loading

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019 •

edited

Loading

ForNeVeR commented Dec 8, 2019

Upgrade to .NET Framework 4.6.1, add .NET Core 3.0 target #219

Upgrade to .NET Framework 4.6.1, add .NET Core 3.0 target #219

Conversation

hez2010 commented Oct 22, 2019 • edited by ForNeVeR Loading

TODO (by @ForNeVeR)

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019 • edited Loading

hez2010 commented Oct 22, 2019 • edited Loading

ForNeVeR commented Oct 22, 2019

ForNeVeR left a comment • edited Loading

Choose a reason for hiding this comment

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019

ForNeVeR commented Oct 22, 2019

hez2010 commented Oct 22, 2019 • edited Loading

ForNeVeR commented Dec 8, 2019

hez2010 commented Oct 22, 2019 •

edited by ForNeVeR

Loading

hez2010 commented Oct 22, 2019 •

edited

Loading

hez2010 commented Oct 22, 2019 •

edited

Loading

ForNeVeR left a comment •

edited

Loading

hez2010 commented Oct 22, 2019 •

edited

Loading