fix #15 (#16)

newbe36524 · Jan 14, 2020 · 1a84431 · 1a84431
1 parent 96e12c7
commit 1a84431
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 37 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.18</VersionPrefix>
+    <VersionPrefix>1.18.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>Newbe</Authors>
     <Company>Newbe</Company>
@@ -11,7 +11,7 @@
     <PackageOutputPath>../build/</PackageOutputPath>
     <NoWarn>1701;1702;1705;1591</NoWarn>
     <WarningsAsErrors>true</WarningsAsErrors>
-    <PackageReleaseNotes>1. 更新 CQP MPQ QQLight 的API到最新版本
+    <PackageReleaseNotes>修复打包时可能加载非.Net DLL 导致报错的问题
     </PackageReleaseNotes>
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>

diff --git a/src/Newbe.Mahua.Plugins.Parrot/Newbe.Mahua.Plugins.Parrot.csproj b/src/Newbe.Mahua.Plugins.Parrot/Newbe.Mahua.Plugins.Parrot.csproj
@@ -43,12 +43,12 @@
       <HintPath>..\packages\MessagePack.1.8.80\lib\net45\MessagePack.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newbe.Mahua, Version=1.18.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Newbe.Mahua.1.18.0-dev01\lib\net452\Newbe.Mahua.dll</HintPath>
+    <Reference Include="Newbe.Mahua, Version=1.18.1.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Newbe.Mahua.1.18.1\lib\net452\Newbe.Mahua.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newbe.Mahua.PluginLoader, Version=1.18.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Newbe.Mahua.PluginLoader.1.18.0-dev01\lib\net452\Newbe.Mahua.PluginLoader.dll</HintPath>
+    <Reference Include="Newbe.Mahua.PluginLoader, Version=1.18.1.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Newbe.Mahua.PluginLoader.1.18.1\lib\net452\Newbe.Mahua.PluginLoader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />

