update: v2.0.1

3 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0740e618859e..e060c0394151 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = bilibilitoolpro-git
 	pkgdesc = A cross-platform Bilibili daily task tool written in .Net 5
-	pkgver = 1.0.0.r0.gc5837ab
+	pkgver = 2.0.1.r0.g9c8739f
 	pkgrel = 1
 	url = https://github.com/RayWangQvQ/BiliBiliToolPro
 	arch = x86_64
 	license = MIT
-	makedepends = dotnet-sdk-6.0
+	makedepends = dotnet-sdk
 	makedepends = git
-	depends = dotnet-runtime-6.0
-	depends = aspnet-runtime-6.0
+	depends = dotnet-runtime
+	depends = aspnet-runtime
 	backup = etc/bilibilitoolpro/appsettings.json
 	source = bilibilitoolpro::git+https://github.com/RayWangQvQ/BiliBiliToolPro.git
 	source = change-default-configuration-path.patch
@@ -18,7 +18,7 @@ pkgbase = bilibilitoolpro-git
 	source = sysusers.d
 	source = tmpfiles.d
 	sha256sums = SKIP
-	sha256sums = 2e1ca56aadd19971c61b5cf4856566cf5b649d3ad52269dd15cf409e8e67e5c0
+	sha256sums = 87ce39ab6d9882503c2f1af1b7df500c0b06d912609bb5681df4061d890aacfd
 	sha256sums = 60df0b33087bf22517abb3f076259cf1e1e76c68b941288ef6f4b07b25ed091b
 	sha256sums = 1c8eab441925d714ab3d9c85dea7c2c3eb01fbd550c83467a80da4567aa81117
 	sha256sums = 2b4f3621c10194156e0127e07367a2adc3dcc2a90dee5a9ca145931da8ec8d30
diff --git a/PKGBUILD b/PKGBUILD
index 9a91c99f0f7a..95c263464692 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 _pkgname=bilibilitoolpro
 pkgname=${_pkgname}-git
-pkgver=1.0.0.r0.gc5837ab
+pkgver=2.0.1.r0.g9c8739f
 pkgrel=1
 pkgdesc="A cross-platform Bilibili daily task tool written in .Net 5"
 arch=('x86_64')
 url='https://github.com/RayWangQvQ/BiliBiliToolPro'
 license=("MIT")
-depends=("dotnet-runtime-6.0" "aspnet-runtime-6.0")
-makedepends=("dotnet-sdk-6.0" "git")
+depends=("dotnet-runtime" "aspnet-runtime")
+makedepends=("dotnet-sdk" "git")
 source=("${_pkgname}::git+https://github.com/RayWangQvQ/BiliBiliToolPro.git"
         "change-default-configuration-path.patch"
         "disable-log-to-file.patch"
@@ -19,7 +19,7 @@ source=("${_pkgname}::git+https://github.com/RayWangQvQ/BiliBiliToolPro.git"
         "tmpfiles.d")
 backup=("etc/${_pkgname}/appsettings.json")
 sha256sums=('SKIP'
-            '2e1ca56aadd19971c61b5cf4856566cf5b649d3ad52269dd15cf409e8e67e5c0'
+            '87ce39ab6d9882503c2f1af1b7df500c0b06d912609bb5681df4061d890aacfd'
             '60df0b33087bf22517abb3f076259cf1e1e76c68b941288ef6f4b07b25ed091b'
             '1c8eab441925d714ab3d9c85dea7c2c3eb01fbd550c83467a80da4567aa81117'
             '2b4f3621c10194156e0127e07367a2adc3dcc2a90dee5a9ca145931da8ec8d30'
diff --git a/change-default-configuration-path.patch b/change-default-configuration-path.patch
index 426d152f62af..c8f9db591da7 100644
--- a/change-default-configuration-path.patch
+++ b/change-default-configuration-path.patch
@@ -1,16 +1,22 @@
 diff --git a/src/Ray.BiliBiliTool.Console/Program.cs b/src/Ray.BiliBiliTool.Console/Program.cs
-index af9725c..4e31c1c 100644
+index 7dc7ce0..e85854b 100644
 --- a/src/Ray.BiliBiliTool.Console/Program.cs
 +++ b/src/Ray.BiliBiliTool.Console/Program.cs
-@@ -67,10 +67,7 @@ namespace Ray.BiliBiliTool.Console
+@@ -54,7 +54,7 @@ namespace Ray.BiliBiliTool.Console
+             //IHostBuilder hostBuilder = Host.CreateDefaultBuilder();
+             IHostBuilder hostBuilder = new HostBuilder();
+ 
+-            //hostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
++            hostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+ 
+             //承载系统自身的配置：
+             hostBuilder.ConfigureHostConfiguration(hostConfigurationBuilder =>
+@@ -74,7 +74,7 @@ namespace Ray.BiliBiliTool.Console
                  IHostEnvironment env = hostBuilderContext.HostingEnvironment;
  
                  //json文件：
--                configurationBuilder.AddJsonFile("appsettings.json", false, true)
--                    .AddJsonFile($"appsettings.{hostBuilderContext.HostingEnvironment.EnvironmentName}.json", true, true)
--                    .AddJsonFile("exp.json", false, true) //todo：不要使用配置
--                    .AddJsonFile("donateCoinCanContinueStatus.json", false, true);//todo：不要使用配置
-+                configurationBuilder.AddJsonFile("/etc/bilibilitoolpro/appsettings.json", false, true);
+-                configurationBuilder.AddJsonFile("appsettings.json", true, true)
++                configurationBuilder.AddJsonFile("/etc/bilibilitoolpro/appsettings.json", true, true)
+                     .AddJsonFile($"appsettings.{hostBuilderContext.HostingEnvironment.EnvironmentName}.json", true, true)
+                     ;
  
-                 //用户机密：
-                 if (env.IsDevelopment() && env.ApplicationName?.Length > 0)