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 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 diff --git a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj index cb5bbf08c..69242f895 100644 --- a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj +++ b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj @@ -1,15 +1,15 @@  - 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 90b5e4c9b..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,11 +1,11 @@  - 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 46d04486a..ff2aa17da 100644 --- a/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj +++ b/src/Ray.BiliBiliTool.Application/Ray.BiliBiliTool.Application.csproj @@ -1,14 +1,14 @@  - 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 1295b7399..40557d41a 100644 --- a/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj +++ b/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj @@ -1,16 +1,16 @@  - 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 7900ba23f..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 ..\.. @@ -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..34128c618 100644 --- a/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj +++ b/src/Ray.BiliBiliTool.DomainService/Ray.BiliBiliTool.DomainService.csproj @@ -1,16 +1,16 @@  - 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 ce2d959f5..c32603107 100644 --- a/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj +++ b/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj @@ -1,13 +1,13 @@  - net6.0 + net8.0 - - - + + + \ No newline at end of file diff --git a/test/AppServiceTest/AppServiceTest.csproj b/test/AppServiceTest/AppServiceTest.csproj index b0f835762..8e7268303 100644 --- a/test/AppServiceTest/AppServiceTest.csproj +++ b/test/AppServiceTest/AppServiceTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable @@ -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..0b250a9c8 100644 --- a/test/BiliAgentTest/BiliAgentTest.csproj +++ b/test/BiliAgentTest/BiliAgentTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable false @@ -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..8c1a57a22 100644 --- a/test/ConfigTest/ConfigTest.csproj +++ b/test/ConfigTest/ConfigTest.csproj @@ -1,18 +1,18 @@  - net6.0 + net8.0 false - - - + + + 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..c8c44468e 100644 --- a/test/DomainServiceTest/DomainServiceTest.csproj +++ b/test/DomainServiceTest/DomainServiceTest.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable @@ -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..98ae632fe 100644 --- a/test/InfrastructureTest/InfrastructureTest.csproj +++ b/test/InfrastructureTest/InfrastructureTest.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable @@ -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..e0f7c6e13 100644 --- a/test/LogTest/LogTest.csproj +++ b/test/LogTest/LogTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 false @@ -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..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 @@ -10,11 +10,17 @@ - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +