Update to v2.9.3

the1812 · May 24, 2020 · ebd4e72 · ebd4e72
1 parent de94292
commit ebd4e72
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 11 deletions.
diff --git a/mwp-ver.txt b/mwp-ver.txt
@@ -1 +1 @@
-2.9.2.0
+2.9.3.0
diff --git a/mwp.exe b/mwp.exe
diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json
@@ -16,7 +16,9 @@
     "2345 browser.cer",
     "2345 browser 256.cer",
     "2345 2019.6.cer",
-    "2345 256.2019.6.cer"
+    "2345 256.2019.6.cer",
+    "2345 browser 2020.06.cer",
+    "2345 browser 256.2020.06.cer"
   ],
   "6789": [
     "6789.cer",
@@ -47,7 +49,9 @@
     "driveTheLife.cer",
     "driveTheLife 256.cer",
     "driveTheLife 2019.6.cer",
-    "driveTheLife 256.2019.6.cer"
+    "driveTheLife 256.2019.6.cer",
+    "driveTheLife 2020.06.cer",
+    "driveTheLife 256.2020.06.cer"
   ],
   "Funshion": [
     "funshion.cer"
@@ -80,7 +84,9 @@
     "kingsoft 2019.6.cer",
     "kingsoft 256.2019.6.cer",
     "kingsoft 2020.02.cer",
-    "kingsoft 256.2020.02.cer"
+    "kingsoft 256.2020.02.cer",
+    "kingsoft 2020.06.cer",
+    "kingsoft 256.2020.06.cer"
   ],
   "Kugou": [
     "kugou.cer"

diff --git a/src/MalwarePatch/Assets/malware-remote-info.json b/src/MalwarePatch/Assets/malware-remote-info.json
@@ -57,7 +57,7 @@
     "match": [
       {
         "url": "http://www.160.com/",
-        "regex": "href=\"(http[s]?://file1.updrv.com/soft/dtl8/.*?\.exe)",
+        "regex": "href=\"(http[s]?://file1.updrv.com/soft/.*/DriveTheLife.*\\.exe)",
         "group": 1
       }
     ]

diff --git a/src/MalwarePatch/Certificates/2345 browser 2020.06.cer b/src/MalwarePatch/Certificates/2345 browser 2020.06.cer
diff --git a/src/MalwarePatch/Certificates/2345 browser 256.2020.06.cer b/src/MalwarePatch/Certificates/2345 browser 256.2020.06.cer
diff --git a/src/MalwarePatch/Certificates/@Target.txt b/src/MalwarePatch/Certificates/@Target.txt
@@ -32,3 +32,32 @@ Updated 08/13/2018
 // Manual
 Youku
 Riyue
+
+[NEW]03/18/2020
+快速软件助手
+灭神
+旋风PDF
+小鲁温度监控
+麻花日历
+火萤视频桌面
+蒲公英WiFi 2.0
+快压
+鲁大师
+好看壁纸
+极速输入法
+智能云输入法 1.5
+软件管家 - 2345
+光速搜索（2.2.3.2）
+电脑管家
+飞速PDF
+风行视频加速器
+布丁桌面 1.4
+加速浏览器 - 2345
+爱奇艺看图
+酷我音乐
+酷狗音乐
+ABC看图
+iDesk助手
+迅读PDF大师
+真龙主宰
+小鱼便签
diff --git a/src/MalwarePatch/Certificates/driveTheLife 2020.06.cer b/src/MalwarePatch/Certificates/driveTheLife 2020.06.cer
diff --git a/src/MalwarePatch/Certificates/driveTheLife 256.2020.06.cer b/src/MalwarePatch/Certificates/driveTheLife 256.2020.06.cer
diff --git a/src/MalwarePatch/Certificates/kingsoft 2020.06.cer b/src/MalwarePatch/Certificates/kingsoft 2020.06.cer
diff --git a/src/MalwarePatch/Certificates/kingsoft 256.2020.06.cer b/src/MalwarePatch/Certificates/kingsoft 256.2020.06.cer
diff --git a/src/MalwarePatch/Languages/MainLanguage.cs b/src/MalwarePatch/Languages/MainLanguage.cs
@@ -34,7 +34,7 @@ public enum Keys
             AllowProgramDescription,
         }
         internal static DateTime LastModifiedTime => File.GetLastWriteTime(Process.GetCurrentProcess().MainModule.FileName);
-        internal const int UpdateMonth = 3;
+        internal const int UpdateMonth = 6;
         internal static string UpdateTime
         {
             get

diff --git a/src/MalwarePatch/MalwarePatch.csproj b/src/MalwarePatch/MalwarePatch.csproj
@@ -203,14 +203,14 @@
     <EmbeddedResource Include="Ace.dll" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="AppIcons\02-allow-small.ico" />
-    <Resource Include="AppIcons\01-disallow-small.ico" />
+    <None Include="AppIcons\02-allow-small.ico" />
+    <None Include="AppIcons\01-disallow-small.ico" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="MalwarePatch.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="BuildTools\InsertIcons.exe" />
+    <None Include="BuildTools\InsertIcons.exe" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/src/MalwarePatch/Properties/AssemblyInfo.cs b/src/MalwarePatch/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.2.0")]
-[assembly: AssemblyFileVersion("2.9.2.0")]
+[assembly: AssemblyVersion("2.9.3.0")]
+[assembly: AssemblyFileVersion("2.9.3.0")]