From 4efe897ab2fc2d213b4ae3443b166d58839a5af6 Mon Sep 17 00:00:00 2001 From: Zhe Fang Date: Sun, 11 Jan 2026 09:47:27 -0500 Subject: [PATCH] chores: remove unnecessary packages for RomajiConverter.Core --- BetterLyrics.Core/BetterLyrics.Core.csproj | 13 +- .../BetterLyrics.Plugins.Demo.csproj | 16 +- .../BetterLyrics.Plugins.Romaji.csproj | 197 ++++++++------- BetterLyrics.Plugins.Romaji/RomajiPlugin.cs | 2 +- .../Package.appxmanifest | 2 +- .../Controls/PlaybackSettingsControl.xaml | 24 -- .../Controls/PluginManagerControl.xaml.cs | 8 +- .../Models/Settings/TranslationSettings.cs | 1 - .../Services/GSMTCService/GSMTCService.cs | 4 - .../PluginService/PluginLoadContext.cs | 24 +- .../Services/PluginService/PluginService.cs | 69 ++--- .../Strings/ar/Resources.resw | 6 +- .../Strings/de/Resources.resw | 6 +- .../Strings/en/Resources.resw | 6 +- .../Strings/es/Resources.resw | 6 +- .../Strings/fr/Resources.resw | 6 +- .../Strings/hi/Resources.resw | 6 +- .../Strings/id/Resources.resw | 6 +- .../Strings/ja/Resources.resw | 6 +- .../Strings/ko/Resources.resw | 6 +- .../Strings/ms/Resources.resw | 6 +- .../Strings/pt/Resources.resw | 6 +- .../Strings/ru/Resources.resw | 6 +- .../Strings/th/Resources.resw | 6 +- .../Strings/vi/Resources.resw | 6 +- .../Strings/zh-Hans/Resources.resw | 6 +- .../Strings/zh-Hant/Resources.resw | 6 +- .../PlaybackSettingsControlViewModel.cs | 32 --- .../Views/SettingsPage.xaml | 2 +- BetterLyrics.sln | 14 - .../Helpers/RomajiAIHelper.cs | 239 ------------------ .../Options/ToRomajiAIOptions.cs | 16 -- .../RomajiConverter.Core.csproj | 4 +- 33 files changed, 201 insertions(+), 562 deletions(-) delete mode 100644 RomajiConverter.Core/Helpers/RomajiAIHelper.cs delete mode 100644 RomajiConverter.Core/Options/ToRomajiAIOptions.cs diff --git a/BetterLyrics.Core/BetterLyrics.Core.csproj b/BetterLyrics.Core/BetterLyrics.Core.csproj index b760144..49579d5 100644 --- a/BetterLyrics.Core/BetterLyrics.Core.csproj +++ b/BetterLyrics.Core/BetterLyrics.Core.csproj @@ -1,9 +1,12 @@  - - net10.0 - enable - enable - + + net10.0-windows10.0.26100.0 + enable + enable + win-x86;win-x64;win-arm64 + false + runtime + diff --git a/BetterLyrics.Plugins.Demo/BetterLyrics.Plugins.Demo.csproj b/BetterLyrics.Plugins.Demo/BetterLyrics.Plugins.Demo.csproj index 7a7889d..0af2f6d 100644 --- a/BetterLyrics.Plugins.Demo/BetterLyrics.Plugins.Demo.csproj +++ b/BetterLyrics.Plugins.Demo/BetterLyrics.Plugins.Demo.csproj @@ -1,13 +1,13 @@  - - net10.0 - enable - enable - + + net10.0-windows10.0.26100.0 + enable + enable + - - - + + + diff --git a/BetterLyrics.Plugins.Romaji/BetterLyrics.Plugins.Romaji.csproj b/BetterLyrics.Plugins.Romaji/BetterLyrics.Plugins.Romaji.csproj index 7e8c132..de13f63 100644 --- a/BetterLyrics.Plugins.Romaji/BetterLyrics.Plugins.Romaji.csproj +++ b/BetterLyrics.Plugins.Romaji/BetterLyrics.Plugins.Romaji.csproj @@ -1,101 +1,108 @@  - - net10.0 - enable - enable - + + net10.0-windows10.0.26100.0 + enable + enable + 10.0.19041.0 + win-x86;win-x64;win-arm64 + true + true + - - - contentFiles\any\any\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - - contentFiles\any\any\unidic\ - Always - true - true - - + + + contentFiles\any\any\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + + contentFiles\any\any\unidic\ + Always + true + true + + - - - - + + + false + runtime + + + diff --git a/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs b/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs index 6b7ed9b..7402ca2 100644 --- a/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs +++ b/BetterLyrics.Plugins.Romaji/RomajiPlugin.cs @@ -26,7 +26,7 @@ namespace BetterLyrics.Plugins.Romaji if (targetLangCode == "ja-latin") { var lines = RomajiHelper.ToRomaji(text); - result = string.Join("\r\n", lines.Select(p => string.Join(" ", p.Units.Select(q => q.Romaji)))); + result = string.Join("\n", lines.Select(p => string.Join(" ", p.Units.Select(q => q.Romaji)))); } return Task.FromResult(result); } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest index f995fdb..6a29d09 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest @@ -12,7 +12,7 @@ + Version="1.2.265.0" /> diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml index 8003fce..0426cbc 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml @@ -424,30 +424,6 @@ - - - - - - - - - - - -