Skip to content

同步net462#428

Merged
CJKmkp merged 62 commits intonet462from
beta
Apr 5, 2026
Merged

同步net462#428
CJKmkp merged 62 commits intonet462from
beta

Conversation

@CJKmkp
Copy link
Copy Markdown
Member

@CJKmkp CJKmkp commented Apr 5, 2026

No description provided.

PrefacedCorg and others added 30 commits March 28, 2026 22:05
添加注释
@CJKmkp CJKmkp merged commit 3c88f31 into net462 Apr 5, 2026
2 checks passed
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fea6576dfb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

private void InitializeNavigationMenu()
{
// 自动将插件页面添加到导航菜单
foreach (var pluginPage in _pluginPages)
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Guard plugin page iteration when plugin load fails

If ./Plugins is missing or MEF composition throws, LoadPluginSettingsPages catches the exception and leaves _pluginPages unset, but InitializeNavigationMenu immediately does foreach (var pluginPage in _pluginPages). In that common no-plugin environment this throws a NullReferenceException during SettingsWindow2 construction, so opening the new settings window crashes instead of degrading gracefully.

Useful? React with 👍 / 👎.

public static class Strings
{
private const string EmbeddedEnUsResxName = "Ink_Canvas.Properties.Strings.enUS.xml";
private const string EmbeddedEnUsResxName = "Ink_Canvas.Properties.Strings.en-US.resx";
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Restore a valid embedded source for English fallback map

GetString uses GetManifestResourceStream + ResXResourceReader to provide a shared fallback for all en* cultures, but this constant now points to Strings.en-US.resx, which is not available as a raw manifest .resx stream in the main assembly after the project-item changes. That leaves the map empty, so locales like en-GB/en-AU no longer get English strings and fall back to neutral Chinese resources.

Useful? React with 👍 / 👎.

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.

3 participants