Merge branch 'master' into dev

LeoChen98 · Jan 15, 2022 · a2dd89b · a2dd89b
2 parents 3a2306c + 75db797
commit a2dd89b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/async_project_files.yml b/.github/workflows/async_project_files.yml
@@ -5,7 +5,8 @@ name: async_project_files
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
-  pull_request:
+  pull_request_target:
+    types: [ closed ]
     branches: [ master ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -35,7 +36,7 @@ jobs:
         mkdir 'BiliAccount'
         cd BiliAccount
         git init
-        git clone -b ${{ github.head_ref }} https://github.com/LeoChen98/BiliAccount.git
+        git clone -b master https://github.com/LeoChen98/BiliAccount.git
         cd .. 
     
     # Runs a single command using the runners shell

diff --git a/BiliAccount.Geetest.Controls/BiliAccount.Geetest.Controls.csproj b/BiliAccount.Geetest.Controls/BiliAccount.Geetest.Controls.csproj
@@ -17,11 +17,7 @@
     <RepositoryType>git</RepositoryType>
     <PackageTags>bilibili bililive bililogin biliaccount</PackageTags>
     <PackageIcon>favicon_4.png</PackageIcon>
-    <PackageReleaseNotes>
-      enhancements:
-        1. 更新了BiliAccount到2.5.2.24(fixed #49)
-        2. 更新BiliAccount.Geetest版本到1.0.4.4。
-        3. 更新Chromium内核版本到85。（安全更新）
+    <PackageReleaseNotes>1. 更新Chromium内核版本到86。（安全更新）
     </PackageReleaseNotes>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -144,13 +140,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CefSharp.WinForms" Version="81.3.100" />
-    <PackageReference Include="CefSharp.Wpf" Version="81.3.100" />
+    <PackageReference Include="CefSharp.WinForms" Version="86.0.241" />
+    <PackageReference Include="CefSharp.Wpf" Version="86.0.241" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Release'">
-    <PackageReference Include="BiliAccount" Version="2.5.2.24" />
-    <PackageReference Include="BiliAccount.Geetest" Version="1.0.4.4" />
+    <PackageReference Include="BiliAccount" Version="2.5.4.26" />
+    <PackageReference Include="BiliAccount.Geetest" Version="1.0.5.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/BiliAccount.Geetest/BiliAccount.Geetest.csproj b/BiliAccount.Geetest/BiliAccount.Geetest.csproj
@@ -110,7 +110,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Release'">
-    <PackageReference Include="BiliAccount" Version="2.5.2.24" />
+    <PackageReference Include="BiliAccount" Version="2.5.4.26" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ Package Manager|`Install-Package BiliAccount -Version 2.2.0.12`
 PackageReference|`<PackageReference Include="BiliAccount" Version="2.2.0.12" />`
 Packet CLI|`paket add BiliAccount --version 2.2.0.12`
 
+**当前已知`CentOS`环境下需要手动安装gdi+组件**<br />
 具体使用方法请见[Wiki](https://github.com/LeoChen98/BiliAccount/wiki)
 
 ## 开放源代码许可