Merge pull request #24 from Bililive/dev

3.0.4 “高考”更新
Bililive · May 30, 2019 · b4adde5 · b4adde5
2 parents 6a3432d + 01eba6c
commit b4adde5
Show file tree

Hide file tree

Showing 5 changed files with 291 additions and 5 deletions.
diff --git a/DGJv3/BilibiliDM_PluginFramework.dll b/DGJv3/BilibiliDM_PluginFramework.dll
diff --git a/DGJv3/BilibiliDM_PluginFramework.xml b/DGJv3/BilibiliDM_PluginFramework.xml
diff --git a/DGJv3/DGJv3.csproj b/DGJv3/DGJv3.csproj
@@ -68,9 +68,8 @@
     <Reference Include="NAudio, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NAudio.1.8.4\lib\net35\NAudio.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/DGJv3/packages.config b/DGJv3/packages.config
@@ -3,6 +3,6 @@
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net462" />
   <package id="MaterialDesignThemes" version="2.4.1.1101" targetFramework="net462" />
   <package id="NAudio" version="1.8.4" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net462" />
   <package id="Scriban.Signed" version="1.2.5" targetFramework="net462" />
 </packages>
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.3
+3.0.4