diff --git a/src/Newbe.Mahua.Plugins.Parrot/build.ps1 b/src/Newbe.Mahua.Plugins.Parrot/build.ps1
@@ -11,17 +11,17 @@ properties {
 
 $pkgNames = @{
     "platform"  = @(
-    "Newbe.Mahua.CQP",
-    "Newbe.Mahua.MPQ",
-    "Newbe.Mahua.QQLight"
+        "Newbe.Mahua.CQP",
+        "Newbe.Mahua.MPQ",
+        "Newbe.Mahua.QQLight"
     )
     "framework" = @(
-    "Newbe.Mahua",
-    "Newbe.Mahua.PluginLoader"
+        "Newbe.Mahua",
+        "Newbe.Mahua.PluginLoader"
     )
     "ext"       = @(
-    "Newbe.Mahua.Administration",
-    "Newbe.Mahua.CQP.ApiExtensions"
+        "Newbe.Mahua.Administration",
+        "Newbe.Mahua.CQP.ApiExtensions"
     )
 }
 
@@ -36,7 +36,7 @@ function Get-MahuaPackage {
     param (
         [string]$id
     )
-    $re = ($installedAll | Where-Object { $_.id -eq $id})
+    $re = ($installedAll | Where-Object { $_.id -eq $id })
     $re
     return $re[0]
 }
@@ -121,7 +121,12 @@ Task Build -depends Nuget -Description "编译" {
 function WriteCqpJsonFile ($targetFilePath) {
     # 加载所有的DLL
     Get-ChildItem  "$releaseBase\$configuration\*" *.dll | ForEach-Object {
-        [void][reflection.assembly]::LoadFile($_)
+        try {
+            [void][reflection.assembly]::LoadFile($_)
+        }
+        catch {
+
+        }
     }
 
     # 创建实例
@@ -152,7 +157,7 @@ function WriteCqpJsonFile ($targetFilePath) {
 }
 
 Task PackCQP -depends DonwloadPackages, Build -Description "CQP打包" {
-    $InstalledPlatforms | Where-Object {$_.id -eq "Newbe.Mahua.CQP"} | ForEach-Object {
+    $InstalledPlatforms | Where-Object { $_.id -eq "Newbe.Mahua.CQP" } | ForEach-Object {
         Exec {
             # CQP 要求 dll 名称和 appid 要相同，并且为小写
             $cqpDevPluginDirName = $pluginName.ToLowerInvariant()
@@ -177,7 +182,7 @@ Task PackCQP -depends DonwloadPackages, Build -Description "CQP打包" {
 }
 
 Task PackQQLight -depends DonwloadPackages, Build -Description "QQLight打包" {
-    $InstalledPlatforms | Where-Object {$_.id -eq "Newbe.Mahua.QQLight"}  | ForEach-Object {
+    $InstalledPlatforms | Where-Object { $_.id -eq "Newbe.Mahua.QQLight" } | ForEach-Object {
         Exec {
             $toolBase = Get-Download-Package-ToolsDir -package $_
             New-Item -ItemType Directory "$releaseBase\QQLight"
@@ -199,7 +204,7 @@ Task PackQQLight -depends DonwloadPackages, Build -Description "QQLight打包" {
 }
 
 Task PackMPQ -depends DonwloadPackages, Build -Description "MPQ打包" {
-    $InstalledPlatforms | Where-Object {$_.id -eq "Newbe.Mahua.MPQ"}| ForEach-Object {
+    $InstalledPlatforms | Where-Object { $_.id -eq "Newbe.Mahua.MPQ" } | ForEach-Object {
         Exec {
             $toolBase = Get-Download-Package-ToolsDir -package $_
             New-Item -ItemType Directory "$releaseBase\MPQ"

diff --git a/src/Newbe.Mahua.Plugins.Parrot/packages.config b/src/Newbe.Mahua.Plugins.Parrot/packages.config
@@ -3,14 +3,14 @@
   <package id="Autofac" version="4.9.4" targetFramework="net452" />
   <package id="MediatR" version="3.0.1" targetFramework="net452" />
   <package id="MessagePack" version="1.8.80" targetFramework="net452" />
-  <package id="Newbe.Mahua" version="1.18.0-dev01" targetFramework="net452" />
-  <package id="Newbe.Mahua.Administration" version="1.18.0-dev01" targetFramework="net452" developmentDependency="true" />
+  <package id="Newbe.Mahua" version="1.18.1" targetFramework="net452" />
+  <package id="Newbe.Mahua.Administration" version="1.18.1" targetFramework="net452" developmentDependency="true" />
   <package id="Newbe.Mahua.CleverQQ" version="1.16.1" targetFramework="net452" developmentDependency="true" />
-  <package id="Newbe.Mahua.CQP" version="1.18.0-dev01" targetFramework="net452" developmentDependency="true" />
-  <package id="Newbe.Mahua.MPQ" version="1.18.0-dev01" targetFramework="net452" developmentDependency="true" />
-  <package id="Newbe.Mahua.PluginLoader" version="1.18.0-dev01" targetFramework="net452" />
-  <package id="Newbe.Mahua.QQLight" version="1.18.0-dev01" targetFramework="net452" developmentDependency="true" />
-  <package id="Newbe.Mahua.Tools.Psake" version="1.18.0-dev01" targetFramework="net452" developmentDependency="true" />
+  <package id="Newbe.Mahua.CQP" version="1.18.1" targetFramework="net452" developmentDependency="true" />
+  <package id="Newbe.Mahua.MPQ" version="1.18.1" targetFramework="net452" developmentDependency="true" />
+  <package id="Newbe.Mahua.PluginLoader" version="1.18.1" targetFramework="net452" />
+  <package id="Newbe.Mahua.QQLight" version="1.18.1" targetFramework="net452" developmentDependency="true" />
+  <package id="Newbe.Mahua.Tools.Psake" version="1.18.1" targetFramework="net452" developmentDependency="true" />
   <package id="System.Reflection.Emit" version="4.3.0" targetFramework="net452" />
   <package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net452" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net452" />

diff --git a/src/Newbe.Mahua.Tools.Psake/build.ps1 b/src/Newbe.Mahua.Tools.Psake/build.ps1
@@ -11,17 +11,17 @@ properties {
 
 $pkgNames = @{
     "platform"  = @(
-    "Newbe.Mahua.CQP",
-    "Newbe.Mahua.MPQ",
-    "Newbe.Mahua.QQLight"
+        "Newbe.Mahua.CQP",
+        "Newbe.Mahua.MPQ",
+        "Newbe.Mahua.QQLight"
     )
     "framework" = @(
-    "Newbe.Mahua",
-    "Newbe.Mahua.PluginLoader"
+        "Newbe.Mahua",
+        "Newbe.Mahua.PluginLoader"
     )
     "ext"       = @(
-    "Newbe.Mahua.Administration",
-    "Newbe.Mahua.CQP.ApiExtensions"
+        "Newbe.Mahua.Administration",
+        "Newbe.Mahua.CQP.ApiExtensions"
     )
 }
 
@@ -36,7 +36,7 @@ function Get-MahuaPackage {
     param (
         [string]$id
     )
-    $re = ($installedAll | Where-Object { $_.id -eq $id})
+    $re = ($installedAll | Where-Object { $_.id -eq $id })
     $re
     return $re[0]
 }
@@ -121,7 +121,12 @@ Task Build -depends Nuget -Description "编译" {
 function WriteCqpJsonFile ($targetFilePath) {
     # 加载所有的DLL
     Get-ChildItem  "$releaseBase\$configuration\*" *.dll | ForEach-Object {
-        [void][reflection.assembly]::LoadFile($_)
+        try {
+            [void][reflection.assembly]::LoadFile($_)
+        }
+        catch {
+
+        }
     }
 
     # 创建实例
@@ -152,7 +157,7 @@ function WriteCqpJsonFile ($targetFilePath) {
 }
 
 Task PackCQP -depends DonwloadPackages, Build -Description "CQP打包" {
-    $InstalledPlatforms | Where-Object {$_.id -eq "Newbe.Mahua.CQP"} | ForEach-Object {
+    $InstalledPlatforms | Where-Object { $_.id -eq "Newbe.Mahua.CQP" } | ForEach-Object {
         Exec {
             # CQP 要求 dll 名称和 appid 要相同，并且为小写
             $cqpDevPluginDirName = $pluginName.ToLowerInvariant()
@@ -177,7 +182,7 @@ Task PackCQP -depends DonwloadPackages, Build -Description "CQP打包" {
 }
 
 Task PackQQLight -depends DonwloadPackages, Build -Description "QQLight打包" {
-    $InstalledPlatforms | Where-Object {$_.id -eq "Newbe.Mahua.QQLight"}  | ForEach-Object {
+    $InstalledPlatforms | Where-Object { $_.id -eq "Newbe.Mahua.QQLight" } | ForEach-Object {
         Exec {
             $toolBase = Get-Download-Package-ToolsDir -package $_
             New-Item -ItemType Directory "$releaseBase\QQLight"
@@ -199,7 +204,7 @@ Task PackQQLight -depends DonwloadPackages, Build -Description "QQLight打包" {
 }
 
 Task PackMPQ -depends DonwloadPackages, Build -Description "MPQ打包" {
-    $InstalledPlatforms | Where-Object {$_.id -eq "Newbe.Mahua.MPQ"}| ForEach-Object {
+    $InstalledPlatforms | Where-Object { $_.id -eq "Newbe.Mahua.MPQ" } | ForEach-Object {
         Exec {
             $toolBase = Get-Download-Package-ToolsDir -package $_
             New-Item -ItemType Directory "$releaseBase\MPQ"