Merge pull request #830 from RayWangQvQ/feature/829

[#829] Migrate form dotnet 6.0 to dotnet 8.0

Author: RayWangQvQ

.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

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

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 \

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

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 包源用的国内网易的
 

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

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

docker/sample/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   bilibili_tool:
     image: ghcr.io/raywangqvq/bilibili_tool_pro

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)

docs/runInLocal.md

@@ -2,7 +2,7 @@
 
 <!-- TOC depthFrom:2 -->
 
-- [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