去除冗余引用,删除BUG

LFYG · Jun 6, 2019 · 754fa6b · 754fa6b
1 parent b5098dc
commit 754fa6b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/AutumnBox.OpenFramework.Shared/LeafExtension/Fast/LeafUIHelper.cs b/AutumnBox.OpenFramework.Shared/LeafExtension/Fast/LeafUIHelper.cs
@@ -99,7 +99,7 @@ public static void EWarn(this ILeafUI ui, string warn)
         /// <returns></returns>
         public static void EAgree(this ILeafUI ui, string msg, string btnYes = null, string btnNo = null)
         {
-            if (ui.DoYN(msg, btnYes, btnNo)) ui.EShutdown();
+            if (!ui.DoYN(msg, btnYes, btnNo)) ui.EShutdown();
         }
         /// <summary>
         /// 进行可取消的是否抉择

diff --git a/AutumnBox.OpenFramework/AutumnBox.OpenFramework.csproj b/AutumnBox.OpenFramework/AutumnBox.OpenFramework.csproj
@@ -46,11 +46,8 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HandyControl, Version=1.5.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HandyControl.1.5.5\lib\net45\HandyControl.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/AutumnBox.OpenFramework/Properties/AssemblyInfo.cs b/AutumnBox.OpenFramework/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("10.0.1")]
-[assembly: AssemblyFileVersion("10.0.1")]
-[assembly:AssemblyInformationalVersion("10.0.1")]
+[assembly: AssemblyVersion("10.0.2")]
+[assembly: AssemblyFileVersion("10.0.2")]
+[assembly:AssemblyInformationalVersion("10.0.2")]
diff --git a/AutumnBox.OpenFramework/packages.config b/AutumnBox.OpenFramework/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HandyControl" version="1.5.5" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
 </packages>