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.

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

Update TFM and references #145

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update TFM and references #145

wants to merge 3 commits into from

Conversation

kingcean
Copy link
Contributor

@kingcean kingcean commented Dec 13, 2024

Summary

The major changes are about the WinUI 3 components library of DiffPlex (named DiffPlex.Windows).

  • Add .NET 8/9 supports
  • Update Windows App SDK references
  • Add access key
  • Update icon

Nuget package and binaries

References

WinUI 3 components library, WPF components library and their demo projects now target latest .NET.

DiffPlex.Windows

TFM (.NET version) Change state
net9.0-windows10.0.17763.0 Add
net9.0-windows10.0.19041.0 Add
net9.0-windows10.0.22000.0 Add
net9.0-windows10.0.22621.0 Add
net8.0-windows10.0.17763.0 Add
net8.0-windows10.0.19041.0 Add
net8.0-windows10.0.22000.0 Add
net8.0-windows10.0.22621.0 Add
net6.0-windows10.0.17763.0 Remove
net6.0-windows10.0.19041.0 Remove
net6.0-windows10.0.22000.0 Remove
net7.0-windows10.0.17763.0 Remove
net7.0-windows10.0.19041.0 Remove
net7.0-windows10.0.22000.0 Remove

The package version of Windows App SDK has been also up to date.

Windows App SDK Change state
1.6.3 (241114003) Add
1.4.3 (231115000) Remove

DiffPlex.App

TFM (.NET version) Change state
net9.0-windows10.0.19041.0 Add
net7.0-windows10.0.19041.0 Remove

DiffPlex.Wpf

TFM (.NET version) Change state
net9.0-windows Add
net8.0-windows Add
net6.0-windows Keep / Unchanged
net48 Keep / Unchanged
net46 Keep / Unchanged

DiffPlex.Wpf.Demo

TFM (.NET version) Change state
net9.0-windows Add
net8.0-windows Add
net6.0-windows Remove
net48 Keep / Unchanged
net46 Add

DiffPlex.WindowsFomrs.Demo

TFM (.NET version) Change state
net8.0-windows Add
net6.0-windows Remove
net48 Add
net46 Keep / Unchanged

Updates

This PR comes out together with a little feature updates and fixes by the way.

Access key supports

screenshot 2024-12-13 132400

Add hotkeys for app bar buttons, e.g. following table.

Command Hotkey
Previous diff Alt + P
Next diff Alt + N
Go to line Alt + G
View menu Alt + V

Press Alt to see more.

Fixes

  • Fix the warning about default resource en-US is missed in DiffPlex.App
  • Fix an issue that the lines after the last diff cannot be collapsed

Icon

The logo has updated with pure sense of design.

Design history and evolution

Version Icon Design description
v1 (old) DiffPlex_v1 Abstract of a diff window
v2 (before this PR) DiffPlex_v2 Simplify the concept and enable fluent design
v3 - candidate 1 DiffPlex_v3_c1 Reconcile the colors - put the emphasis on theme color and fit it in the red and green bar
v3 - candidate 2 DiffPlex_v3_c2 Simplify the colors - merge blue and green
v3 (final in this PR) DiffPlex_v3 Unify the colors

Reality effect

The new icon in Start Menu, desktop and task bar looks like below.

Screenshot 2024-12-16 233859

Theme color

569cd6 rgb(86, 156, 214)

Use the family (similar) color of #569cd6 as the theme of icon.
The color is the foreground (text color) of C# keyword (e.g. namespace and public sealed partial class) in dark mode in Visual Studio text editor.

screenshot 2024-12-13 131900

@kingcean
Copy link
Contributor Author

Hi @mmanela could you please help to have a look of the check failure (.NET SDK not found)?

@mmanela
Copy link
Owner

mmanela commented Dec 20, 2024

@kingcean You need to update .github/workflows/dotnet.yml to include or switch to dotnet9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants