From c948d8b94352f9bf3ace49c3eb9cebf8ad6f2354 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 23 Jan 2025 23:54:35 +0800 Subject: [PATCH 1/6] upgrade pkgs --- .../Ray.BiliBiliTool.Agent.csproj | 8 ++--- ....BiliBiliTool.Application.Contracts.csproj | 2 +- .../Ray.BiliBiliTool.Application.csproj | 8 ++--- .../Ray.BiliBiliTool.Config.csproj | 12 +++---- .../Ray.BiliBiliTool.Console.csproj | 32 +++++++++---------- .../Ray.BiliBiliTool.DomainService.csproj | 10 +++--- .../Ray.BiliBiliTool.Infrastructure.csproj | 6 ++-- test/AppServiceTest/AppServiceTest.csproj | 8 ++--- test/BiliAgentTest/BiliAgentTest.csproj | 8 ++--- test/ConfigTest/ConfigTest.csproj | 8 ++--- .../DomainServiceTest.csproj | 8 ++--- .../InfrastructureTest.csproj | 8 ++--- test/LogTest/LogTest.csproj | 8 ++--- ....BiliBiliTool.Agent.FunctionalTests.csproj | 16 +++++++--- 14 files changed, 74 insertions(+), 68 deletions(-) diff --git a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj index cb5bbf08c..473ffd4c4 100644 --- a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj +++ b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj @@ -5,11 +5,11 @@ - - - + + + - + diff --git a/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj b/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj index 90b5e4c9b..82c6a0dd3 100644 --- a/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj +++ b/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj b/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj index 46d04486a..92273dd0d 100644 --- a/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj +++ b/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj b/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj index 1295b7399..69cec8e1b 100644 --- a/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj +++ b/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj @@ -5,12 +5,12 @@ - - - - - - + + + + + + diff --git a/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj b/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj index 7900ba23f..4e18def99 100644 --- a/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj +++ b/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj @@ -29,22 +29,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj b/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj index 33c379df6..fb9d1c580 100644 --- a/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj +++ b/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj @@ -5,12 +5,12 @@ - - - - + + + + - + diff --git a/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj b/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj index ce2d959f5..b50bb4c9c 100644 --- a/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj +++ b/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj @@ -5,9 +5,9 @@ - - - + + + \ No newline at end of file diff --git a/test/AppServiceTest/AppServiceTest.csproj b/test/AppServiceTest/AppServiceTest.csproj index b0f835762..266ff0aa4 100644 --- a/test/AppServiceTest/AppServiceTest.csproj +++ b/test/AppServiceTest/AppServiceTest.csproj @@ -9,13 +9,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/BiliAgentTest/BiliAgentTest.csproj b/test/BiliAgentTest/BiliAgentTest.csproj index bc95c8a9c..63b37043a 100644 --- a/test/BiliAgentTest/BiliAgentTest.csproj +++ b/test/BiliAgentTest/BiliAgentTest.csproj @@ -10,13 +10,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/ConfigTest/ConfigTest.csproj b/test/ConfigTest/ConfigTest.csproj index 2355e2c7b..f07fe6805 100644 --- a/test/ConfigTest/ConfigTest.csproj +++ b/test/ConfigTest/ConfigTest.csproj @@ -6,13 +6,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/DomainServiceTest/DomainServiceTest.csproj b/test/DomainServiceTest/DomainServiceTest.csproj index 869f6c876..7957229b9 100644 --- a/test/DomainServiceTest/DomainServiceTest.csproj +++ b/test/DomainServiceTest/DomainServiceTest.csproj @@ -9,13 +9,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/InfrastructureTest/InfrastructureTest.csproj b/test/InfrastructureTest/InfrastructureTest.csproj index 02e3b87c0..5d91ba654 100644 --- a/test/InfrastructureTest/InfrastructureTest.csproj +++ b/test/InfrastructureTest/InfrastructureTest.csproj @@ -10,13 +10,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/LogTest/LogTest.csproj b/test/LogTest/LogTest.csproj index 90f0c86ed..091b6df33 100644 --- a/test/LogTest/LogTest.csproj +++ b/test/LogTest/LogTest.csproj @@ -9,13 +9,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj b/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj index b5c2eb240..8aff373de 100644 --- a/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj +++ b/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj @@ -10,11 +10,17 @@ - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From 9fff82959bb7fb0ac4bf75d4ad854059f25a496d Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 24 Jan 2025 00:00:56 +0800 Subject: [PATCH 2/6] upgrade to dotnet 8 --- src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj | 2 +- .../Ray.BiliBiliTool.Application.Contracts.csproj | 2 +- .../Ray.BiliBiliTool.Application.csproj | 2 +- src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj | 2 +- src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj | 2 +- .../Ray.BiliBiliTool.DomainService.csproj | 4 ++-- .../Ray.BiliBiliTool.Infrastructure.csproj | 2 +- test/AppServiceTest/AppServiceTest.csproj | 2 +- test/BiliAgentTest/BiliAgentTest.csproj | 2 +- test/ConfigTest/ConfigTest.csproj | 2 +- test/DomainServiceTest/DomainServiceTest.csproj | 2 +- test/InfrastructureTest/InfrastructureTest.csproj | 2 +- test/LogTest/LogTest.csproj | 2 +- .../Ray.BiliBiliTool.Agent.FunctionalTests.csproj | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj index 473ffd4c4..69242f895 100644 --- a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj +++ b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj b/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj index 82c6a0dd3..1bdacc669 100644 --- a/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj +++ b/src/Ray.BiliBiliTool.Application.Contracts/Ray.BiliBiliTool.Application.Contracts.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj b/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj index 92273dd0d..ff2aa17da 100644 --- a/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj +++ b/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj b/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj index 69cec8e1b..40557d41a 100644 --- a/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj +++ b/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj b/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj index 4e18def99..d68112340 100644 --- a/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj +++ b/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj @@ -4,7 +4,7 @@ Exe - net6.0 + net8.0 3cc5407e-fe0e-4df6-a127-7385c75abd8a Linux ..\.. diff --git a/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj b/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj index fb9d1c580..34128c618 100644 --- a/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj +++ b/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj @@ -1,13 +1,13 @@  - net6.0 + net8.0 - + diff --git a/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj b/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj index b50bb4c9c..c32603107 100644 --- a/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj +++ b/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/test/AppServiceTest/AppServiceTest.csproj b/test/AppServiceTest/AppServiceTest.csproj index 266ff0aa4..8e7268303 100644 --- a/test/AppServiceTest/AppServiceTest.csproj +++ b/test/AppServiceTest/AppServiceTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable diff --git a/test/BiliAgentTest/BiliAgentTest.csproj b/test/BiliAgentTest/BiliAgentTest.csproj index 63b37043a..0b250a9c8 100644 --- a/test/BiliAgentTest/BiliAgentTest.csproj +++ b/test/BiliAgentTest/BiliAgentTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable false diff --git a/test/ConfigTest/ConfigTest.csproj b/test/ConfigTest/ConfigTest.csproj index f07fe6805..8c1a57a22 100644 --- a/test/ConfigTest/ConfigTest.csproj +++ b/test/ConfigTest/ConfigTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false diff --git a/test/DomainServiceTest/DomainServiceTest.csproj b/test/DomainServiceTest/DomainServiceTest.csproj index 7957229b9..c8c44468e 100644 --- a/test/DomainServiceTest/DomainServiceTest.csproj +++ b/test/DomainServiceTest/DomainServiceTest.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/test/InfrastructureTest/InfrastructureTest.csproj b/test/InfrastructureTest/InfrastructureTest.csproj index 5d91ba654..98ae632fe 100644 --- a/test/InfrastructureTest/InfrastructureTest.csproj +++ b/test/InfrastructureTest/InfrastructureTest.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/test/LogTest/LogTest.csproj b/test/LogTest/LogTest.csproj index 091b6df33..e0f7c6e13 100644 --- a/test/LogTest/LogTest.csproj +++ b/test/LogTest/LogTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false diff --git a/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj b/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj index 8aff373de..4f5e618c6 100644 --- a/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj +++ b/test/Ray.BiliBiliTool.Agent.FunctionalTests/Ray.BiliBiliTool.Agent.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable From db27621c3ace139738500ee08c3ddd81433dbc65 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 24 Jan 2025 00:38:50 +0800 Subject: [PATCH 3/6] migrate in docker --- Dockerfile | 8 +++----- Ray.BiliBiliTool.sln | 3 --- docker/sample/docker-compose.yml | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 576d105e3..9dbde9f11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base +FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /code COPY ["src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj", "src/Ray.BiliBiliTool.Console/"] COPY ["src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj", "src/Ray.BiliBiliTool.DomainService/"] @@ -25,11 +25,9 @@ WORKDIR /app ENV TIME_ZONE=Asia/Shanghai COPY --from=publish /app/publish . COPY ./docker/scripts/* ./docker/crontab /app/scripts/ +RUN apt-get update RUN ln -fs /usr/share/zoneinfo/$TIME_ZONE /etc/localtime \ && echo $TIME_ZONE > /etc/timezone \ - && cp /etc/apt/sources.list /etc/apt/sources.list.bak \ - && sed -i 's/deb.debian.org/mirrors.163.com/g' /etc/apt/sources.list \ - && sed -i 's/security.debian.org/mirrors.163.com/g' /etc/apt/sources.list \ && apt-get clean \ && apt-get update \ && apt-get install -y cron tzdata tofrodos \ diff --git a/Ray.BiliBiliTool.sln b/Ray.BiliBiliTool.sln index 617db82c4..7297a54a1 100644 --- a/Ray.BiliBiliTool.sln +++ b/Ray.BiliBiliTool.sln @@ -42,7 +42,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution common.props = common.props Dockerfile = Dockerfile LICENSE = LICENSE - publish.bat = publish.bat README.md = README.md EndProjectSection EndProject @@ -66,7 +65,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{A93210FD-27B6-40E4-B08D-391F96CA2754}" ProjectSection(SolutionItems) = preProject docker\crontab = docker\crontab - docker\entry.sh = docker\entry.sh docker\README.md = docker\README.md EndProjectSection EndProject @@ -124,7 +122,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BiliAgentTest", "test\BiliA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{75A9CC5C-DF92-4D72-A14C-625AA902855B}" ProjectSection(SolutionItems) = preProject - docker\build\buildAndPushImage_multiArch.cmd = docker\build\buildAndPushImage_multiArch.cmd docker\build\buildImage.cmd = docker\build\buildImage.cmd docker\build\buildImage_amd64.cmd = docker\build\buildImage_amd64.cmd docker\build\buildImage_arm64.cmd = docker\build\buildImage_arm64.cmd diff --git a/docker/sample/docker-compose.yml b/docker/sample/docker-compose.yml index b2a8d404b..cade36c07 100644 --- a/docker/sample/docker-compose.yml +++ b/docker/sample/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.9' services: bilibili_tool: image: ghcr.io/raywangqvq/bilibili_tool_pro From 25a69d0cb23150cb809f11557be7afc4a7b80106 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 24 Jan 2025 00:40:29 +0800 Subject: [PATCH 4/6] updatge change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fe281442..058a0b4d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## 2.2.0 +- Migrate from dotnet 6.0 to dotnet 8.0 - Add Bruno to document the APIs ## 2.1.3 - Code refactory From c827dde0f04498f122ca26bf3b29aa8f972741a4 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 16 Feb 2025 00:15:12 +0800 Subject: [PATCH 5/6] update 8.0 in qinglong scripts --- docker/build/buildImage.cmd | 2 +- docker/build/buildImage_amd64.cmd | 2 +- podman/build/buildImage.cmd | 2 +- qinglong/DefaultTasks/bili_task_base.sh | 6 +++--- qinglong/DefaultTasks/dev/bili_dev_task_base.sh | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/build/buildImage.cmd b/docker/build/buildImage.cmd index 2f9d0676a..6a845849c 100644 --- a/docker/build/buildImage.cmd +++ b/docker/build/buildImage.cmd @@ -3,6 +3,6 @@ REM start to build echo Start to build docker image @echo on -docker build --tag zai7lou/bilibili_tool_pro:0.2.2 --tag zai7lou/bilibili_tool_pro:latest ../.. +docker build --tag zai7lou/bilibili_tool_pro:latest ../.. @echo off pause diff --git a/docker/build/buildImage_amd64.cmd b/docker/build/buildImage_amd64.cmd index 7542df871..58255a917 100644 --- a/docker/build/buildImage_amd64.cmd +++ b/docker/build/buildImage_amd64.cmd @@ -5,6 +5,6 @@ REM https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/ REM https://segmentfault.com/a/1190000021166703 echo Start to build docker image with amd64-arch @echo on -docker buildx build --tag zai7lou/bilibili_tool_pro:0.0.5 --output "type=image,push=false" --platform linux/amd64 ../.. +docker buildx build --tag zai7lou/bilibili_tool_pro:latest --output "type=image,push=false" --platform linux/amd64 ../.. @echo off pause diff --git a/podman/build/buildImage.cmd b/podman/build/buildImage.cmd index 087533c3b..6804631c2 100644 --- a/podman/build/buildImage.cmd +++ b/podman/build/buildImage.cmd @@ -3,6 +3,6 @@ REM start to build echo Start to build image @echo on -podman build -t docker.io/zai7lou/bilibili_tool_pro:0.2.2 -t docker.io/zai7lou/bilibili_tool_pro:latest ../.. +podman build -t docker.io/zai7lou/bilibili_tool_pro:latest ../.. @echo off pause diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index fc4629f1d..946ae5f3c 100644 --- a/qinglong/DefaultTasks/bili_task_base.sh +++ b/qinglong/DefaultTasks/bili_task_base.sh @@ -321,7 +321,7 @@ install_dotnet_by_script() { eval $invocation say "再尝试使用官方脚本安装" - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --no-cdn --verbose + curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 8.0 --no-cdn --verbose say "添加到PATH" local exportFile="/root/.bashrc" @@ -353,7 +353,7 @@ install_dotnet() { curl -o packages-microsoft-prod.deb https://packages.microsoft.com/config/debian/$VERSION_ID/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb rm packages-microsoft-prod.deb - apt-get update && apt-get install -y dotnet-sdk-6.0 + apt-get update && apt-get install -y dotnet-sdk-8.0 } || { install_dotnet_by_script } @@ -367,7 +367,7 @@ install_dotnet() { apk update fi { - apk add dotnet6-sdk + apk add dotnet8-sdk } || { install_dotnet_by_script } diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh index 84019263e..e6fa17a4f 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh @@ -262,7 +262,7 @@ check_dotnet() { eval $invocation dotnetVersion=$(dotnet --version) - if [[ $dotnetVersion == 6.* ]]; then + if [[ $dotnetVersion == 8.* ]]; then say "已安装dotnet，当前版本：$dotnetVersion" say "which dotnet: $(which dotnet)" return 0 @@ -321,7 +321,7 @@ install_dotnet_by_script() { eval $invocation say "再尝试使用官方脚本安装" - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --no-cdn --verbose + curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 8.0 --no-cdn --verbose say "添加到PATH" local exportFile="/root/.bashrc" @@ -353,7 +353,7 @@ install_dotnet() { curl -o packages-microsoft-prod.deb https://packages.microsoft.com/config/debian/$VERSION_ID/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb rm packages-microsoft-prod.deb - apt-get update && apt-get install -y dotnet-sdk-6.0 + apt-get update && apt-get install -y dotnet-sdk-8.0 } || { install_dotnet_by_script } @@ -367,7 +367,7 @@ install_dotnet() { apk update fi { - apk add dotnet6-sdk + apk add dotnet8-sdk } || { install_dotnet_by_script } From 1a301035afb741eba2975f8eb5b3b918386095e2 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 16 Feb 2025 00:32:16 +0800 Subject: [PATCH 6/6] update other 6.0 in actions or docs --- .github/workflows/publish-release.yml | 4 ++-- docker/README.md | 4 ++-- docs/questions.md | 2 +- docs/runInLocal.md | 8 ++++---- qinglong/DefaultTasks/bili_task_base.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_base.sh | 2 +- qinglong/ray-dotnet-install.sh | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index c90bfb4ce..f3f18a05e 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Publish and Zip Release run: | @@ -47,7 +47,7 @@ jobs: files: './src/Ray.BiliBiliTool.Console/bin/Publish/*.zip' token: ${{ secrets.GITHUB_TOKEN }} name: "BiliBiliToolPro-V${{ steps.release_notes.outputs.version }}" - tag_name: ${{ github.event.inputs.version }} + tag_name: ${{ steps.release_notes.outputs.version }} body: '${{ steps.release_notes.outputs.content }}' discussion_category_name: Announcements generate_release_notes: true diff --git a/docker/README.md b/docker/README.md index 7df2310ab..8c32c6439 100644 --- a/docker/README.md +++ b/docker/README.md @@ -156,9 +156,9 @@ docker run --rm \ ## 7. 其他 -代码编译和发布环境: mcr.microsoft.com/dotnet/sdk:6.0 +代码编译和发布环境: mcr.microsoft.com/dotnet/sdk:8.0 -代码运行环境: mcr.microsoft.com/dotnet/runtime:6.0 +代码运行环境: mcr.microsoft.com/dotnet/runtime:8.0 apt-get 包源用的国内网易的 diff --git a/docs/questions.md b/docs/questions.md index 182d96663..9ba3b24de 100644 --- a/docs/questions.md +++ b/docs/questions.md @@ -214,7 +214,7 @@ curl -sSL https://ghproxy.com/https://raw.githubusercontent.com/RayWangQvQ/BiliB Windows: ``` # Run a separate PowerShell process because the script calls exit, so it will end the current PowerShell session. -&powershell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) --channel 6.0 --no-cdn --verbose" +&powershell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) --channel 8.0 --no-cdn --verbose" ``` 其他问题请见[官方文档](https://learn.microsoft.com/zh-cn/dotnet/core/tools/dotnet-install-script) diff --git a/docs/runInLocal.md b/docs/runInLocal.md index c45da5b27..6aa999461 100644 --- a/docs/runInLocal.md +++ b/docs/runInLocal.md @@ -2,7 +2,7 @@ -- [1. 任意系统，但已安装`.NET 6.0`](#1-任意系统但已安装net-60) +- [1. 任意系统，但已安装`.NET 8.0`](#1-任意系统但已安装net-80) - [2. Win](#2-win) - [3. Linux:](#3-linux) - [4. macOS](#4-macos) @@ -16,9 +16,9 @@ 对于不是开发者的朋友，可以通过下载 [BiliBiliTool/release](https://github.com/RayWangQvQ/BiliBiliToolPro/releases) 到本地或任意服务器运行。 -## 1. 任意系统，但已安装`.NET 6.0` +## 1. 任意系统，但已安装`.NET 8.0` -任何操作系统，不管是Win还是Linux还是mac，只要已安装了`.NET 6.0` 环境，均可通过下载`net-dependent.zip`运行。 +任何操作系统，不管是Win还是Linux还是mac，只要已安装了`.NET 8.0` 环境，均可通过下载`net-dependent.zip`运行。 下载解压后，进入应用目录，执行`dotnet ./Ray.BiliBiliTool.Console.dll --runTasks=Login` @@ -28,7 +28,7 @@ ![运行图示](imgs/run-exe.png) -P.S.这里的运行环境指的是 `.NET Runtime 6.0.0` ，安装方法可详见 [常见问题](questions.md) 中的 **本地或服务器如何安装.net环境** +P.S.这里的运行环境指的是 `.NET Runtime 8.0.0` ，安装方法可详见 [常见问题](questions.md) 中的 **本地或服务器如何安装.net环境** ## 2. Win diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index 946ae5f3c..a3154fd98 100644 --- a/qinglong/DefaultTasks/bili_task_base.sh +++ b/qinglong/DefaultTasks/bili_task_base.sh @@ -367,7 +367,7 @@ install_dotnet() { apk update fi { - apk add dotnet8-sdk + apk add dotnet8-sdk # https://pkgs.alpinelinux.org/packages } || { install_dotnet_by_script } diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh index e6fa17a4f..0332f0c3f 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh @@ -367,7 +367,7 @@ install_dotnet() { apk update fi { - apk add dotnet8-sdk + apk add dotnet8-sdk # https://pkgs.alpinelinux.org/packages } || { install_dotnet_by_script } diff --git a/qinglong/ray-dotnet-install.sh b/qinglong/ray-dotnet-install.sh index 1310277b2..7c429aad2 100644 --- a/qinglong/ray-dotnet-install.sh +++ b/qinglong/ray-dotnet-install.sh @@ -12,7 +12,7 @@ install_dependency() { # 通过官方脚本安装dotnet install_by_offical() { echo "install by offical script..." - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --no-cdn --verbose + curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 8.0 --no-cdn --verbose } # 创建软链接