From b4afc1f5a2267857f8b9025bca3557105fa3943c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Sep 2026 18:32:58 +0000
Subject: [PATCH 01/12] Update AutomaticUpdateVersionControl.txt
---
AutomaticUpdateVersionControl.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/AutomaticUpdateVersionControl.txt b/AutomaticUpdateVersionControl.txt
index 571adb261..655bd5fba 100644
--- a/AutomaticUpdateVersionControl.txt
+++ b/AutomaticUpdateVersionControl.txt
@@ -1 +1 @@
-1.8.0.0
\ No newline at end of file
+1.8.0.5
\ No newline at end of file
From 8fbc0eea214df5c09d953157e0ddd095e6a32186 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 20:40:30 +0800
Subject: [PATCH 02/12] improve:UI
---
Ink Canvas/MainWindow_cs/MW_AutoTheme.cs | 84 ++++++++++++++++++++----
1 file changed, 72 insertions(+), 12 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs
index 8ecc6dbbc..ebba951c7 100644
--- a/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs
+++ b/Ink Canvas/MainWindow_cs/MW_AutoTheme.cs
@@ -280,22 +280,82 @@ void SetFloatingBarButtonBrush(ToolbarImageButton btn)
SetFloatingBarButtonBrush(Exit_Icon);
}
+ // 跟随系统模式下最近一次应用的系统深浅色；null 表示尚未建立基线
+ private bool? _lastFollowedSystemThemeLight;
+ private DispatcherTimer _systemThemeRetryTimer;
+ private int _systemThemeRetryCount;
+ private const int SystemThemeRetryLimit = 10;
+ private static readonly TimeSpan SystemThemeRetryInterval = TimeSpan.FromMilliseconds(300);
+
private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
{
- switch (Settings.Appearance.Theme)
+ // 只关心外观类偏好变化；键盘/鼠标/电源等类别与主题无关
+ if (e.Category != UserPreferenceCategory.General) return;
+ // SystemEvents 的事件不保证在 UI 线程触发，统一调度回 UI 线程
+ Dispatcher.BeginInvoke(new Action(CheckSystemThemeSwitch));
+ }
+
+ ///
+ /// 系统深浅色切换检测：AppsUseLightTheme 注册表的写入可能晚于系统广播，
+ /// 首次读到旧值时延迟重试，确认真正翻转后再走完整主题管线。
+ ///
+ private void CheckSystemThemeSwitch()
+ {
+ // 仅「跟随系统」需要响应；固定主题重复应用反而会打断黑板/PPT 模式的深色覆盖
+ if (Settings.Appearance.Theme != 2) return;
+
+ bool systemLight = ThemeHelper.IsSystemThemeLight();
+
+ if (_lastFollowedSystemThemeLight == null)
{
- case 0:
- SetTheme(ThemeLight);
- break;
- case 1:
- SetTheme(ThemeDark);
- break;
- case 2:
- // 与 IsCurrentThemeDark / GetEffectiveTheme / 浮动栏一致，统一读 AppsUseLightTheme，
- // 否则 SystemUsesLightTheme 与 AppsUseLightTheme 可独立取值时主题会混搭
- SetTheme(ThemeHelper.IsSystemThemeLight() ? ThemeLight : ThemeDark);
- break;
+ // 首次只建立基线，不重复应用当前主题
+ _lastFollowedSystemThemeLight = systemLight;
+ return;
}
+
+ if (systemLight == _lastFollowedSystemThemeLight)
+ {
+ // 广播先于注册表写入的情况：延迟重读，确认值确实没变再放弃
+ StartSystemThemeRetry();
+ return;
+ }
+
+ StopSystemThemeRetry();
+ _lastFollowedSystemThemeLight = systemLight;
+ ApplyFollowedSystemTheme(systemLight);
+ }
+
+ private void StartSystemThemeRetry()
+ {
+ if (_systemThemeRetryCount >= SystemThemeRetryLimit) return;
+
+ _systemThemeRetryCount++;
+ if (_systemThemeRetryTimer == null)
+ {
+ _systemThemeRetryTimer = new DispatcherTimer { Interval = SystemThemeRetryInterval };
+ _systemThemeRetryTimer.Tick += (s, args) =>
+ {
+ _systemThemeRetryTimer.Stop();
+ CheckSystemThemeSwitch();
+ };
+ }
+ _systemThemeRetryTimer.Start();
+ }
+
+ private void StopSystemThemeRetry()
+ {
+ _systemThemeRetryTimer?.Stop();
+ _systemThemeRetryCount = 0;
+ }
+
+ private void ApplyFollowedSystemTheme(bool systemLight)
+ {
+ // 应用级主题（App 级 ThemeResources / Default 主题控件与 Popup）必须与
+ // 窗口级 RequestedTheme 同步翻转，否则切换后会出现深浅混搭
+ ThemeManager.Current.ApplicationTheme = systemLight ? ApplicationTheme.Light : ApplicationTheme.Dark;
+ SetTheme(systemLight ? ThemeLight : ThemeDark, autoSwitchIcon: true);
+ ViewboxFloatingBar.Opacity = 1.0;
+ RefreshNotificationColors();
}
private void AutoSwitchFloatingBarIconForTheme(string theme)
From 7c3eebd7abfbea6b24be3f37e6741b40e3faed54 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 20:41:56 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix:=E5=88=86=E7=BB=84=E5=86=85=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Windows/SettingsViews/Pages/ToolbarPage.xaml.cs | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/ToolbarPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/ToolbarPage.xaml.cs
index db0df41e8..2d8451dc1 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/ToolbarPage.xaml.cs
+++ b/Ink Canvas/Windows/SettingsViews/Pages/ToolbarPage.xaml.cs
@@ -35,7 +35,6 @@ private void ListViewItem_Loaded(object sender, RoutedEventArgs e)
private bool _isLoaded;
private bool _suppressConfigChange;
private bool _suppressSave;
- private bool _suppressSelectedEntrySync;
public ObservableCollection AddedComponents { get; } = new();
public ObservableCollection GroupChildren { get; } = new();
@@ -58,7 +57,6 @@ public ToolbarComponentEntry SelectedEntry
private static void OnSelectedEntryChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var page = (ToolbarPage)d;
- if (page._suppressSelectedEntrySync) return;
page.SelectedGroupChild = null;
// 选中分组时自动展开"分组内组件"面板；选中非分组时不自动收起（由关闭按钮控制）
if (page.SelectedEntry?.IsGroup == true)
@@ -92,13 +90,8 @@ public ToolbarComponentEntry SelectedGroupChild
private static void OnSelectedGroupChildChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var page = (ToolbarPage)d;
- // 选中分组内组件时，取消"已添加组件"列表的选中，避免两处同时高亮
- if (page.SelectedGroupChild != null && page.SelectedEntry != null)
- {
- page._suppressSelectedEntrySync = true;
- page.AddedList.SelectedItem = null;
- page._suppressSelectedEntrySync = false;
- }
+ // 分组的选中是"分组内组件"面板的数据来源，选中分组内组件时保留分组选中，
+ // 否则 SyncGroupChildrenBack 会因 SelectedEntry 为空而不回写，分组编辑全部丢失
page.UpdatePropertiesPanel();
}
From 562637270b547c8ece1734fa23e1870c31dadaeb Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 20:44:20 +0800
Subject: [PATCH 04/12] improve:UI
---
Ink Canvas/MainWindow.xaml.cs | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index ea0a24d00..5e33edbc0 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -1532,7 +1532,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
SetTheme("Dark");
break;
case 2: // 跟随系统
- if (ThemeHelper.IsSystemThemeLight())
+ _lastFollowedSystemThemeLight = ThemeHelper.IsSystemThemeLight();
+ if (_lastFollowedSystemThemeLight.Value)
{
ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
SetTheme("Light");
@@ -1904,6 +1905,8 @@ private void Window_Closed(object sender, EventArgs e)
{
RealtimeInkFrameScheduler.Clear();
SystemEvents.DisplaySettingsChanged -= SystemEventsOnDisplaySettingsChanged;
+ SystemEvents.UserPreferenceChanged -= SystemEvents_UserPreferenceChanged;
+ _systemThemeRetryTimer?.Stop();
// 玻璃浮动栏刻意不设 Owner，必须显式关闭，否则残留窗口会挡住进程退出
HideLiquidGlassBar();
@@ -3506,14 +3509,19 @@ internal void ApplyTheme(int themeIndex)
{
try
{
+ // 手动切换主题时基线失效，运行时系统深浅色切换需要重新建立
+ _lastFollowedSystemThemeLight = null;
+
switch (themeIndex)
{
case 0: // 浅色主题
+ ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
SetTheme("Light", true);
// 浅色主题下设置浮动栏为完全不透明
ViewboxFloatingBar.Opacity = 1.0;
break;
case 1: // 深色主题
+ ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
SetTheme("Dark", true);
// 深色主题下设置浮动栏为完全不透明
ViewboxFloatingBar.Opacity = 1.0;
@@ -3521,11 +3529,13 @@ internal void ApplyTheme(int themeIndex)
case 2: // 跟随系统
if (ThemeHelper.IsSystemThemeLight())
{
+ ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
SetTheme("Light", true);
ViewboxFloatingBar.Opacity = 1.0;
}
else
{
+ ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
SetTheme("Dark", true);
ViewboxFloatingBar.Opacity = 1.0;
}
From 1af5fa65ad7961d052ef52f6cc06520b4e7fdb65 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 21:02:51 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0nuget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/InkCanvasForClass.csproj | 42 ++--
Ink Canvas/packages.lock.json | 331 ++++++++++------------------
2 files changed, 133 insertions(+), 240 deletions(-)
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 92f494eb5..db7f1120f 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -118,16 +118,16 @@
-
+
all
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -137,29 +137,29 @@
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -617,20 +617,16 @@
CI 的 AnyCPU(=x64 产物)/x86 构建都能带上辅助 exe；单文件发布走 Publish 分支。 -->
-
-
+
+
-
-
+
+
@@ -650,6 +646,10 @@
false
+
+
+
+
diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json
index 3bb9b2027..e431b28fe 100644
--- a/Ink Canvas/packages.lock.json
+++ b/Ink Canvas/packages.lock.json
@@ -23,21 +23,21 @@
},
"CommunityToolkit.Mvvm": {
"type": "Direct",
- "requested": "[8.4.0, )",
- "resolved": "8.4.0",
- "contentHash": "tqVU8yc/ADO9oiTRyTnwhFN68hCwvkliMierptWOudIAvWY1mWCh5VFh+guwHJmpMwfg0J0rY+yyd5Oy7ty9Uw==",
+ "requested": "[8.4.2, )",
+ "resolved": "8.4.2",
+ "contentHash": "WadCzGEc2U+3e20avRLng4qNtt4zoOGWrdUISqJWrHe3/FSnrYjuM5Sb4yQb09LhkBXrrI4Zt3dLKgRMbItsrg==",
"dependencies": {
"System.ComponentModel.Annotations": "5.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.1.0"
+ "System.Runtime.CompilerServices.Unsafe": "6.1.2"
}
},
"Costura.Fody": {
"type": "Direct",
- "requested": "[6.0.0, )",
- "resolved": "6.0.0",
- "contentHash": "3Uriu9GJABMivG0wXMJs6NQ7FNE3pylir1gZEBAWDvpii3cnrmxXnOG44MMDuIVOIk/Xhef7WZFsaCNV+py9qA==",
+ "requested": "[6.2.0, )",
+ "resolved": "6.2.0",
+ "contentHash": "jaX+A6sw6pI7lkLDTvxN7zU8Ja/a50N2xPKF6RYy0J6QF62wVg+hJMXJph2K8XarDaAlxQ82EaKv3fAvUNyRpg==",
"dependencies": {
- "Fody": "6.8.2"
+ "Fody": "6.9.3"
}
},
"gong-wpf-dragdrop": {
@@ -48,11 +48,12 @@
},
"H.NotifyIcon.Wpf": {
"type": "Direct",
- "requested": "[2.0.131, )",
- "resolved": "2.0.131",
- "contentHash": "f71kXNl6PjCqipJ7DQytg1QUBMQ+7j8rF1UyL8UPegymG1G57EYsskdIcf/VmF6JDuts6Dk6F8Hd4ziiz4/3Dw==",
+ "requested": "[2.4.1, )",
+ "resolved": "2.4.1",
+ "contentHash": "aDfDSHCCOWgQoIvAApiog/MhriXibacqANQm+b5GaRCgRg92u5J2QcoW2C+wIblgxhtGx3o32/DCKWRR5C/KLw==",
"dependencies": {
- "H.NotifyIcon": "2.0.131"
+ "H.NotifyIcon": "2.4.1",
+ "System.ValueTuple": "4.5.0"
}
},
"iNKORE.UI.WPF": {
@@ -103,12 +104,11 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Direct",
- "requested": "[6.0.0, )",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "PSmotV19c7E3lKed++uYo1kSiXFI+uTl37CBSrhq+CfLC3FCHjG7R91+xPnNehQfHS1b0Tzo/CCLPWH3qaEheg==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.11"
}
},
"Microsoft.International.Converters.PinYinConverter": {
@@ -143,12 +143,12 @@
},
"Microsoft.Windows.CsWin32": {
"type": "Direct",
- "requested": "[0.3.298, )",
- "resolved": "0.3.298",
- "contentHash": "moz/CojV5HSeJYV9pNVE6mWMKnJGvPgdD31EhBLyUJ8Ui06PBrH9oPFK1ljXbJJMM4EzKnkE1a0AtBbH1BHDGA==",
+ "requested": "[0.3.333, )",
+ "resolved": "0.3.333",
+ "contentHash": "UigiQ8BYaIJfon0FZ9rTy9reygbXr4VijncifNe/Az/GSnqd958ptd1/Hp9u9lyYrwI+3/xeIUHgqrLr1o5hQQ==",
"dependencies": {
"Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha",
- "Microsoft.Windows.SDK.Win32Metadata": "70.0.11-preview",
+ "Microsoft.Windows.SDK.Win32Metadata": "71.0.14-preview",
"Microsoft.Windows.WDK.Win32Metadata": "0.13.25-experimental"
}
},
@@ -160,9 +160,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
- "requested": "[3.9.50, )",
- "resolved": "3.9.50",
- "contentHash": "HtOgGF6jZ+WYbXnCUCYPT8Y2d6mIJo9ozjK/FINTRsXdm4Zgv9GehUMa7EFoGQkqrMcDJNOIDwCmENnvXg4UbA=="
+ "requested": "[3.10.94, )",
+ "resolved": "3.10.94",
+ "contentHash": "sn6gFIx6bwFj3Me0XGmek3gLZi/MZC8C4tRLwslXGeBcXcVxvFpZyDrQA93G8TiYgxTS7J7triKB7hj5wXzSxA=="
},
"Newtonsoft.Json": {
"type": "Direct",
@@ -190,24 +190,25 @@
},
"PDFsharp": {
"type": "Direct",
- "requested": "[6.1.1, )",
- "resolved": "6.1.1",
- "contentHash": "wxBLG2f713s2Fp2rYxTCReNOcXT/4YX4h4TJW6y75xAEq2iaEjLDjZRgtXW1/IgadzyluIVmw4RqHz1rL4BYKg==",
+ "requested": "[6.2.4, )",
+ "resolved": "6.2.4",
+ "contentHash": "GhTr9F1uOYXHCIEOB5PXIgqn5a8WLsJL2m0eewTA0IvY1j6N4HGXHKKmEyB90/N6vrjmYamf41V9zbmdW2HY3g==",
"dependencies": {
- "Microsoft.Extensions.Logging": "6.0.0"
+ "Microsoft.Extensions.Logging.Abstractions": "8.0.3",
+ "System.Security.Cryptography.Pkcs": "8.0.1"
}
},
"System.ComponentModel.Composition": {
"type": "Direct",
- "requested": "[10.0.5, )",
- "resolved": "10.0.5",
- "contentHash": "Yi8nY2EKRZlZYRPxQ1/E4rrYs6QD1H0UgfcfHhKsCVhNJ4lNULLbly6Dtz6CjH6gZKBf2hZYXzzzzVGhpGLBvw=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "fzO1adhxkoQxrF21SspLAlHf8GOu3BOjq1yMJs+Gn8nxIvNv8k59feK0zFYuX0yBb3Ns50+lBQA2btDOeX9zoA=="
},
"System.Composition.AttributedModel": {
"type": "Direct",
- "requested": "[10.0.5, )",
- "resolved": "10.0.5",
- "contentHash": "Vgb7wwB7ya+lbcwccXHZPSJxeKR7tCkWLgFXO9Wcgbu/NgO5DvNAIHtEkXaEESkcvXdD1iqp2JBcLWGT/xDxEw=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "pexJp2ogcmngQ0GUg0KNtGRzfDgQ/5ZPNapEJ/EMc4rl2Y528cKPigXGdjajbVtvKfER1Tx/5DY3WRiWUgIH5w=="
},
"System.Data.DataSetExtensions": {
"type": "Direct",
@@ -217,11 +218,11 @@
},
"System.Management": {
"type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g==",
"dependencies": {
- "System.CodeDom": "6.0.0"
+ "System.CodeDom": "10.0.11"
}
},
"System.Private.Uri": {
@@ -250,53 +251,27 @@
},
"Vortice.Direct2D1": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "WnB9X333LKA/HL0XMwn+VH91haU6KgR6JLX2RGGwb5JzSHiu5rwpDkEzbDR6JFwCzM4tT+hOCpch34ELWrXeYw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "SDHEmNUT3A4P8yj+g7q3AnRZ9fvqOOe/EoWjsgkHlQ3C9Tkc51rTeZXC9bQPySli+/lFTui8vMs9tpWZqf+AwQ=="
},
"Vortice.Direct3D11": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "BGeaLUXIty564H+QgynR5FH3su6UxKEY8RPVQtMxVVPj2f0PNryaFjVQ0JJJhaEkg6G2/7VF/8tizQZy/DkF9g==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "JgFUswu2mgrSwcd0KRF2AnfeE5VbMEgcicmxPD1g2yXyomPIHbnX3wldBNHPOzzD0URC1WJ/pO1ymfi3imZwvg=="
},
"Vortice.DirectComposition": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "9mba1b+jiyQyoHU1XCxxje2oHtarDQC5/LmZ74tn5oqSre5x7ZdALr96irZSx0RmzB75z+4DD3MXy5mbmFI4mw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Direct2D1": "3.2.0",
- "Vortice.DirectX": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "2/QD9K9UC7z/2FgK8/gVyySfMppwOz006+9eMtrcEbsTwYNxBxJGCeY09oM8Mr7CLOVY581sg89lIES+2URd6A=="
},
"Vortice.DXGI": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "vx0z23UGxpLfYELK9P2HTalcoMd8etqmJzKfU2Ho88e+s4pAtQrUythotpYZ41zS/9cbOo25HhRAXljVmjPTuw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DirectX": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "MbAUnTeQ6WD99ctAdrj5CQO2I7oaax0Kt2eVdWSUj0bYP9Ed0726+s7dIHe4+tqhpmINW/dcPt0mNtc72o+E0w=="
},
"WebDav.Client": {
"type": "Direct",
@@ -316,23 +291,25 @@
},
"Fody": {
"type": "Transitive",
- "resolved": "6.8.2",
- "contentHash": "sjGHrtGS1+kcrv99WXCvujOFBTQp4zCH3ZC9wo2LAtVaJkuLpHghQx3y4k1Q8ZKuDAbEw+HE6ZjPUJQK3ejepQ=="
+ "resolved": "6.9.3",
+ "contentHash": "1CUGgFdyECDKgi5HaUBhdv6k+VG9Iy4OCforGfHyar3xQXAJypZkzymgKtWj/4SPd6nSG0Qi7NH71qHrDSZLaA=="
},
"H.GeneratedIcons.System.Drawing": {
"type": "Transitive",
- "resolved": "2.0.131",
- "contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A==",
+ "resolved": "2.4.1",
+ "contentHash": "gjYhuwHQzISqKhcNYaRdDhzKCoqLZii+6TTHP0MQf4Q9+H6z4f4A5Xu/j8B8XpFPQ1grCMlQYREvNyNJT9Q/Bg==",
"dependencies": {
- "System.Drawing.Common": "8.0.0"
+ "System.Drawing.Common": "10.0.0"
}
},
"H.NotifyIcon": {
"type": "Transitive",
- "resolved": "2.0.131",
- "contentHash": "mdznQAfcJFehblFoDUvtmdm1Y9+u1eMN1ffORbdYv5EwreMxkCwvdj8qQn3qnUo9EIJ6h5Xdgqey9Nj4us8w7w==",
+ "resolved": "2.4.1",
+ "contentHash": "nNPgNzo5UHcWYpVLO3AsRlH8fKE9shBA7/WLpZrFZUFbzpKGcLnz15Kmg0pQ851aboAfm3YuHjYFsYQges/pyw==",
"dependencies": {
- "H.GeneratedIcons.System.Drawing": "2.0.131"
+ "H.GeneratedIcons.System.Drawing": "2.4.1",
+ "System.Memory": "4.6.0",
+ "System.Runtime.CompilerServices.Unsafe": "6.1.0"
}
},
"JerryShaw.DirectShowLib": {
@@ -357,41 +334,15 @@
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
- },
- "Microsoft.Extensions.Logging": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
- "dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
- }
+ "resolved": "10.0.11",
+ "contentHash": "/a1aJz4m7ylhEDf25ugQChLQoN5XwoGjWw/BoR/ZWWKsO1v4DdJElS1uyngahz4B/eOzjFk1KNTkarRLE5wsIg=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
- },
- "Microsoft.Extensions.Options": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
+ "resolved": "8.0.3",
+ "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
- }
- },
- "Microsoft.Extensions.Primitives": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
}
},
"Microsoft.NET.StringTools": {
@@ -422,11 +373,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"Microsoft.Windows.SDK.Win32Docs": {
"type": "Transitive",
"resolved": "0.1.42-alpha",
@@ -434,8 +380,8 @@
},
"Microsoft.Windows.SDK.Win32Metadata": {
"type": "Transitive",
- "resolved": "70.0.11-preview",
- "contentHash": "i8Dv2KCKzH8MQAsgLeUa5zFGyQOoz+TlvnbkFUkjsUtqhj4oguVj9rDpVACs5fLayZbwItOSllf+bhwr+z2yeg=="
+ "resolved": "71.0.14-preview",
+ "contentHash": "39I8YpjHYJF7Qncztn6+cu15Ti35myn5QQnLZwN6AngBsfaU1l3Nsxvt2087AlExLxg5a/llFIRSeahK7GW/Dw=="
},
"Microsoft.Windows.WDK.Win32Metadata": {
"type": "Transitive",
@@ -450,32 +396,10 @@
"resolved": "4.0.0",
"contentHash": "5HKzttVKWeKoDQKJd3+J7Dy1MW6gbNNYfftkVufe2ddFQD0kXjnT1IN3ZJBfF6QVEQmHpQSp+/PT7Jo2YyHFcw=="
},
- "PolySharp": {
- "type": "Transitive",
- "resolved": "1.10.0",
- "contentHash": "+uNyVhhKOskjJLKOwIQ2qGaA0T507FaMbz5RwLAtmRaMaTAcUAZAiZvSk4Z8z6GkmqOyO1zryYNXmO0Vh7IrYQ=="
- },
- "SharpGen.Runtime": {
- "type": "Transitive",
- "resolved": "2.0.0-beta.13",
- "contentHash": "H+Up2Er3ptWzcQ+CAO652fEsBLAmoXqKqtvc/6ycRV9XfLN2XJch0h8CwKQ3muD6eADPFf8Xp+nDQ8wDpcRDlg==",
- "dependencies": {
- "PolySharp": "1.10.0"
- }
- },
- "SharpGen.Runtime.COM": {
- "type": "Transitive",
- "resolved": "2.0.0-beta.13",
- "contentHash": "H22LsE3XTIOevf2TJgPgPnfYmjMlCtN+QYZVxzXlgTrgG2jHSTUTKZpIMPbKliLJGCEnDfX6yvBJvya0/xRTkA==",
- "dependencies": {
- "PolySharp": "1.10.0",
- "SharpGen.Runtime": "2.0.0-beta.13"
- }
- },
"System.CodeDom": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA=="
+ "resolved": "10.0.11",
+ "contentHash": "v40pNeBoZTYsiVxz+PzyZmmIr2JIhpK4VsFpQqZSZCXa51PDlNXIN2ESm8kDU0voZYVfLhxF9HvmBsxCJmkiRg=="
},
"System.Collections.Immutable": {
"type": "Transitive",
@@ -490,21 +414,15 @@
"resolved": "5.0.0",
"contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
},
- "System.Diagnostics.DiagnosticSource": {
+ "System.Drawing.Common": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
+ "resolved": "10.0.0",
+ "contentHash": "kohT9ZZlkB5R5ifihCBnPJLdIUQGiTj1ZI6z4LKatr+F4MmIJJu7qQpBkqt9280ivtnSvlTx9qZEY+CpJ0zMkA=="
},
- "System.Drawing.Common": {
+ "System.Formats.Asn1": {
"type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "JkbHJjtI/dWc5dfmEdJlbe3VwgZqCkZRtfuWFh5GOv0f+gGCfBtzMpIVkmdkj2AObO9y+oiOi81UGwH3aBYuqA==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "8.0.0"
- }
+ "resolved": "8.0.1",
+ "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A=="
},
"System.IO": {
"type": "Transitive",
@@ -520,8 +438,8 @@
},
"System.Memory": {
"type": "Transitive",
- "resolved": "4.5.5",
- "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+ "resolved": "4.6.0",
+ "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg=="
},
"System.Reflection": {
"type": "Transitive",
@@ -561,8 +479,8 @@
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
- "resolved": "6.1.0",
- "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg=="
+ "resolved": "6.1.2",
+ "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
},
"System.Runtime.Handles": {
"type": "Transitive",
@@ -583,6 +501,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -613,21 +539,6 @@
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
- "Vortice.DirectX": {
- "type": "Transitive",
- "resolved": "3.2.0",
- "contentHash": "VvLoA3OMwy8XhsWtP5mO7LWS8mTysPaU9fvAzIJTdatW7TaC7GgA2kpanpbvHSysuJF/O5c9rB7IBukFP4v0aw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.Mathematics": "1.5.2"
- }
- },
- "Vortice.Mathematics": {
- "type": "Transitive",
- "resolved": "1.5.2",
- "contentHash": "kf/h6LTSCYB3Ii9mFOqQj8843nPkqGt/aYSRreIWB4BZzpXE2RNKLrJqh+7DaPRwr9qu1f28aRaxfOgeXxtKjw=="
- },
"inkcanvas.controls": {
"type": "Project",
"dependencies": {
@@ -646,15 +557,6 @@
}
},
"net6.0-windows10.0.19041/win-arm64": {
- "System.Management": {
- "type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
- "dependencies": {
- "System.CodeDom": "6.0.0"
- }
- },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -679,11 +581,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -794,6 +691,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -823,15 +728,6 @@
}
},
"net6.0-windows10.0.19041/win-x64": {
- "System.Management": {
- "type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
- "dependencies": {
- "System.CodeDom": "6.0.0"
- }
- },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -856,11 +752,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -971,6 +862,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -1000,15 +899,6 @@
}
},
"net6.0-windows10.0.19041/win-x86": {
- "System.Management": {
- "type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
- "dependencies": {
- "System.CodeDom": "6.0.0"
- }
- },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -1033,11 +923,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1148,6 +1033,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
From c8031b53725a84ed5fbaf85fe8e39cd0bb596c0c Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Sun, 6 Sep 2026 21:16:06 +0800
Subject: [PATCH 06/12] fix: centralize Nerdbank version for restore (#651)
---
Directory.Build.props | 8 +++++---
Ink Canvas/InkCanvasForClass.csproj | 4 ----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index b7fa97c08..7f2012b69 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,14 +2,16 @@
None
-
true
all
- 3.9.50
+ 3.10.94
-
\ No newline at end of file
+
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 40bfb38e3..dd5af9877 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -650,10 +650,6 @@
-
-
-
-
From 959a1fc545c2375e7927ff6ee27135683e315bcd Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Sun, 6 Sep 2026 21:17:18 +0800
Subject: [PATCH 07/12] Revert "fix: centralize Nerdbank version for restore
(#651)" (#652)
This reverts commit c8031b53725a84ed5fbaf85fe8e39cd0bb596c0c.
---
Directory.Build.props | 8 +++-----
Ink Canvas/InkCanvasForClass.csproj | 4 ++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 7f2012b69..b7fa97c08 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,16 +2,14 @@
None
-
true
all
- 3.10.94
+ 3.9.50
-
+
\ No newline at end of file
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index dd5af9877..40bfb38e3 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -650,6 +650,10 @@
+
+
+
+
From 2734e9bddc49eaea24825d505efe1b267e6a2f47 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 21:18:07 +0800
Subject: [PATCH 08/12] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0nuget"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 1af5fa65ad7961d052ef52f6cc06520b4e7fdb65.
---
Ink Canvas/InkCanvasForClass.csproj | 42 ++--
Ink Canvas/packages.lock.json | 331 ++++++++++++++++++----------
2 files changed, 240 insertions(+), 133 deletions(-)
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index db7f1120f..92f494eb5 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -118,16 +118,16 @@
-
+
all
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -137,29 +137,29 @@
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -617,16 +617,20 @@
CI 的 AnyCPU(=x64 产物)/x86 构建都能带上辅助 exe；单文件发布走 Publish 分支。 -->
-
-
+
+
-
-
+
+
@@ -646,10 +650,6 @@
false
-
-
-
-
diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json
index e431b28fe..3bb9b2027 100644
--- a/Ink Canvas/packages.lock.json
+++ b/Ink Canvas/packages.lock.json
@@ -23,21 +23,21 @@
},
"CommunityToolkit.Mvvm": {
"type": "Direct",
- "requested": "[8.4.2, )",
- "resolved": "8.4.2",
- "contentHash": "WadCzGEc2U+3e20avRLng4qNtt4zoOGWrdUISqJWrHe3/FSnrYjuM5Sb4yQb09LhkBXrrI4Zt3dLKgRMbItsrg==",
+ "requested": "[8.4.0, )",
+ "resolved": "8.4.0",
+ "contentHash": "tqVU8yc/ADO9oiTRyTnwhFN68hCwvkliMierptWOudIAvWY1mWCh5VFh+guwHJmpMwfg0J0rY+yyd5Oy7ty9Uw==",
"dependencies": {
"System.ComponentModel.Annotations": "5.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.1.2"
+ "System.Runtime.CompilerServices.Unsafe": "6.1.0"
}
},
"Costura.Fody": {
"type": "Direct",
- "requested": "[6.2.0, )",
- "resolved": "6.2.0",
- "contentHash": "jaX+A6sw6pI7lkLDTvxN7zU8Ja/a50N2xPKF6RYy0J6QF62wVg+hJMXJph2K8XarDaAlxQ82EaKv3fAvUNyRpg==",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "3Uriu9GJABMivG0wXMJs6NQ7FNE3pylir1gZEBAWDvpii3cnrmxXnOG44MMDuIVOIk/Xhef7WZFsaCNV+py9qA==",
"dependencies": {
- "Fody": "6.9.3"
+ "Fody": "6.8.2"
}
},
"gong-wpf-dragdrop": {
@@ -48,12 +48,11 @@
},
"H.NotifyIcon.Wpf": {
"type": "Direct",
- "requested": "[2.4.1, )",
- "resolved": "2.4.1",
- "contentHash": "aDfDSHCCOWgQoIvAApiog/MhriXibacqANQm+b5GaRCgRg92u5J2QcoW2C+wIblgxhtGx3o32/DCKWRR5C/KLw==",
+ "requested": "[2.0.131, )",
+ "resolved": "2.0.131",
+ "contentHash": "f71kXNl6PjCqipJ7DQytg1QUBMQ+7j8rF1UyL8UPegymG1G57EYsskdIcf/VmF6JDuts6Dk6F8Hd4ziiz4/3Dw==",
"dependencies": {
- "H.NotifyIcon": "2.4.1",
- "System.ValueTuple": "4.5.0"
+ "H.NotifyIcon": "2.0.131"
}
},
"iNKORE.UI.WPF": {
@@ -104,11 +103,12 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "PSmotV19c7E3lKed++uYo1kSiXFI+uTl37CBSrhq+CfLC3FCHjG7R91+xPnNehQfHS1b0Tzo/CCLPWH3qaEheg==",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.11"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"Microsoft.International.Converters.PinYinConverter": {
@@ -143,12 +143,12 @@
},
"Microsoft.Windows.CsWin32": {
"type": "Direct",
- "requested": "[0.3.333, )",
- "resolved": "0.3.333",
- "contentHash": "UigiQ8BYaIJfon0FZ9rTy9reygbXr4VijncifNe/Az/GSnqd958ptd1/Hp9u9lyYrwI+3/xeIUHgqrLr1o5hQQ==",
+ "requested": "[0.3.298, )",
+ "resolved": "0.3.298",
+ "contentHash": "moz/CojV5HSeJYV9pNVE6mWMKnJGvPgdD31EhBLyUJ8Ui06PBrH9oPFK1ljXbJJMM4EzKnkE1a0AtBbH1BHDGA==",
"dependencies": {
"Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha",
- "Microsoft.Windows.SDK.Win32Metadata": "71.0.14-preview",
+ "Microsoft.Windows.SDK.Win32Metadata": "70.0.11-preview",
"Microsoft.Windows.WDK.Win32Metadata": "0.13.25-experimental"
}
},
@@ -160,9 +160,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
- "requested": "[3.10.94, )",
- "resolved": "3.10.94",
- "contentHash": "sn6gFIx6bwFj3Me0XGmek3gLZi/MZC8C4tRLwslXGeBcXcVxvFpZyDrQA93G8TiYgxTS7J7triKB7hj5wXzSxA=="
+ "requested": "[3.9.50, )",
+ "resolved": "3.9.50",
+ "contentHash": "HtOgGF6jZ+WYbXnCUCYPT8Y2d6mIJo9ozjK/FINTRsXdm4Zgv9GehUMa7EFoGQkqrMcDJNOIDwCmENnvXg4UbA=="
},
"Newtonsoft.Json": {
"type": "Direct",
@@ -190,25 +190,24 @@
},
"PDFsharp": {
"type": "Direct",
- "requested": "[6.2.4, )",
- "resolved": "6.2.4",
- "contentHash": "GhTr9F1uOYXHCIEOB5PXIgqn5a8WLsJL2m0eewTA0IvY1j6N4HGXHKKmEyB90/N6vrjmYamf41V9zbmdW2HY3g==",
+ "requested": "[6.1.1, )",
+ "resolved": "6.1.1",
+ "contentHash": "wxBLG2f713s2Fp2rYxTCReNOcXT/4YX4h4TJW6y75xAEq2iaEjLDjZRgtXW1/IgadzyluIVmw4RqHz1rL4BYKg==",
"dependencies": {
- "Microsoft.Extensions.Logging.Abstractions": "8.0.3",
- "System.Security.Cryptography.Pkcs": "8.0.1"
+ "Microsoft.Extensions.Logging": "6.0.0"
}
},
"System.ComponentModel.Composition": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "fzO1adhxkoQxrF21SspLAlHf8GOu3BOjq1yMJs+Gn8nxIvNv8k59feK0zFYuX0yBb3Ns50+lBQA2btDOeX9zoA=="
+ "requested": "[10.0.5, )",
+ "resolved": "10.0.5",
+ "contentHash": "Yi8nY2EKRZlZYRPxQ1/E4rrYs6QD1H0UgfcfHhKsCVhNJ4lNULLbly6Dtz6CjH6gZKBf2hZYXzzzzVGhpGLBvw=="
},
"System.Composition.AttributedModel": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "pexJp2ogcmngQ0GUg0KNtGRzfDgQ/5ZPNapEJ/EMc4rl2Y528cKPigXGdjajbVtvKfER1Tx/5DY3WRiWUgIH5w=="
+ "requested": "[10.0.5, )",
+ "resolved": "10.0.5",
+ "contentHash": "Vgb7wwB7ya+lbcwccXHZPSJxeKR7tCkWLgFXO9Wcgbu/NgO5DvNAIHtEkXaEESkcvXdD1iqp2JBcLWGT/xDxEw=="
},
"System.Data.DataSetExtensions": {
"type": "Direct",
@@ -218,11 +217,11 @@
},
"System.Management": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g==",
+ "requested": "[6.0.2, )",
+ "resolved": "6.0.2",
+ "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
"dependencies": {
- "System.CodeDom": "10.0.11"
+ "System.CodeDom": "6.0.0"
}
},
"System.Private.Uri": {
@@ -251,27 +250,53 @@
},
"Vortice.Direct2D1": {
"type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "SDHEmNUT3A4P8yj+g7q3AnRZ9fvqOOe/EoWjsgkHlQ3C9Tkc51rTeZXC9bQPySli+/lFTui8vMs9tpWZqf+AwQ=="
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "WnB9X333LKA/HL0XMwn+VH91haU6KgR6JLX2RGGwb5JzSHiu5rwpDkEzbDR6JFwCzM4tT+hOCpch34ELWrXeYw==",
+ "dependencies": {
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DXGI": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
+ }
},
"Vortice.Direct3D11": {
"type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "JgFUswu2mgrSwcd0KRF2AnfeE5VbMEgcicmxPD1g2yXyomPIHbnX3wldBNHPOzzD0URC1WJ/pO1ymfi3imZwvg=="
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "BGeaLUXIty564H+QgynR5FH3su6UxKEY8RPVQtMxVVPj2f0PNryaFjVQ0JJJhaEkg6G2/7VF/8tizQZy/DkF9g==",
+ "dependencies": {
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DXGI": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
+ }
},
"Vortice.DirectComposition": {
"type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "2/QD9K9UC7z/2FgK8/gVyySfMppwOz006+9eMtrcEbsTwYNxBxJGCeY09oM8Mr7CLOVY581sg89lIES+2URd6A=="
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "9mba1b+jiyQyoHU1XCxxje2oHtarDQC5/LmZ74tn5oqSre5x7ZdALr96irZSx0RmzB75z+4DD3MXy5mbmFI4mw==",
+ "dependencies": {
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DXGI": "3.2.0",
+ "Vortice.Direct2D1": "3.2.0",
+ "Vortice.DirectX": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
+ }
},
"Vortice.DXGI": {
"type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "MbAUnTeQ6WD99ctAdrj5CQO2I7oaax0Kt2eVdWSUj0bYP9Ed0726+s7dIHe4+tqhpmINW/dcPt0mNtc72o+E0w=="
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "vx0z23UGxpLfYELK9P2HTalcoMd8etqmJzKfU2Ho88e+s4pAtQrUythotpYZ41zS/9cbOo25HhRAXljVmjPTuw==",
+ "dependencies": {
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DirectX": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
+ }
},
"WebDav.Client": {
"type": "Direct",
@@ -291,25 +316,23 @@
},
"Fody": {
"type": "Transitive",
- "resolved": "6.9.3",
- "contentHash": "1CUGgFdyECDKgi5HaUBhdv6k+VG9Iy4OCforGfHyar3xQXAJypZkzymgKtWj/4SPd6nSG0Qi7NH71qHrDSZLaA=="
+ "resolved": "6.8.2",
+ "contentHash": "sjGHrtGS1+kcrv99WXCvujOFBTQp4zCH3ZC9wo2LAtVaJkuLpHghQx3y4k1Q8ZKuDAbEw+HE6ZjPUJQK3ejepQ=="
},
"H.GeneratedIcons.System.Drawing": {
"type": "Transitive",
- "resolved": "2.4.1",
- "contentHash": "gjYhuwHQzISqKhcNYaRdDhzKCoqLZii+6TTHP0MQf4Q9+H6z4f4A5Xu/j8B8XpFPQ1grCMlQYREvNyNJT9Q/Bg==",
+ "resolved": "2.0.131",
+ "contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A==",
"dependencies": {
- "System.Drawing.Common": "10.0.0"
+ "System.Drawing.Common": "8.0.0"
}
},
"H.NotifyIcon": {
"type": "Transitive",
- "resolved": "2.4.1",
- "contentHash": "nNPgNzo5UHcWYpVLO3AsRlH8fKE9shBA7/WLpZrFZUFbzpKGcLnz15Kmg0pQ851aboAfm3YuHjYFsYQges/pyw==",
+ "resolved": "2.0.131",
+ "contentHash": "mdznQAfcJFehblFoDUvtmdm1Y9+u1eMN1ffORbdYv5EwreMxkCwvdj8qQn3qnUo9EIJ6h5Xdgqey9Nj4us8w7w==",
"dependencies": {
- "H.GeneratedIcons.System.Drawing": "2.4.1",
- "System.Memory": "4.6.0",
- "System.Runtime.CompilerServices.Unsafe": "6.1.0"
+ "H.GeneratedIcons.System.Drawing": "2.0.131"
}
},
"JerryShaw.DirectShowLib": {
@@ -334,15 +357,41 @@
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
- "resolved": "10.0.11",
- "contentHash": "/a1aJz4m7ylhEDf25ugQChLQoN5XwoGjWw/BoR/ZWWKsO1v4DdJElS1uyngahz4B/eOzjFk1KNTkarRLE5wsIg=="
+ "resolved": "6.0.0",
+ "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
+ },
+ "Microsoft.Extensions.Logging": {
+ "type": "Transitive",
+ "resolved": "6.0.0",
+ "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection": "6.0.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
+ "Microsoft.Extensions.Options": "6.0.0",
+ "System.Diagnostics.DiagnosticSource": "6.0.0"
+ }
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "8.0.3",
- "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==",
+ "resolved": "6.0.0",
+ "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+ },
+ "Microsoft.Extensions.Options": {
+ "type": "Transitive",
+ "resolved": "6.0.0",
+ "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+ "Microsoft.Extensions.Primitives": "6.0.0"
+ }
+ },
+ "Microsoft.Extensions.Primitives": {
+ "type": "Transitive",
+ "resolved": "6.0.0",
+ "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"Microsoft.NET.StringTools": {
@@ -373,6 +422,11 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "Microsoft.Win32.SystemEvents": {
+ "type": "Transitive",
+ "resolved": "8.0.0",
+ "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
+ },
"Microsoft.Windows.SDK.Win32Docs": {
"type": "Transitive",
"resolved": "0.1.42-alpha",
@@ -380,8 +434,8 @@
},
"Microsoft.Windows.SDK.Win32Metadata": {
"type": "Transitive",
- "resolved": "71.0.14-preview",
- "contentHash": "39I8YpjHYJF7Qncztn6+cu15Ti35myn5QQnLZwN6AngBsfaU1l3Nsxvt2087AlExLxg5a/llFIRSeahK7GW/Dw=="
+ "resolved": "70.0.11-preview",
+ "contentHash": "i8Dv2KCKzH8MQAsgLeUa5zFGyQOoz+TlvnbkFUkjsUtqhj4oguVj9rDpVACs5fLayZbwItOSllf+bhwr+z2yeg=="
},
"Microsoft.Windows.WDK.Win32Metadata": {
"type": "Transitive",
@@ -396,10 +450,32 @@
"resolved": "4.0.0",
"contentHash": "5HKzttVKWeKoDQKJd3+J7Dy1MW6gbNNYfftkVufe2ddFQD0kXjnT1IN3ZJBfF6QVEQmHpQSp+/PT7Jo2YyHFcw=="
},
+ "PolySharp": {
+ "type": "Transitive",
+ "resolved": "1.10.0",
+ "contentHash": "+uNyVhhKOskjJLKOwIQ2qGaA0T507FaMbz5RwLAtmRaMaTAcUAZAiZvSk4Z8z6GkmqOyO1zryYNXmO0Vh7IrYQ=="
+ },
+ "SharpGen.Runtime": {
+ "type": "Transitive",
+ "resolved": "2.0.0-beta.13",
+ "contentHash": "H+Up2Er3ptWzcQ+CAO652fEsBLAmoXqKqtvc/6ycRV9XfLN2XJch0h8CwKQ3muD6eADPFf8Xp+nDQ8wDpcRDlg==",
+ "dependencies": {
+ "PolySharp": "1.10.0"
+ }
+ },
+ "SharpGen.Runtime.COM": {
+ "type": "Transitive",
+ "resolved": "2.0.0-beta.13",
+ "contentHash": "H22LsE3XTIOevf2TJgPgPnfYmjMlCtN+QYZVxzXlgTrgG2jHSTUTKZpIMPbKliLJGCEnDfX6yvBJvya0/xRTkA==",
+ "dependencies": {
+ "PolySharp": "1.10.0",
+ "SharpGen.Runtime": "2.0.0-beta.13"
+ }
+ },
"System.CodeDom": {
"type": "Transitive",
- "resolved": "10.0.11",
- "contentHash": "v40pNeBoZTYsiVxz+PzyZmmIr2JIhpK4VsFpQqZSZCXa51PDlNXIN2ESm8kDU0voZYVfLhxF9HvmBsxCJmkiRg=="
+ "resolved": "6.0.0",
+ "contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA=="
},
"System.Collections.Immutable": {
"type": "Transitive",
@@ -414,15 +490,21 @@
"resolved": "5.0.0",
"contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
},
- "System.Drawing.Common": {
+ "System.Diagnostics.DiagnosticSource": {
"type": "Transitive",
- "resolved": "10.0.0",
- "contentHash": "kohT9ZZlkB5R5ifihCBnPJLdIUQGiTj1ZI6z4LKatr+F4MmIJJu7qQpBkqt9280ivtnSvlTx9qZEY+CpJ0zMkA=="
+ "resolved": "6.0.0",
+ "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ }
},
- "System.Formats.Asn1": {
+ "System.Drawing.Common": {
"type": "Transitive",
- "resolved": "8.0.1",
- "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A=="
+ "resolved": "8.0.0",
+ "contentHash": "JkbHJjtI/dWc5dfmEdJlbe3VwgZqCkZRtfuWFh5GOv0f+gGCfBtzMpIVkmdkj2AObO9y+oiOi81UGwH3aBYuqA==",
+ "dependencies": {
+ "Microsoft.Win32.SystemEvents": "8.0.0"
+ }
},
"System.IO": {
"type": "Transitive",
@@ -438,8 +520,8 @@
},
"System.Memory": {
"type": "Transitive",
- "resolved": "4.6.0",
- "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg=="
+ "resolved": "4.5.5",
+ "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
},
"System.Reflection": {
"type": "Transitive",
@@ -479,8 +561,8 @@
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
- "resolved": "6.1.2",
- "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
+ "resolved": "6.1.0",
+ "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg=="
},
"System.Runtime.Handles": {
"type": "Transitive",
@@ -501,14 +583,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "System.Security.Cryptography.Pkcs": {
- "type": "Transitive",
- "resolved": "8.0.1",
- "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
- "dependencies": {
- "System.Formats.Asn1": "8.0.1"
- }
- },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -539,6 +613,21 @@
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
+ "Vortice.DirectX": {
+ "type": "Transitive",
+ "resolved": "3.2.0",
+ "contentHash": "VvLoA3OMwy8XhsWtP5mO7LWS8mTysPaU9fvAzIJTdatW7TaC7GgA2kpanpbvHSysuJF/O5c9rB7IBukFP4v0aw==",
+ "dependencies": {
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.Mathematics": "1.5.2"
+ }
+ },
+ "Vortice.Mathematics": {
+ "type": "Transitive",
+ "resolved": "1.5.2",
+ "contentHash": "kf/h6LTSCYB3Ii9mFOqQj8843nPkqGt/aYSRreIWB4BZzpXE2RNKLrJqh+7DaPRwr9qu1f28aRaxfOgeXxtKjw=="
+ },
"inkcanvas.controls": {
"type": "Project",
"dependencies": {
@@ -557,6 +646,15 @@
}
},
"net6.0-windows10.0.19041/win-arm64": {
+ "System.Management": {
+ "type": "Direct",
+ "requested": "[6.0.2, )",
+ "resolved": "6.0.2",
+ "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
+ "dependencies": {
+ "System.CodeDom": "6.0.0"
+ }
+ },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -581,6 +679,11 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "Microsoft.Win32.SystemEvents": {
+ "type": "Transitive",
+ "resolved": "8.0.0",
+ "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
+ },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -691,14 +794,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "System.Security.Cryptography.Pkcs": {
- "type": "Transitive",
- "resolved": "8.0.1",
- "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
- "dependencies": {
- "System.Formats.Asn1": "8.0.1"
- }
- },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -728,6 +823,15 @@
}
},
"net6.0-windows10.0.19041/win-x64": {
+ "System.Management": {
+ "type": "Direct",
+ "requested": "[6.0.2, )",
+ "resolved": "6.0.2",
+ "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
+ "dependencies": {
+ "System.CodeDom": "6.0.0"
+ }
+ },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -752,6 +856,11 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "Microsoft.Win32.SystemEvents": {
+ "type": "Transitive",
+ "resolved": "8.0.0",
+ "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
+ },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -862,14 +971,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "System.Security.Cryptography.Pkcs": {
- "type": "Transitive",
- "resolved": "8.0.1",
- "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
- "dependencies": {
- "System.Formats.Asn1": "8.0.1"
- }
- },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -899,6 +1000,15 @@
}
},
"net6.0-windows10.0.19041/win-x86": {
+ "System.Management": {
+ "type": "Direct",
+ "requested": "[6.0.2, )",
+ "resolved": "6.0.2",
+ "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
+ "dependencies": {
+ "System.CodeDom": "6.0.0"
+ }
+ },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -923,6 +1033,11 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "Microsoft.Win32.SystemEvents": {
+ "type": "Transitive",
+ "resolved": "8.0.0",
+ "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
+ },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1033,14 +1148,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "System.Security.Cryptography.Pkcs": {
- "type": "Transitive",
- "resolved": "8.0.1",
- "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
- "dependencies": {
- "System.Formats.Asn1": "8.0.1"
- }
- },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
From f55fac480caa02999ff14f796b0dd2b338d4fd97 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 21:19:59 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0nuget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/InkCanvasForClass.csproj | 36 ++--
Ink Canvas/packages.lock.json | 313 +++++++++-------------------
2 files changed, 119 insertions(+), 230 deletions(-)
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 92f494eb5..f997a050d 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -118,11 +118,11 @@
-
+
all
-
+
@@ -137,29 +137,29 @@
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -617,20 +617,16 @@
CI 的 AnyCPU(=x64 产物)/x86 构建都能带上辅助 exe；单文件发布走 Publish 分支。 -->
-
-
+
+
-
-
+
+
diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json
index 3bb9b2027..2524938ab 100644
--- a/Ink Canvas/packages.lock.json
+++ b/Ink Canvas/packages.lock.json
@@ -23,21 +23,21 @@
},
"CommunityToolkit.Mvvm": {
"type": "Direct",
- "requested": "[8.4.0, )",
- "resolved": "8.4.0",
- "contentHash": "tqVU8yc/ADO9oiTRyTnwhFN68hCwvkliMierptWOudIAvWY1mWCh5VFh+guwHJmpMwfg0J0rY+yyd5Oy7ty9Uw==",
+ "requested": "[8.4.2, )",
+ "resolved": "8.4.2",
+ "contentHash": "WadCzGEc2U+3e20avRLng4qNtt4zoOGWrdUISqJWrHe3/FSnrYjuM5Sb4yQb09LhkBXrrI4Zt3dLKgRMbItsrg==",
"dependencies": {
"System.ComponentModel.Annotations": "5.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.1.0"
+ "System.Runtime.CompilerServices.Unsafe": "6.1.2"
}
},
"Costura.Fody": {
"type": "Direct",
- "requested": "[6.0.0, )",
- "resolved": "6.0.0",
- "contentHash": "3Uriu9GJABMivG0wXMJs6NQ7FNE3pylir1gZEBAWDvpii3cnrmxXnOG44MMDuIVOIk/Xhef7WZFsaCNV+py9qA==",
+ "requested": "[6.2.0, )",
+ "resolved": "6.2.0",
+ "contentHash": "jaX+A6sw6pI7lkLDTvxN7zU8Ja/a50N2xPKF6RYy0J6QF62wVg+hJMXJph2K8XarDaAlxQ82EaKv3fAvUNyRpg==",
"dependencies": {
- "Fody": "6.8.2"
+ "Fody": "6.9.3"
}
},
"gong-wpf-dragdrop": {
@@ -48,11 +48,12 @@
},
"H.NotifyIcon.Wpf": {
"type": "Direct",
- "requested": "[2.0.131, )",
- "resolved": "2.0.131",
- "contentHash": "f71kXNl6PjCqipJ7DQytg1QUBMQ+7j8rF1UyL8UPegymG1G57EYsskdIcf/VmF6JDuts6Dk6F8Hd4ziiz4/3Dw==",
+ "requested": "[2.4.1, )",
+ "resolved": "2.4.1",
+ "contentHash": "aDfDSHCCOWgQoIvAApiog/MhriXibacqANQm+b5GaRCgRg92u5J2QcoW2C+wIblgxhtGx3o32/DCKWRR5C/KLw==",
"dependencies": {
- "H.NotifyIcon": "2.0.131"
+ "H.NotifyIcon": "2.4.1",
+ "System.ValueTuple": "4.5.0"
}
},
"iNKORE.UI.WPF": {
@@ -103,12 +104,11 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Direct",
- "requested": "[6.0.0, )",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "PSmotV19c7E3lKed++uYo1kSiXFI+uTl37CBSrhq+CfLC3FCHjG7R91+xPnNehQfHS1b0Tzo/CCLPWH3qaEheg==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.11"
}
},
"Microsoft.International.Converters.PinYinConverter": {
@@ -190,24 +190,25 @@
},
"PDFsharp": {
"type": "Direct",
- "requested": "[6.1.1, )",
- "resolved": "6.1.1",
- "contentHash": "wxBLG2f713s2Fp2rYxTCReNOcXT/4YX4h4TJW6y75xAEq2iaEjLDjZRgtXW1/IgadzyluIVmw4RqHz1rL4BYKg==",
+ "requested": "[6.2.4, )",
+ "resolved": "6.2.4",
+ "contentHash": "GhTr9F1uOYXHCIEOB5PXIgqn5a8WLsJL2m0eewTA0IvY1j6N4HGXHKKmEyB90/N6vrjmYamf41V9zbmdW2HY3g==",
"dependencies": {
- "Microsoft.Extensions.Logging": "6.0.0"
+ "Microsoft.Extensions.Logging.Abstractions": "8.0.3",
+ "System.Security.Cryptography.Pkcs": "8.0.1"
}
},
"System.ComponentModel.Composition": {
"type": "Direct",
- "requested": "[10.0.5, )",
- "resolved": "10.0.5",
- "contentHash": "Yi8nY2EKRZlZYRPxQ1/E4rrYs6QD1H0UgfcfHhKsCVhNJ4lNULLbly6Dtz6CjH6gZKBf2hZYXzzzzVGhpGLBvw=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "fzO1adhxkoQxrF21SspLAlHf8GOu3BOjq1yMJs+Gn8nxIvNv8k59feK0zFYuX0yBb3Ns50+lBQA2btDOeX9zoA=="
},
"System.Composition.AttributedModel": {
"type": "Direct",
- "requested": "[10.0.5, )",
- "resolved": "10.0.5",
- "contentHash": "Vgb7wwB7ya+lbcwccXHZPSJxeKR7tCkWLgFXO9Wcgbu/NgO5DvNAIHtEkXaEESkcvXdD1iqp2JBcLWGT/xDxEw=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "pexJp2ogcmngQ0GUg0KNtGRzfDgQ/5ZPNapEJ/EMc4rl2Y528cKPigXGdjajbVtvKfER1Tx/5DY3WRiWUgIH5w=="
},
"System.Data.DataSetExtensions": {
"type": "Direct",
@@ -217,11 +218,11 @@
},
"System.Management": {
"type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g==",
"dependencies": {
- "System.CodeDom": "6.0.0"
+ "System.CodeDom": "10.0.11"
}
},
"System.Private.Uri": {
@@ -250,53 +251,27 @@
},
"Vortice.Direct2D1": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "WnB9X333LKA/HL0XMwn+VH91haU6KgR6JLX2RGGwb5JzSHiu5rwpDkEzbDR6JFwCzM4tT+hOCpch34ELWrXeYw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "SDHEmNUT3A4P8yj+g7q3AnRZ9fvqOOe/EoWjsgkHlQ3C9Tkc51rTeZXC9bQPySli+/lFTui8vMs9tpWZqf+AwQ=="
},
"Vortice.Direct3D11": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "BGeaLUXIty564H+QgynR5FH3su6UxKEY8RPVQtMxVVPj2f0PNryaFjVQ0JJJhaEkg6G2/7VF/8tizQZy/DkF9g==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "JgFUswu2mgrSwcd0KRF2AnfeE5VbMEgcicmxPD1g2yXyomPIHbnX3wldBNHPOzzD0URC1WJ/pO1ymfi3imZwvg=="
},
"Vortice.DirectComposition": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "9mba1b+jiyQyoHU1XCxxje2oHtarDQC5/LmZ74tn5oqSre5x7ZdALr96irZSx0RmzB75z+4DD3MXy5mbmFI4mw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Direct2D1": "3.2.0",
- "Vortice.DirectX": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "2/QD9K9UC7z/2FgK8/gVyySfMppwOz006+9eMtrcEbsTwYNxBxJGCeY09oM8Mr7CLOVY581sg89lIES+2URd6A=="
},
"Vortice.DXGI": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "vx0z23UGxpLfYELK9P2HTalcoMd8etqmJzKfU2Ho88e+s4pAtQrUythotpYZ41zS/9cbOo25HhRAXljVmjPTuw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DirectX": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
- }
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "MbAUnTeQ6WD99ctAdrj5CQO2I7oaax0Kt2eVdWSUj0bYP9Ed0726+s7dIHe4+tqhpmINW/dcPt0mNtc72o+E0w=="
},
"WebDav.Client": {
"type": "Direct",
@@ -316,23 +291,25 @@
},
"Fody": {
"type": "Transitive",
- "resolved": "6.8.2",
- "contentHash": "sjGHrtGS1+kcrv99WXCvujOFBTQp4zCH3ZC9wo2LAtVaJkuLpHghQx3y4k1Q8ZKuDAbEw+HE6ZjPUJQK3ejepQ=="
+ "resolved": "6.9.3",
+ "contentHash": "1CUGgFdyECDKgi5HaUBhdv6k+VG9Iy4OCforGfHyar3xQXAJypZkzymgKtWj/4SPd6nSG0Qi7NH71qHrDSZLaA=="
},
"H.GeneratedIcons.System.Drawing": {
"type": "Transitive",
- "resolved": "2.0.131",
- "contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A==",
+ "resolved": "2.4.1",
+ "contentHash": "gjYhuwHQzISqKhcNYaRdDhzKCoqLZii+6TTHP0MQf4Q9+H6z4f4A5Xu/j8B8XpFPQ1grCMlQYREvNyNJT9Q/Bg==",
"dependencies": {
- "System.Drawing.Common": "8.0.0"
+ "System.Drawing.Common": "10.0.0"
}
},
"H.NotifyIcon": {
"type": "Transitive",
- "resolved": "2.0.131",
- "contentHash": "mdznQAfcJFehblFoDUvtmdm1Y9+u1eMN1ffORbdYv5EwreMxkCwvdj8qQn3qnUo9EIJ6h5Xdgqey9Nj4us8w7w==",
+ "resolved": "2.4.1",
+ "contentHash": "nNPgNzo5UHcWYpVLO3AsRlH8fKE9shBA7/WLpZrFZUFbzpKGcLnz15Kmg0pQ851aboAfm3YuHjYFsYQges/pyw==",
"dependencies": {
- "H.GeneratedIcons.System.Drawing": "2.0.131"
+ "H.GeneratedIcons.System.Drawing": "2.4.1",
+ "System.Memory": "4.6.0",
+ "System.Runtime.CompilerServices.Unsafe": "6.1.0"
}
},
"JerryShaw.DirectShowLib": {
@@ -357,41 +334,15 @@
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
- },
- "Microsoft.Extensions.Logging": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
- "dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
- }
+ "resolved": "10.0.11",
+ "contentHash": "/a1aJz4m7ylhEDf25ugQChLQoN5XwoGjWw/BoR/ZWWKsO1v4DdJElS1uyngahz4B/eOzjFk1KNTkarRLE5wsIg=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
- },
- "Microsoft.Extensions.Options": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
+ "resolved": "8.0.3",
+ "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
- }
- },
- "Microsoft.Extensions.Primitives": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
}
},
"Microsoft.NET.StringTools": {
@@ -422,11 +373,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"Microsoft.Windows.SDK.Win32Docs": {
"type": "Transitive",
"resolved": "0.1.42-alpha",
@@ -450,32 +396,10 @@
"resolved": "4.0.0",
"contentHash": "5HKzttVKWeKoDQKJd3+J7Dy1MW6gbNNYfftkVufe2ddFQD0kXjnT1IN3ZJBfF6QVEQmHpQSp+/PT7Jo2YyHFcw=="
},
- "PolySharp": {
- "type": "Transitive",
- "resolved": "1.10.0",
- "contentHash": "+uNyVhhKOskjJLKOwIQ2qGaA0T507FaMbz5RwLAtmRaMaTAcUAZAiZvSk4Z8z6GkmqOyO1zryYNXmO0Vh7IrYQ=="
- },
- "SharpGen.Runtime": {
- "type": "Transitive",
- "resolved": "2.0.0-beta.13",
- "contentHash": "H+Up2Er3ptWzcQ+CAO652fEsBLAmoXqKqtvc/6ycRV9XfLN2XJch0h8CwKQ3muD6eADPFf8Xp+nDQ8wDpcRDlg==",
- "dependencies": {
- "PolySharp": "1.10.0"
- }
- },
- "SharpGen.Runtime.COM": {
- "type": "Transitive",
- "resolved": "2.0.0-beta.13",
- "contentHash": "H22LsE3XTIOevf2TJgPgPnfYmjMlCtN+QYZVxzXlgTrgG2jHSTUTKZpIMPbKliLJGCEnDfX6yvBJvya0/xRTkA==",
- "dependencies": {
- "PolySharp": "1.10.0",
- "SharpGen.Runtime": "2.0.0-beta.13"
- }
- },
"System.CodeDom": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA=="
+ "resolved": "10.0.11",
+ "contentHash": "v40pNeBoZTYsiVxz+PzyZmmIr2JIhpK4VsFpQqZSZCXa51PDlNXIN2ESm8kDU0voZYVfLhxF9HvmBsxCJmkiRg=="
},
"System.Collections.Immutable": {
"type": "Transitive",
@@ -490,21 +414,15 @@
"resolved": "5.0.0",
"contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
},
- "System.Diagnostics.DiagnosticSource": {
+ "System.Drawing.Common": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
+ "resolved": "10.0.0",
+ "contentHash": "kohT9ZZlkB5R5ifihCBnPJLdIUQGiTj1ZI6z4LKatr+F4MmIJJu7qQpBkqt9280ivtnSvlTx9qZEY+CpJ0zMkA=="
},
- "System.Drawing.Common": {
+ "System.Formats.Asn1": {
"type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "JkbHJjtI/dWc5dfmEdJlbe3VwgZqCkZRtfuWFh5GOv0f+gGCfBtzMpIVkmdkj2AObO9y+oiOi81UGwH3aBYuqA==",
- "dependencies": {
- "Microsoft.Win32.SystemEvents": "8.0.0"
- }
+ "resolved": "8.0.1",
+ "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A=="
},
"System.IO": {
"type": "Transitive",
@@ -520,8 +438,8 @@
},
"System.Memory": {
"type": "Transitive",
- "resolved": "4.5.5",
- "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+ "resolved": "4.6.0",
+ "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg=="
},
"System.Reflection": {
"type": "Transitive",
@@ -561,8 +479,8 @@
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
- "resolved": "6.1.0",
- "contentHash": "5o/HZxx6RVqYlhKSq8/zronDkALJZUT2Vz0hx43f0gwe8mwlM0y2nYlqdBwLMzr262Bwvpikeb/yEwkAa5PADg=="
+ "resolved": "6.1.2",
+ "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
},
"System.Runtime.Handles": {
"type": "Transitive",
@@ -583,6 +501,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -613,21 +539,6 @@
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
- "Vortice.DirectX": {
- "type": "Transitive",
- "resolved": "3.2.0",
- "contentHash": "VvLoA3OMwy8XhsWtP5mO7LWS8mTysPaU9fvAzIJTdatW7TaC7GgA2kpanpbvHSysuJF/O5c9rB7IBukFP4v0aw==",
- "dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.Mathematics": "1.5.2"
- }
- },
- "Vortice.Mathematics": {
- "type": "Transitive",
- "resolved": "1.5.2",
- "contentHash": "kf/h6LTSCYB3Ii9mFOqQj8843nPkqGt/aYSRreIWB4BZzpXE2RNKLrJqh+7DaPRwr9qu1f28aRaxfOgeXxtKjw=="
- },
"inkcanvas.controls": {
"type": "Project",
"dependencies": {
@@ -646,15 +557,6 @@
}
},
"net6.0-windows10.0.19041/win-arm64": {
- "System.Management": {
- "type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
- "dependencies": {
- "System.CodeDom": "6.0.0"
- }
- },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -679,11 +581,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -794,6 +691,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -823,15 +728,6 @@
}
},
"net6.0-windows10.0.19041/win-x64": {
- "System.Management": {
- "type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
- "dependencies": {
- "System.CodeDom": "6.0.0"
- }
- },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -856,11 +752,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -971,6 +862,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -1000,15 +899,6 @@
}
},
"net6.0-windows10.0.19041/win-x86": {
- "System.Management": {
- "type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew==",
- "dependencies": {
- "System.CodeDom": "6.0.0"
- }
- },
"System.Runtime.InteropServices": {
"type": "Direct",
"requested": "[4.3.0, )",
@@ -1033,11 +923,6 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "Microsoft.Win32.SystemEvents": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
- },
"runtime.any.System.IO": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1148,6 +1033,14 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
+ "System.Security.Cryptography.Pkcs": {
+ "type": "Transitive",
+ "resolved": "8.0.1",
+ "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "dependencies": {
+ "System.Formats.Asn1": "8.0.1"
+ }
+ },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
From f6ac56d99a38866491e5c75661bfbce216836400 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 21:22:27 +0800
Subject: [PATCH 10/12] Revert "Merge branch 'net6' into net10"
This reverts commit bf5ccf8c213e12da5c1d484e565831838c57a99d, reversing
changes made to 959a1fc545c2375e7927ff6ee27135683e315bcd.
---
Ink Canvas/InkCanvasForClass.csproj | 6 +++++-
Ink Canvas/packages.lock.json | 18 +++++++++---------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index bfe101aae..40bfb38e3 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -128,7 +128,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -649,6 +649,10 @@
false
+
+
+
+
diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json
index 242a28b25..d7616a2f1 100644
--- a/Ink Canvas/packages.lock.json
+++ b/Ink Canvas/packages.lock.json
@@ -121,12 +121,12 @@
},
"Microsoft.Windows.CsWin32": {
"type": "Direct",
- "requested": "[0.3.298, )",
- "resolved": "0.3.298",
- "contentHash": "moz/CojV5HSeJYV9pNVE6mWMKnJGvPgdD31EhBLyUJ8Ui06PBrH9oPFK1ljXbJJMM4EzKnkE1a0AtBbH1BHDGA==",
+ "requested": "[0.3.333, )",
+ "resolved": "0.3.333",
+ "contentHash": "UigiQ8BYaIJfon0FZ9rTy9reygbXr4VijncifNe/Az/GSnqd958ptd1/Hp9u9lyYrwI+3/xeIUHgqrLr1o5hQQ==",
"dependencies": {
"Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha",
- "Microsoft.Windows.SDK.Win32Metadata": "70.0.11-preview",
+ "Microsoft.Windows.SDK.Win32Metadata": "71.0.14-preview",
"Microsoft.Windows.WDK.Win32Metadata": "0.13.25-experimental"
}
},
@@ -138,9 +138,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
- "requested": "[3.9.50, )",
- "resolved": "3.9.50",
- "contentHash": "HtOgGF6jZ+WYbXnCUCYPT8Y2d6mIJo9ozjK/FINTRsXdm4Zgv9GehUMa7EFoGQkqrMcDJNOIDwCmENnvXg4UbA=="
+ "requested": "[3.10.94, )",
+ "resolved": "3.10.94",
+ "contentHash": "sn6gFIx6bwFj3Me0XGmek3gLZi/MZC8C4tRLwslXGeBcXcVxvFpZyDrQA93G8TiYgxTS7J7triKB7hj5wXzSxA=="
},
"Newtonsoft.Json": {
"type": "Direct",
@@ -368,8 +368,8 @@
},
"Microsoft.Windows.SDK.Win32Metadata": {
"type": "Transitive",
- "resolved": "70.0.11-preview",
- "contentHash": "i8Dv2KCKzH8MQAsgLeUa5zFGyQOoz+TlvnbkFUkjsUtqhj4oguVj9rDpVACs5fLayZbwItOSllf+bhwr+z2yeg=="
+ "resolved": "71.0.14-preview",
+ "contentHash": "39I8YpjHYJF7Qncztn6+cu15Ti35myn5QQnLZwN6AngBsfaU1l3Nsxvt2087AlExLxg5a/llFIRSeahK7GW/Dw=="
},
"Microsoft.Windows.WDK.Win32Metadata": {
"type": "Transitive",
From 4ced274a3006d9fcd568bba119f4b04094df8307 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 6 Sep 2026 21:29:49 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=9B=9E=E9=80=80nuget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/InkCanvasForClass.csproj | 47 ++--
Ink Canvas/packages.lock.json | 364 +++++++++++-----------------
2 files changed, 162 insertions(+), 249 deletions(-)
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 40bfb38e3..b881c071f 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -119,16 +119,16 @@
-
+
all
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -137,18 +137,17 @@
-
-
-
+
+
-
+
-
+
@@ -157,14 +156,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -620,16 +619,20 @@
CI 的 AnyCPU(=x64 产物)/x86 构建都能带上辅助 exe；单文件发布走 Publish 分支。 -->
-
-
+
+
-
-
+
+
@@ -649,10 +652,6 @@
false
-
-
-
-
diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json
index d7616a2f1..eac32d6a4 100644
--- a/Ink Canvas/packages.lock.json
+++ b/Ink Canvas/packages.lock.json
@@ -23,21 +23,17 @@
},
"CommunityToolkit.Mvvm": {
"type": "Direct",
- "requested": "[8.4.2, )",
- "resolved": "8.4.2",
- "contentHash": "WadCzGEc2U+3e20avRLng4qNtt4zoOGWrdUISqJWrHe3/FSnrYjuM5Sb4yQb09LhkBXrrI4Zt3dLKgRMbItsrg==",
- "dependencies": {
- "System.ComponentModel.Annotations": "5.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.1.2"
- }
+ "requested": "[8.4.0, )",
+ "resolved": "8.4.0",
+ "contentHash": "tqVU8yc/ADO9oiTRyTnwhFN68hCwvkliMierptWOudIAvWY1mWCh5VFh+guwHJmpMwfg0J0rY+yyd5Oy7ty9Uw=="
},
"Costura.Fody": {
"type": "Direct",
- "requested": "[6.2.0, )",
- "resolved": "6.2.0",
- "contentHash": "jaX+A6sw6pI7lkLDTvxN7zU8Ja/a50N2xPKF6RYy0J6QF62wVg+hJMXJph2K8XarDaAlxQ82EaKv3fAvUNyRpg==",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "3Uriu9GJABMivG0wXMJs6NQ7FNE3pylir1gZEBAWDvpii3cnrmxXnOG44MMDuIVOIk/Xhef7WZFsaCNV+py9qA==",
"dependencies": {
- "Fody": "6.9.3"
+ "Fody": "6.8.2"
}
},
"gong-wpf-dragdrop": {
@@ -48,12 +44,11 @@
},
"H.NotifyIcon.Wpf": {
"type": "Direct",
- "requested": "[2.4.1, )",
- "resolved": "2.4.1",
- "contentHash": "aDfDSHCCOWgQoIvAApiog/MhriXibacqANQm+b5GaRCgRg92u5J2QcoW2C+wIblgxhtGx3o32/DCKWRR5C/KLw==",
+ "requested": "[2.0.131, )",
+ "resolved": "2.0.131",
+ "contentHash": "f71kXNl6PjCqipJ7DQytg1QUBMQ+7j8rF1UyL8UPegymG1G57EYsskdIcf/VmF6JDuts6Dk6F8Hd4ziiz4/3Dw==",
"dependencies": {
- "H.NotifyIcon": "2.4.1",
- "System.ValueTuple": "4.5.0"
+ "H.NotifyIcon": "2.0.131"
}
},
"iNKORE.UI.WPF": {
@@ -94,11 +89,11 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "PSmotV19c7E3lKed++uYo1kSiXFI+uTl37CBSrhq+CfLC3FCHjG7R91+xPnNehQfHS1b0Tzo/CCLPWH3qaEheg==",
+ "requested": "[6.0.0, )",
+ "resolved": "6.0.0",
+ "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.11"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0"
}
},
"Microsoft.International.Converters.PinYinConverter": {
@@ -121,12 +116,12 @@
},
"Microsoft.Windows.CsWin32": {
"type": "Direct",
- "requested": "[0.3.333, )",
- "resolved": "0.3.333",
- "contentHash": "UigiQ8BYaIJfon0FZ9rTy9reygbXr4VijncifNe/Az/GSnqd958ptd1/Hp9u9lyYrwI+3/xeIUHgqrLr1o5hQQ==",
+ "requested": "[0.3.298, )",
+ "resolved": "0.3.298",
+ "contentHash": "moz/CojV5HSeJYV9pNVE6mWMKnJGvPgdD31EhBLyUJ8Ui06PBrH9oPFK1ljXbJJMM4EzKnkE1a0AtBbH1BHDGA==",
"dependencies": {
"Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha",
- "Microsoft.Windows.SDK.Win32Metadata": "71.0.14-preview",
+ "Microsoft.Windows.SDK.Win32Metadata": "70.0.11-preview",
"Microsoft.Windows.WDK.Win32Metadata": "0.13.25-experimental"
}
},
@@ -138,9 +133,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
- "requested": "[3.10.94, )",
- "resolved": "3.10.94",
- "contentHash": "sn6gFIx6bwFj3Me0XGmek3gLZi/MZC8C4tRLwslXGeBcXcVxvFpZyDrQA93G8TiYgxTS7J7triKB7hj5wXzSxA=="
+ "requested": "[3.9.50, )",
+ "resolved": "3.9.50",
+ "contentHash": "HtOgGF6jZ+WYbXnCUCYPT8Y2d6mIJo9ozjK/FINTRsXdm4Zgv9GehUMa7EFoGQkqrMcDJNOIDwCmENnvXg4UbA=="
},
"Newtonsoft.Json": {
"type": "Direct",
@@ -185,25 +180,24 @@
},
"PDFsharp": {
"type": "Direct",
- "requested": "[6.2.4, )",
- "resolved": "6.2.4",
- "contentHash": "GhTr9F1uOYXHCIEOB5PXIgqn5a8WLsJL2m0eewTA0IvY1j6N4HGXHKKmEyB90/N6vrjmYamf41V9zbmdW2HY3g==",
+ "requested": "[6.1.1, )",
+ "resolved": "6.1.1",
+ "contentHash": "wxBLG2f713s2Fp2rYxTCReNOcXT/4YX4h4TJW6y75xAEq2iaEjLDjZRgtXW1/IgadzyluIVmw4RqHz1rL4BYKg==",
"dependencies": {
- "Microsoft.Extensions.Logging.Abstractions": "8.0.3",
- "System.Security.Cryptography.Pkcs": "8.0.1"
+ "Microsoft.Extensions.Logging": "6.0.0"
}
},
"System.ComponentModel.Composition": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "fzO1adhxkoQxrF21SspLAlHf8GOu3BOjq1yMJs+Gn8nxIvNv8k59feK0zFYuX0yBb3Ns50+lBQA2btDOeX9zoA=="
+ "requested": "[10.0.5, )",
+ "resolved": "10.0.5",
+ "contentHash": "Yi8nY2EKRZlZYRPxQ1/E4rrYs6QD1H0UgfcfHhKsCVhNJ4lNULLbly6Dtz6CjH6gZKBf2hZYXzzzzVGhpGLBvw=="
},
"System.Composition.AttributedModel": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "pexJp2ogcmngQ0GUg0KNtGRzfDgQ/5ZPNapEJ/EMc4rl2Y528cKPigXGdjajbVtvKfER1Tx/5DY3WRiWUgIH5w=="
+ "requested": "[10.0.5, )",
+ "resolved": "10.0.5",
+ "contentHash": "Vgb7wwB7ya+lbcwccXHZPSJxeKR7tCkWLgFXO9Wcgbu/NgO5DvNAIHtEkXaEESkcvXdD1iqp2JBcLWGT/xDxEw=="
},
"System.Data.DataSetExtensions": {
"type": "Direct",
@@ -213,60 +207,59 @@
},
"System.Management": {
"type": "Direct",
- "requested": "[10.0.11, )",
- "resolved": "10.0.11",
- "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g==",
- "dependencies": {
- "System.CodeDom": "10.0.11"
- }
+ "requested": "[6.0.2, )",
+ "resolved": "6.0.2",
+ "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew=="
},
- "System.Private.Uri": {
+ "Vortice.Direct2D1": {
"type": "Direct",
- "requested": "[4.3.2, )",
- "resolved": "4.3.2",
- "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==",
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "WnB9X333LKA/HL0XMwn+VH91haU6KgR6JLX2RGGwb5JzSHiu5rwpDkEzbDR6JFwCzM4tT+hOCpch34ELWrXeYw==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3"
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DXGI": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
}
},
- "System.Runtime.InteropServices": {
+ "Vortice.Direct3D11": {
"type": "Direct",
- "requested": "[4.3.0, )",
- "resolved": "4.3.0",
- "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==",
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "BGeaLUXIty564H+QgynR5FH3su6UxKEY8RPVQtMxVVPj2f0PNryaFjVQ0JJJhaEkg6G2/7VF/8tizQZy/DkF9g==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0"
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DXGI": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
}
},
- "Vortice.Direct2D1": {
- "type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "SDHEmNUT3A4P8yj+g7q3AnRZ9fvqOOe/EoWjsgkHlQ3C9Tkc51rTeZXC9bQPySli+/lFTui8vMs9tpWZqf+AwQ=="
- },
- "Vortice.Direct3D11": {
- "type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "JgFUswu2mgrSwcd0KRF2AnfeE5VbMEgcicmxPD1g2yXyomPIHbnX3wldBNHPOzzD0URC1WJ/pO1ymfi3imZwvg=="
- },
"Vortice.DirectComposition": {
"type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "2/QD9K9UC7z/2FgK8/gVyySfMppwOz006+9eMtrcEbsTwYNxBxJGCeY09oM8Mr7CLOVY581sg89lIES+2URd6A=="
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "9mba1b+jiyQyoHU1XCxxje2oHtarDQC5/LmZ74tn5oqSre5x7ZdALr96irZSx0RmzB75z+4DD3MXy5mbmFI4mw==",
+ "dependencies": {
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DXGI": "3.2.0",
+ "Vortice.Direct2D1": "3.2.0",
+ "Vortice.DirectX": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
+ }
},
"Vortice.DXGI": {
"type": "Direct",
- "requested": "[3.8.3, )",
- "resolved": "3.8.3",
- "contentHash": "MbAUnTeQ6WD99ctAdrj5CQO2I7oaax0Kt2eVdWSUj0bYP9Ed0726+s7dIHe4+tqhpmINW/dcPt0mNtc72o+E0w=="
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "vx0z23UGxpLfYELK9P2HTalcoMd8etqmJzKfU2Ho88e+s4pAtQrUythotpYZ41zS/9cbOo25HhRAXljVmjPTuw==",
+ "dependencies": {
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.DirectX": "3.2.0",
+ "Vortice.Mathematics": "1.5.2"
+ }
},
"WebDav.Client": {
"type": "Direct",
@@ -301,25 +294,20 @@
},
"Fody": {
"type": "Transitive",
- "resolved": "6.9.3",
- "contentHash": "1CUGgFdyECDKgi5HaUBhdv6k+VG9Iy4OCforGfHyar3xQXAJypZkzymgKtWj/4SPd6nSG0Qi7NH71qHrDSZLaA=="
+ "resolved": "6.8.2",
+ "contentHash": "sjGHrtGS1+kcrv99WXCvujOFBTQp4zCH3ZC9wo2LAtVaJkuLpHghQx3y4k1Q8ZKuDAbEw+HE6ZjPUJQK3ejepQ=="
},
"H.GeneratedIcons.System.Drawing": {
"type": "Transitive",
- "resolved": "2.4.1",
- "contentHash": "gjYhuwHQzISqKhcNYaRdDhzKCoqLZii+6TTHP0MQf4Q9+H6z4f4A5Xu/j8B8XpFPQ1grCMlQYREvNyNJT9Q/Bg==",
- "dependencies": {
- "System.Drawing.Common": "10.0.0"
- }
+ "resolved": "2.0.131",
+ "contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A=="
},
"H.NotifyIcon": {
"type": "Transitive",
- "resolved": "2.4.1",
- "contentHash": "nNPgNzo5UHcWYpVLO3AsRlH8fKE9shBA7/WLpZrFZUFbzpKGcLnz15Kmg0pQ851aboAfm3YuHjYFsYQges/pyw==",
+ "resolved": "2.0.131",
+ "contentHash": "mdznQAfcJFehblFoDUvtmdm1Y9+u1eMN1ffORbdYv5EwreMxkCwvdj8qQn3qnUo9EIJ6h5Xdgqey9Nj4us8w7w==",
"dependencies": {
- "H.GeneratedIcons.System.Drawing": "2.4.1",
- "System.Memory": "4.6.0",
- "System.Runtime.CompilerServices.Unsafe": "6.1.0"
+ "H.GeneratedIcons.System.Drawing": "2.0.131"
}
},
"MdXaml.Plugins": {
@@ -339,27 +327,43 @@
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
- "resolved": "10.0.11",
- "contentHash": "/a1aJz4m7ylhEDf25ugQChLQoN5XwoGjWw/BoR/ZWWKsO1v4DdJElS1uyngahz4B/eOzjFk1KNTkarRLE5wsIg=="
+ "resolved": "6.0.0",
+ "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
},
- "Microsoft.Extensions.Logging.Abstractions": {
+ "Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "8.0.3",
- "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==",
+ "resolved": "6.0.0",
+ "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+ "Microsoft.Extensions.DependencyInjection": "6.0.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
+ "Microsoft.Extensions.Options": "6.0.0"
}
},
- "Microsoft.NET.StringTools": {
+ "Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "17.11.4",
- "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA==",
+ "resolved": "6.0.0",
+ "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+ },
+ "Microsoft.Extensions.Options": {
+ "type": "Transitive",
+ "resolved": "6.0.0",
+ "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
"dependencies": {
- "System.Memory": "4.5.5",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+ "Microsoft.Extensions.Primitives": "6.0.0"
}
},
- "Microsoft.NETCore.Platforms": {
+ "Microsoft.Extensions.Primitives": {
+ "type": "Transitive",
+ "resolved": "6.0.0",
+ "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ=="
+ },
+ "Microsoft.NET.StringTools": {
+ "type": "Transitive",
+ "resolved": "17.11.4",
+ "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA=="
},
"Microsoft.Windows.SDK.Win32Docs": {
"type": "Transitive",
@@ -368,8 +372,8 @@
},
"Microsoft.Windows.SDK.Win32Metadata": {
"type": "Transitive",
- "resolved": "71.0.14-preview",
- "contentHash": "39I8YpjHYJF7Qncztn6+cu15Ti35myn5QQnLZwN6AngBsfaU1l3Nsxvt2087AlExLxg5a/llFIRSeahK7GW/Dw=="
+ "resolved": "70.0.11-preview",
+ "contentHash": "i8Dv2KCKzH8MQAsgLeUa5zFGyQOoz+TlvnbkFUkjsUtqhj4oguVj9rDpVACs5fLayZbwItOSllf+bhwr+z2yeg=="
},
"Microsoft.Windows.WDK.Win32Metadata": {
"type": "Transitive",
@@ -384,150 +388,60 @@
"resolved": "4.0.0",
"contentHash": "5HKzttVKWeKoDQKJd3+J7Dy1MW6gbNNYfftkVufe2ddFQD0kXjnT1IN3ZJBfF6QVEQmHpQSp+/PT7Jo2YyHFcw=="
},
- "System.CodeDom": {
+ "OpenCvSharp4": {
"type": "Transitive",
- "resolved": "10.0.11",
- "contentHash": "v40pNeBoZTYsiVxz+PzyZmmIr2JIhpK4VsFpQqZSZCXa51PDlNXIN2ESm8kDU0voZYVfLhxF9HvmBsxCJmkiRg=="
- },
- "System.Collections.Immutable": {
- "type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
- "System.Drawing.Common": {
- "type": "Transitive",
- "resolved": "10.0.0",
- "contentHash": "kohT9ZZlkB5R5ifihCBnPJLdIUQGiTj1ZI6z4LKatr+F4MmIJJu7qQpBkqt9280ivtnSvlTx9qZEY+CpJ0zMkA=="
- },
- "System.Formats.Asn1": {
- "type": "Transitive",
- "resolved": "8.0.1",
- "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A=="
- },
- "System.IO": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.Memory": {
- "type": "Transitive",
- "resolved": "4.6.0",
- "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg=="
- },
- "System.Reflection": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.IO": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Reflection.Emit": {
- "type": "Transitive",
- "resolved": "4.7.0",
- "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ=="
- },
- "System.Reflection.Primitives": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Runtime": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
+ "resolved": "4.13.0.20260627",
+ "contentHash": "nYk95jkyYY9f0sF5KqZ3OB1SWkmqsfV7eN0ROiQds/rxpSn0v1G0QIedMbwuqbdPhvQnOIG2DDmpkLnHEJMh8Q=="
},
- "System.Runtime.CompilerServices.Unsafe": {
+ "OpenCvSharp4.runtime.win": {
"type": "Transitive",
- "resolved": "6.1.2",
- "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
+ "resolved": "4.13.0.20260627",
+ "contentHash": "POIxR+CTpwHJIdam6wd8U2fprWv5QnIUw50jw79WEGb37He3T1h11SdtwSj9p2PLSfrzonMjO2t71wqi5uFsoQ=="
},
- "System.Runtime.Handles": {
+ "OpenCvSharp4.WpfExtensions": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
+ "resolved": "4.13.0.20260627",
+ "contentHash": "6cxOJWTuwUGFPgeyrjCQGVtulK25ej1G6f+wW5fVUrgPSNKlUCOOpPAkgq1kHFJ22mNJAlIR8OrKpafBtS8kCA==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "OpenCvSharp4": "4.13.0.20260627"
}
},
- "System.Security.AccessControl": {
+ "PolySharp": {
"type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "5.0.0",
- "System.Security.Principal.Windows": "5.0.0"
- }
+ "resolved": "1.10.0",
+ "contentHash": "+uNyVhhKOskjJLKOwIQ2qGaA0T507FaMbz5RwLAtmRaMaTAcUAZAiZvSk4Z8z6GkmqOyO1zryYNXmO0Vh7IrYQ=="
},
- "System.Security.Cryptography.Pkcs": {
+ "SharpGen.Runtime": {
"type": "Transitive",
- "resolved": "8.0.1",
- "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==",
+ "resolved": "2.0.0-beta.13",
+ "contentHash": "H+Up2Er3ptWzcQ+CAO652fEsBLAmoXqKqtvc/6ycRV9XfLN2XJch0h8CwKQ3muD6eADPFf8Xp+nDQ8wDpcRDlg==",
"dependencies": {
- "System.Formats.Asn1": "8.0.1"
+ "PolySharp": "1.10.0"
}
},
- "System.Security.Principal.Windows": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
- },
- "System.Text.Encoding": {
+ "SharpGen.Runtime.COM": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==",
+ "resolved": "2.0.0-beta.13",
+ "contentHash": "H22LsE3XTIOevf2TJgPgPnfYmjMlCtN+QYZVxzXlgTrgG2jHSTUTKZpIMPbKliLJGCEnDfX6yvBJvya0/xRTkA==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
+ "PolySharp": "1.10.0",
+ "SharpGen.Runtime": "2.0.0-beta.13"
}
},
- "System.Threading.Tasks": {
+ "Vortice.DirectX": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==",
+ "resolved": "3.2.0",
+ "contentHash": "VvLoA3OMwy8XhsWtP5mO7LWS8mTysPaU9fvAzIJTdatW7TaC7GgA2kpanpbvHSysuJF/O5c9rB7IBukFP4v0aw==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "SharpGen.Runtime": "2.0.0-beta.13",
+ "SharpGen.Runtime.COM": "2.0.0-beta.13",
+ "Vortice.Mathematics": "1.5.2"
}
},
- "System.ValueTuple": {
+ "Vortice.Mathematics": {
"type": "Transitive",
- "resolved": "4.5.0",
- "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+ "resolved": "1.5.2",
+ "contentHash": "kf/h6LTSCYB3Ii9mFOqQj8843nPkqGt/aYSRreIWB4BZzpXE2RNKLrJqh+7DaPRwr9qu1f28aRaxfOgeXxtKjw=="
},
"inkcanvas.controls": {
"type": "Project",
From 60f8f4ab1660f0925bf3b1057697cc86b3ed6322 Mon Sep 17 00:00:00 2001
From: AstrZero
Date: Sun, 6 Sep 2026 21:36:37 +0800
Subject: [PATCH 12/12] Update: Nuget
---
Ink Canvas/InkCanvasForClass.csproj | 36 +++--
Ink Canvas/packages.lock.json | 205 +++++++++++-----------------
2 files changed, 99 insertions(+), 142 deletions(-)
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index b881c071f..e3e7e6042 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -119,11 +119,11 @@
-
+
all
-
+
@@ -137,17 +137,17 @@
-
-
+
+
-
+
-
+
@@ -156,12 +156,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -619,20 +619,16 @@
CI 的 AnyCPU(=x64 产物)/x86 构建都能带上辅助 exe；单文件发布走 Publish 分支。 -->
-
-
+
+
-
-
+
+
diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json
index eac32d6a4..2601f0567 100644
--- a/Ink Canvas/packages.lock.json
+++ b/Ink Canvas/packages.lock.json
@@ -23,17 +23,17 @@
},
"CommunityToolkit.Mvvm": {
"type": "Direct",
- "requested": "[8.4.0, )",
- "resolved": "8.4.0",
- "contentHash": "tqVU8yc/ADO9oiTRyTnwhFN68hCwvkliMierptWOudIAvWY1mWCh5VFh+guwHJmpMwfg0J0rY+yyd5Oy7ty9Uw=="
+ "requested": "[8.4.2, )",
+ "resolved": "8.4.2",
+ "contentHash": "WadCzGEc2U+3e20avRLng4qNtt4zoOGWrdUISqJWrHe3/FSnrYjuM5Sb4yQb09LhkBXrrI4Zt3dLKgRMbItsrg=="
},
"Costura.Fody": {
"type": "Direct",
- "requested": "[6.0.0, )",
- "resolved": "6.0.0",
- "contentHash": "3Uriu9GJABMivG0wXMJs6NQ7FNE3pylir1gZEBAWDvpii3cnrmxXnOG44MMDuIVOIk/Xhef7WZFsaCNV+py9qA==",
+ "requested": "[6.2.0, )",
+ "resolved": "6.2.0",
+ "contentHash": "jaX+A6sw6pI7lkLDTvxN7zU8Ja/a50N2xPKF6RYy0J6QF62wVg+hJMXJph2K8XarDaAlxQ82EaKv3fAvUNyRpg==",
"dependencies": {
- "Fody": "6.8.2"
+ "Fody": "6.9.3"
}
},
"gong-wpf-dragdrop": {
@@ -44,11 +44,11 @@
},
"H.NotifyIcon.Wpf": {
"type": "Direct",
- "requested": "[2.0.131, )",
- "resolved": "2.0.131",
- "contentHash": "f71kXNl6PjCqipJ7DQytg1QUBMQ+7j8rF1UyL8UPegymG1G57EYsskdIcf/VmF6JDuts6Dk6F8Hd4ziiz4/3Dw==",
+ "requested": "[2.4.1, )",
+ "resolved": "2.4.1",
+ "contentHash": "aDfDSHCCOWgQoIvAApiog/MhriXibacqANQm+b5GaRCgRg92u5J2QcoW2C+wIblgxhtGx3o32/DCKWRR5C/KLw==",
"dependencies": {
- "H.NotifyIcon": "2.0.131"
+ "H.NotifyIcon": "2.4.1"
}
},
"iNKORE.UI.WPF": {
@@ -89,11 +89,11 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Direct",
- "requested": "[6.0.0, )",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "PSmotV19c7E3lKed++uYo1kSiXFI+uTl37CBSrhq+CfLC3FCHjG7R91+xPnNehQfHS1b0Tzo/CCLPWH3qaEheg==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.11"
}
},
"Microsoft.International.Converters.PinYinConverter": {
@@ -180,24 +180,24 @@
},
"PDFsharp": {
"type": "Direct",
- "requested": "[6.1.1, )",
- "resolved": "6.1.1",
- "contentHash": "wxBLG2f713s2Fp2rYxTCReNOcXT/4YX4h4TJW6y75xAEq2iaEjLDjZRgtXW1/IgadzyluIVmw4RqHz1rL4BYKg==",
+ "requested": "[6.2.4, )",
+ "resolved": "6.2.4",
+ "contentHash": "GhTr9F1uOYXHCIEOB5PXIgqn5a8WLsJL2m0eewTA0IvY1j6N4HGXHKKmEyB90/N6vrjmYamf41V9zbmdW2HY3g==",
"dependencies": {
- "Microsoft.Extensions.Logging": "6.0.0"
+ "Microsoft.Extensions.Logging.Abstractions": "8.0.3"
}
},
"System.ComponentModel.Composition": {
"type": "Direct",
- "requested": "[10.0.5, )",
- "resolved": "10.0.5",
- "contentHash": "Yi8nY2EKRZlZYRPxQ1/E4rrYs6QD1H0UgfcfHhKsCVhNJ4lNULLbly6Dtz6CjH6gZKBf2hZYXzzzzVGhpGLBvw=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "fzO1adhxkoQxrF21SspLAlHf8GOu3BOjq1yMJs+Gn8nxIvNv8k59feK0zFYuX0yBb3Ns50+lBQA2btDOeX9zoA=="
},
"System.Composition.AttributedModel": {
"type": "Direct",
- "requested": "[10.0.5, )",
- "resolved": "10.0.5",
- "contentHash": "Vgb7wwB7ya+lbcwccXHZPSJxeKR7tCkWLgFXO9Wcgbu/NgO5DvNAIHtEkXaEESkcvXdD1iqp2JBcLWGT/xDxEw=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "pexJp2ogcmngQ0GUg0KNtGRzfDgQ/5ZPNapEJ/EMc4rl2Y528cKPigXGdjajbVtvKfER1Tx/5DY3WRiWUgIH5w=="
},
"System.Data.DataSetExtensions": {
"type": "Direct",
@@ -207,58 +207,50 @@
},
"System.Management": {
"type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g=="
},
"Vortice.Direct2D1": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "WnB9X333LKA/HL0XMwn+VH91haU6KgR6JLX2RGGwb5JzSHiu5rwpDkEzbDR6JFwCzM4tT+hOCpch34ELWrXeYw==",
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "SDHEmNUT3A4P8yj+g7q3AnRZ9fvqOOe/EoWjsgkHlQ3C9Tkc51rTeZXC9bQPySli+/lFTui8vMs9tpWZqf+AwQ==",
"dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
+ "SharpGen.Runtime": "2.4.2-beta",
+ "Vortice.DXGI": "3.8.3"
}
},
"Vortice.Direct3D11": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "BGeaLUXIty564H+QgynR5FH3su6UxKEY8RPVQtMxVVPj2f0PNryaFjVQ0JJJhaEkg6G2/7VF/8tizQZy/DkF9g==",
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "JgFUswu2mgrSwcd0KRF2AnfeE5VbMEgcicmxPD1g2yXyomPIHbnX3wldBNHPOzzD0URC1WJ/pO1ymfi3imZwvg==",
"dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
+ "SharpGen.Runtime": "2.4.2-beta",
+ "Vortice.DXGI": "3.8.3"
}
},
"Vortice.DirectComposition": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "9mba1b+jiyQyoHU1XCxxje2oHtarDQC5/LmZ74tn5oqSre5x7ZdALr96irZSx0RmzB75z+4DD3MXy5mbmFI4mw==",
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "2/QD9K9UC7z/2FgK8/gVyySfMppwOz006+9eMtrcEbsTwYNxBxJGCeY09oM8Mr7CLOVY581sg89lIES+2URd6A==",
"dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DXGI": "3.2.0",
- "Vortice.Direct2D1": "3.2.0",
- "Vortice.DirectX": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
+ "SharpGen.Runtime": "2.4.2-beta",
+ "Vortice.DXGI": "3.8.3",
+ "Vortice.Direct2D1": "3.8.3",
+ "Vortice.DirectX": "3.8.3"
}
},
"Vortice.DXGI": {
"type": "Direct",
- "requested": "[3.2.0, )",
- "resolved": "3.2.0",
- "contentHash": "vx0z23UGxpLfYELK9P2HTalcoMd8etqmJzKfU2Ho88e+s4pAtQrUythotpYZ41zS/9cbOo25HhRAXljVmjPTuw==",
+ "requested": "[3.8.3, )",
+ "resolved": "3.8.3",
+ "contentHash": "MbAUnTeQ6WD99ctAdrj5CQO2I7oaax0Kt2eVdWSUj0bYP9Ed0726+s7dIHe4+tqhpmINW/dcPt0mNtc72o+E0w==",
"dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.DirectX": "3.2.0",
- "Vortice.Mathematics": "1.5.2"
+ "SharpGen.Runtime": "2.4.2-beta",
+ "Vortice.DirectX": "3.8.3"
}
},
"WebDav.Client": {
@@ -294,20 +286,20 @@
},
"Fody": {
"type": "Transitive",
- "resolved": "6.8.2",
- "contentHash": "sjGHrtGS1+kcrv99WXCvujOFBTQp4zCH3ZC9wo2LAtVaJkuLpHghQx3y4k1Q8ZKuDAbEw+HE6ZjPUJQK3ejepQ=="
+ "resolved": "6.9.3",
+ "contentHash": "1CUGgFdyECDKgi5HaUBhdv6k+VG9Iy4OCforGfHyar3xQXAJypZkzymgKtWj/4SPd6nSG0Qi7NH71qHrDSZLaA=="
},
"H.GeneratedIcons.System.Drawing": {
"type": "Transitive",
- "resolved": "2.0.131",
- "contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A=="
+ "resolved": "2.4.1",
+ "contentHash": "gjYhuwHQzISqKhcNYaRdDhzKCoqLZii+6TTHP0MQf4Q9+H6z4f4A5Xu/j8B8XpFPQ1grCMlQYREvNyNJT9Q/Bg=="
},
"H.NotifyIcon": {
"type": "Transitive",
- "resolved": "2.0.131",
- "contentHash": "mdznQAfcJFehblFoDUvtmdm1Y9+u1eMN1ffORbdYv5EwreMxkCwvdj8qQn3qnUo9EIJ6h5Xdgqey9Nj4us8w7w==",
+ "resolved": "2.4.1",
+ "contentHash": "nNPgNzo5UHcWYpVLO3AsRlH8fKE9shBA7/WLpZrFZUFbzpKGcLnz15Kmg0pQ851aboAfm3YuHjYFsYQges/pyw==",
"dependencies": {
- "H.GeneratedIcons.System.Drawing": "2.0.131"
+ "H.GeneratedIcons.System.Drawing": "2.4.1"
}
},
"MdXaml.Plugins": {
@@ -327,39 +319,17 @@
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
- },
- "Microsoft.Extensions.Logging": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
- "dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0"
- }
+ "resolved": "10.0.11",
+ "contentHash": "/a1aJz4m7ylhEDf25ugQChLQoN5XwoGjWw/BoR/ZWWKsO1v4DdJElS1uyngahz4B/eOzjFk1KNTkarRLE5wsIg=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
- },
- "Microsoft.Extensions.Options": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
+ "resolved": "8.0.3",
+ "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
}
},
- "Microsoft.Extensions.Primitives": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ=="
- },
"Microsoft.NET.StringTools": {
"type": "Transitive",
"resolved": "17.11.4",
@@ -406,42 +376,33 @@
"OpenCvSharp4": "4.13.0.20260627"
}
},
- "PolySharp": {
- "type": "Transitive",
- "resolved": "1.10.0",
- "contentHash": "+uNyVhhKOskjJLKOwIQ2qGaA0T507FaMbz5RwLAtmRaMaTAcUAZAiZvSk4Z8z6GkmqOyO1zryYNXmO0Vh7IrYQ=="
- },
"SharpGen.Runtime": {
"type": "Transitive",
- "resolved": "2.0.0-beta.13",
- "contentHash": "H+Up2Er3ptWzcQ+CAO652fEsBLAmoXqKqtvc/6ycRV9XfLN2XJch0h8CwKQ3muD6eADPFf8Xp+nDQ8wDpcRDlg==",
- "dependencies": {
- "PolySharp": "1.10.0"
- }
+ "resolved": "2.4.2-beta",
+ "contentHash": "niTtWAUov1F7wZGAlVeEvW+Tnqvg5yTmhI7rxmYu2Utoyu2TbC9tWWpUpMs0PQg5lu5svoYpCAztNjxCqMFP/w=="
},
"SharpGen.Runtime.COM": {
"type": "Transitive",
- "resolved": "2.0.0-beta.13",
- "contentHash": "H22LsE3XTIOevf2TJgPgPnfYmjMlCtN+QYZVxzXlgTrgG2jHSTUTKZpIMPbKliLJGCEnDfX6yvBJvya0/xRTkA==",
+ "resolved": "2.4.2-beta",
+ "contentHash": "9lxDFMiepqo3lJQzMSjECCIONeCc2f3Drokgj6HtrTLZcJSftNgcLbD6/iXYj2iphkwgrZb1oLsDOZxoFZkawQ==",
"dependencies": {
- "PolySharp": "1.10.0",
- "SharpGen.Runtime": "2.0.0-beta.13"
+ "SharpGen.Runtime": "2.4.2-beta"
}
},
"Vortice.DirectX": {
"type": "Transitive",
- "resolved": "3.2.0",
- "contentHash": "VvLoA3OMwy8XhsWtP5mO7LWS8mTysPaU9fvAzIJTdatW7TaC7GgA2kpanpbvHSysuJF/O5c9rB7IBukFP4v0aw==",
+ "resolved": "3.8.3",
+ "contentHash": "nKwSavv0w5rDF7prSefqAVPDcTyqrfZxKFMVfttiXPfm62VdA/1d+b3PhCZpW4xO7jXczXDwjQdWgD1zGsvM8w==",
"dependencies": {
- "SharpGen.Runtime": "2.0.0-beta.13",
- "SharpGen.Runtime.COM": "2.0.0-beta.13",
- "Vortice.Mathematics": "1.5.2"
+ "SharpGen.Runtime": "2.4.2-beta",
+ "SharpGen.Runtime.COM": "2.4.2-beta",
+ "Vortice.Mathematics": "2.1.0"
}
},
"Vortice.Mathematics": {
"type": "Transitive",
- "resolved": "1.5.2",
- "contentHash": "kf/h6LTSCYB3Ii9mFOqQj8843nPkqGt/aYSRreIWB4BZzpXE2RNKLrJqh+7DaPRwr9qu1f28aRaxfOgeXxtKjw=="
+ "resolved": "2.1.0",
+ "contentHash": "KK+SjNSuKdP+zbavekubi+vaeb1Jo4k87ZF6CMkVWjr6RjJwc8peVtmgzXXDIMy4ZC3ZISyk3llY3q65ISOkBQ=="
},
"inkcanvas.controls": {
"type": "Project",
@@ -463,9 +424,9 @@
"net10.0-windows10.0.19041/win-arm64": {
"System.Management": {
"type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g=="
},
"WPFMediaKit": {
"type": "Direct",
@@ -486,9 +447,9 @@
"net10.0-windows10.0.19041/win-x64": {
"System.Management": {
"type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g=="
},
"WPFMediaKit": {
"type": "Direct",
@@ -509,9 +470,9 @@
"net10.0-windows10.0.19041/win-x86": {
"System.Management": {
"type": "Direct",
- "requested": "[6.0.2, )",
- "resolved": "6.0.2",
- "contentHash": "s6c9x2Kghd+ncEDnT6ApYVOacDXr/Y57oSUSx6wjegMOfKxhtrXn3PdASPNU59y3kB9OJ1yb3l5k6uKr3bhqew=="
+ "requested": "[10.0.11, )",
+ "resolved": "10.0.11",
+ "contentHash": "xyNn8KGbWI88LoUwg3rB8qcpFFST6dr8Ro/qS8GBu2GOwR0v7J82kVFHTiiPtvEKS79VbMTxs/sIKQ+Cq1Zs1g=="
},
"WPFMediaKit": {
"type": "Direct",