Using lfmerge .NET6

[josephmyers]

Description

Upgrades LfMerge to .NET6

Fixes #1297

Type of Change

• Refactor

Testing on your branch

Please describe how to test and/or verify your changes. Provide instructions so we can reproduce. Please also provide relevant test data as necessary. These instructions will be used for QA testing below.

• Test A
• Test B

Local changes:

• Open a test project
• Make a change
• Settings -> Synchronize -> Send/Receive

Local and remote changes:

• Open a test project in LF and the same project in FieldWorks
• Change an entry in FW and S/R to Language Depot or wherever
• Change an entry in LF
• Settings -> Synchronize -> Send/Receive
• Verify both changes appear in LF

Checklist

• I have performed a self-review of my own code
• I have reviewed the title/description of this PR which will be used as the squashed PR commit message
• I have commented my code, particularly in hard-to-understand areas
• I have added tests that prove my fix is effective or that my feature works

qa.languageforge.org testing

Reviewers: add/replace your name below and check the box to sign-off/attest the feature works as expected on qa.languageforge.org

• Joseph (2022-09-23 13:56)
• Reviewer2 (YYYY-MM-DD HH:MM)

[github-actions]

Unit Test Results

368 tests   368 ✔️  11s ⏱️
    1 suites      0 💤
    1 files        0 ❌

Results for commit f65b0da.

[megahirt]

LGTM - this is what we've been working toward!