Browse Source

更新sunnyUI-3.2.0版本兼容壳程序升级

837390164@qq.com 5 months ago
parent
commit
db497ac9f3
3 changed files with 15 additions and 11 deletions
  1. 4 4
      GanSuMI.csproj
  2. 9 5
      app.config
  3. 2 2
      packages.config

+ 4 - 4
GanSuMI.csproj

@@ -58,11 +58,11 @@
     <Reference Include="PTControl">
       <HintPath>..\..\..\..\ThirdDLL\PTControl.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI, Version=3.1.5.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
-      <HintPath>packages\SunnyUI.3.1.5\lib\net40\SunnyUI.dll</HintPath>
+    <Reference Include="SunnyUI, Version=3.2.0.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+      <HintPath>packages\SunnyUI.3.2.0\lib\net472\SunnyUI.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.Common, Version=3.1.2.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
-      <HintPath>packages\SunnyUI.Common.3.1.2\lib\net40\SunnyUI.Common.dll</HintPath>
+    <Reference Include="SunnyUI.Common, Version=3.2.0.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
+      <HintPath>packages\SunnyUI.Common.3.2.0\lib\net40\SunnyUI.Common.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 9 - 5
app.config

@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 		
-		<probing prvatePath="bin/service/plugins/INSUNew"/>
+		<probing prvatePath="bin/service/plugins/INSUNew" />
 		
       <dependentAssembly>
-        <assemblyIdentity name="SunnyUI.Common" publicKeyToken="5a271fb7ba597231" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
+        <assemblyIdentity name="SunnyUI.Common" publicKeyToken="5a271fb7ba597231" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

+ 2 - 2
packages.config

@@ -5,6 +5,6 @@
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
-  <package id="SunnyUI" version="3.1.5" targetFramework="net45" requireReinstallation="true" />
-  <package id="SunnyUI.Common" version="3.1.2" targetFramework="net45" requireReinstallation="true" />
+  <package id="SunnyUI" version="3.2.0" targetFramework="net472" />
+  <package id="SunnyUI.Common" version="3.2.0" targetFramework="net472" />
 </packages>