diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 90a51f4..6ad4753 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,6 @@ - 1.18 + 1.18.1 Newbe Newbe @@ -11,7 +11,7 @@ ../build/ 1701;1702;1705;1591 true - 1. 更新 CQP MPQ QQLight 的API到最新版本 + 修复打包时可能加载非.Net DLL 导致报错的问题 Latest diff --git a/src/Newbe.Mahua.Plugins.Parrot/Newbe.Mahua.Plugins.Parrot.csproj b/src/Newbe.Mahua.Plugins.Parrot/Newbe.Mahua.Plugins.Parrot.csproj index 3ef1240..2ca16e7 100644 --- 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 @@ ..\packages\MessagePack.1.8.80\lib\net45\MessagePack.dll True - - ..\packages\Newbe.Mahua.1.18.0-dev01\lib\net452\Newbe.Mahua.dll + + ..\packages\Newbe.Mahua.1.18.1\lib\net452\Newbe.Mahua.dll True - - ..\packages\Newbe.Mahua.PluginLoader.1.18.0-dev01\lib\net452\Newbe.Mahua.PluginLoader.dll + + ..\packages\Newbe.Mahua.PluginLoader.1.18.1\lib\net452\Newbe.Mahua.PluginLoader.dll True diff --git a/src/Newbe.Mahua.Plugins.Parrot/build.ps1 b/src/Newbe.Mahua.Plugins.Parrot/build.ps1 index f1b23d6..02d7e61 100644 --- 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 index e11b44e..e9370ba 100644 --- a/src/Newbe.Mahua.Plugins.Parrot/packages.config +++ b/src/Newbe.Mahua.Plugins.Parrot/packages.config @@ -3,14 +3,14 @@ - - + + - - - - - + + + + + diff --git a/src/Newbe.Mahua.Tools.Psake/build.ps1 b/src/Newbe.Mahua.Tools.Psake/build.ps1 index f1b23d6..02d7e61 100644 --- 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"