diff --git a/App.config b/App.config index 94b743e..19ec54f 100644 --- a/App.config +++ b/App.config @@ -1,8 +1,8 @@  - - - + + + @@ -23,13 +23,24 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml.cs b/Control/UserControls/PannelCard/RightCardControl.xaml.cs index 1e13a50..fba1571 100644 --- a/Control/UserControls/PannelCard/RightCardControl.xaml.cs +++ b/Control/UserControls/PannelCard/RightCardControl.xaml.cs @@ -178,10 +178,11 @@ namespace GeekDesk.Control.UserControls.PannelCard } } + BitmapImage bi = ImageUtil.GetBitmapIconByPath(path); IconInfo iconInfo = new IconInfo { Path = path, - BitmapImage = ImageUtil.GetBitmapIconByPath(path) + BitmapImage = bi }; iconInfo.DefaultImage = iconInfo.ImageByteArr; iconInfo.Name = System.IO.Path.GetFileNameWithoutExtension(path); diff --git a/GeekDesk.csproj b/GeekDesk.csproj index f9835a2..1e6e5fb 100644 --- a/GeekDesk.csproj +++ b/GeekDesk.csproj @@ -26,6 +26,7 @@ prompt 4 true + false AnyCPU @@ -69,6 +70,7 @@ packages\System.Drawing.Common.6.0.0-preview.6.21352.12\lib\net461\System.Drawing.Common.dll + diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 2abb9ae..359c9bb 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //通过使用 "*",如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0")] -[assembly: AssemblyFileVersion("2.0")] +[assembly: AssemblyVersion("2.1")] +[assembly: AssemblyFileVersion("2.1")]