From 3c78b058cf578f8fd9a5ca3b907dc7cb2bfa9c4c Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Thu, 29 Jul 2021 13:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BC=98=E5=85=88=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=2032=E4=BD=8D=E7=B3=BB=E7=BB=9F=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=89=BE=E4=B8=8D=E5=88=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.config                                    | 37 ++++++++++++-------
 .../PannelCard/RightCardControl.xaml.cs       |  3 +-
 GeekDesk.csproj                               |  2 +
 Properties/AssemblyInfo.cs                    |  4 +-
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/App.config b/App.config
index 94b743e..19ec54f 100644
--- a/App.config
+++ b/App.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -23,13 +23,24 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-	<appSettings>
-		<add key="Version" value="2.0" />
-		
-		<add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
-		<add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />
-		
-		<add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
-		<add key="GiteeUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
-	</appSettings>
-</configuration>
+  <appSettings>
+    <add key="Version" value="2.0" />
+    <add key="GitHubUrl" value="https://github.com/Demo-Liu/GeekDesk" />
+    <add key="GiteeUrl" value="https://gitee.com/demo_liu/GeekDesk/tree/master" />
+    <add key="GitHubUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
+    <add key="GiteeUpdateUrl" value="https://demo-liu.github.io/GeekDesk/Update.json" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
+  </appSettings>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
\ 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 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -69,6 +70,7 @@
     <Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\System.Drawing.Common.6.0.0-preview.6.21352.12\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
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")]