CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决nuget问题

Browse Source
This commit is contained in:
CJKmkp
2026-04-05 20:26:07 +08:00
parent 226a6942dc
commit 998d829783
3 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/InkCanvasForClass.csproj
+2
View File
@@ -129,6 +129,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="System.ComponentModel.Composition" Version="10.0.5" />
<PackageReference Include="System.Composition.AttributedModel" Version="10.0.5" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Management" Version="10.0.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml.cs
+2 -1
View File
@@ -11,6 +11,7 @@ using System.ComponentModel.Composition.Hosting;
using System.Linq;
using MessageBox = System.Windows.MessageBox;
using Screen = System.Windows.Forms.Screen;
using System.Composition;
namespace Ink_Canvas.Windows.SettingsViews2
{
@@ -29,7 +30,7 @@ namespace Ink_Canvas.Windows.SettingsViews2
private readonly Dictionary<string, Type> _pageTypes;
private readonly Dictionary<string, object> _pages = new Dictionary<string, object>();
[ImportMany(typeof(IPluginSettingsPage))]
[System.ComponentModel.Composition.ImportMany(typeof(IPluginSettingsPage))]
private IEnumerable<IPluginSettingsPage> _pluginPages; // 自动导入所有插件页面
// 保存窗口原始位置和大小
Ink Canvas/packages.lock.json
+28 -54
View File
@@ -54,8 +54,7 @@
"resolved": "2.0.131",
"contentHash": "f71kXNl6PjCqipJ7DQytg1QUBMQ+7j8rF1UyL8UPegymG1G57EYsskdIcf/VmF6JDuts6Dk6F8Hd4ziiz4/3Dw==",
"dependencies": {
"H.NotifyIcon": "2.0.131",
"System.ValueTuple": "4.5.0"
"H.NotifyIcon": "2.0.131"
}
},
"iNKORE.UI.WPF": {
@@ -153,6 +152,18 @@
"System.Text.Json": "8.0.5"
}
},
"System.ComponentModel.Composition": {
"type": "Direct",
"requested": "[10.0.5, )",
"resolved": "10.0.5",
"contentHash": "Yi8nY2EKRZlZYRPxQ1/E4rrYs6QD1H0UgfcfHhKsCVhNJ4lNULLbly6Dtz6CjH6gZKBf2hZYXzzzzVGhpGLBvw=="
},
"System.Composition.AttributedModel": {
"type": "Direct",
"requested": "[10.0.5, )",
"resolved": "10.0.5",
"contentHash": "Vgb7wwB7ya+lbcwccXHZPSJxeKR7tCkWLgFXO9Wcgbu/NgO5DvNAIHtEkXaEESkcvXdD1iqp2JBcLWGT/xDxEw=="
},
"System.Data.DataSetExtensions": {
"type": "Direct",
"requested": "[4.5.0, )",
@@ -192,7 +203,10 @@
"H.GeneratedIcons.System.Drawing": {
"type": "Transitive",
"resolved": "2.0.131",
"contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A=="
"contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A==",
"dependencies": {
"System.Drawing.Common": "8.0.0"
}
},
"H.NotifyIcon": {
"type": "Transitive",
@@ -223,11 +237,8 @@
},
"Microsoft.Win32.SystemEvents": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0"
}
"resolved": "8.0.0",
"contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
},
"NHotkey": {
"type": "Transitive",
@@ -241,11 +252,10 @@
},
"System.Drawing.Common": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
"resolved": "8.0.0",
"contentHash": "JkbHJjtI/dWc5dfmEdJlbe3VwgZqCkZRtfuWFh5GOv0f+gGCfBtzMpIVkmdkj2AObO9y+oiOi81UGwH3aBYuqA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0",
"Microsoft.Win32.SystemEvents": "4.7.0"
"Microsoft.Win32.SystemEvents": "8.0.0"
}
},
"System.Reflection.Emit": {
@@ -312,20 +322,8 @@
},
"Microsoft.Win32.SystemEvents": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0"
}
},
"System.Drawing.Common": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0",
"Microsoft.Win32.SystemEvents": "4.7.0"
}
"resolved": "8.0.0",
"contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
},
"System.Security.AccessControl": {
"type": "Transitive",
@@ -362,20 +360,8 @@
},
"Microsoft.Win32.SystemEvents": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0"
}
},
"System.Drawing.Common": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0",
"Microsoft.Win32.SystemEvents": "4.7.0"
}
"resolved": "8.0.0",
"contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
},
"System.Security.AccessControl": {
"type": "Transitive",
@@ -412,20 +398,8 @@
},
"Microsoft.Win32.SystemEvents": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0"
}
},
"System.Drawing.Common": {
"type": "Transitive",
"resolved": "4.7.0",
"contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
"dependencies": {
"Microsoft.NETCore.Platforms": "3.1.0",
"Microsoft.Win32.SystemEvents": "4.7.0"
}
"resolved": "8.0.0",
"contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
},
"System.Security.AccessControl": {
"type": "Transitive",