From 56f13eb330e296dce8e8b3b575abd8a926495aa9 Mon Sep 17 00:00:00 2001 From: RayWang <2271272653@qq.com> Date: Fri, 18 Dec 2020 13:14:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E5=B8=83=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E4=BD=BF=E7=94=A8-p:PublishTrimmed=3Dtrue?= =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=8C=E6=9C=89=E6=95=88=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E5=8C=85=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/bilibili-daily-task.yml | 8 +++----- .github/workflows/publish-release.yml | 18 ++++++++---------- publish.bat | 12 ++++++++++++ .../Ray.BiliBiliTool.Agent.csproj | 4 ++-- .../DailyTaskAppService.cs | 11 ++++------- .../Ray.BiliBiliTool.Console.csproj | 8 ++++---- .../InfrastructureTest.csproj | 2 +- 7 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 publish.bat diff --git a/.github/workflows/bilibili-daily-task.yml b/.github/workflows/bilibili-daily-task.yml index 06a7a896a..33d4f4d9f 100644 --- a/.github/workflows/bilibili-daily-task.yml +++ b/.github/workflows/bilibili-daily-task.yml @@ -35,13 +35,11 @@ jobs: with: dotnet-version: 5.0.x - # 还原、构建、发布 + # 发布 - name: Publish run: | - dotnet restore - dotnet build --configuration Release --no-restore cd ./src/Ray.BiliBiliTool.Console - dotnet publish --self-contained false -o ./bin/Publish/net5-dependent + dotnet publish --configuration Release --self-contained false --output ./bin/Publish/net5-dependent # 运行 - name: Run APP @@ -64,7 +62,7 @@ jobs: Ray_DailyTaskConfig:DevicePlatform: ${{secrets.DEVICEPLATFORM}} Ray_Serilog:WriteTo:0:Args:restrictedToMinimumLevel: ${{secrets.CONSOLELOGLEVEL}} Ray_Serilog:WriteTo:0:Args:outputTemplate: ${{secrets.CONSOLELOGTEMPLATE}} - ASPNETCORE_ENVIRONMENT: ${{secrets.ENV}} # 方便切换不同的appsettings文件 也可以在不同的action yml文件中配置来同时运行多个任务 + ASPNETCORE_ENVIRONMENT: ${{secrets.ENV}} # 运行环境 Ray_WebProxy: ${{secrets.PROXY}} # 代理 run: | cd ./src/Ray.BiliBiliTool.Console/bin/Publish/net5-dependent diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 4119efc59..3c02d2d52 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,7 +9,7 @@ on: jobs: build: - name: Publish release and upload asset + name: publish relesae runs-on: ubuntu-latest steps: @@ -17,21 +17,19 @@ jobs: uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.100 + dotnet-version: 5.0.x - name: Publish and zip run: | - dotnet restore - dotnet build --configuration Release --no-restore cd ./src/Ray.BiliBiliTool.Console - dotnet publish --self-contained false -o ./bin/Publish/net5-dependent + dotnet publish --configuration Release --self-contained false -o ./bin/Publish/net5-dependent echo "dotnet Ray.BiliBiliTool.Console.dll" > ./bin/Publish/net5-dependent/start.bat - dotnet publish --runtime win-x86 --self-contained true -o ./bin/Publish/win-x86-x64 - dotnet publish --runtime linux-arm --self-contained true -o ./bin/Publish/linux-arm - dotnet publish --runtime linux-x64 --self-contained true -o ./bin/Publish/linux-x64 - dotnet publish --runtime osx-x64 --self-contained true -o ./bin/Publish/osx-x64 + dotnet publish --configuration Release --runtime win-x86 --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/win-x86-x64 + dotnet publish --configuration Release --runtime linux-arm --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/linux-arm + dotnet publish --configuration Release --runtime linux-x64 --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/linux-x64 + dotnet publish --configuration Release --runtime osx-x64 --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/osx-x64 cd ./bin/Publish zip -q -r bilibili-tool-v${{ github.event.inputs.version }}-net5-dependent.zip net5-dependent zip -q -r bilibili-tool-v${{ github.event.inputs.version }}-win-x86-x64.zip win-x86-x64 diff --git a/publish.bat b/publish.bat new file mode 100644 index 000000000..c8973d676 --- /dev/null +++ b/publish.bat @@ -0,0 +1,12 @@ + +cd ./src/Ray.BiliBiliTool.Console + +dotnet publish --configuration Release --self-contained false -o ./bin/Publish/net5-dependent +echo "dotnet Ray.BiliBiliTool.Console.dll" > ./bin/Publish/net5-dependent/start.bat + +dotnet publish --configuration Release --runtime win-x86 --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/win-x86-x64 +dotnet publish --configuration Release --runtime linux-arm --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/linux-arm +dotnet publish --configuration Release --runtime linux-x64 --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/linux-x64 +dotnet publish --configuration Release --runtime osx-x64 --self-contained true -p:PublishTrimmed=true -o ./bin/Publish/osx-x64 + +pause \ No newline at end of file diff --git a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj index d97d4a0f9..1de81c005 100644 --- a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj +++ b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Ray.BiliBiliTool.Application/DailyTaskAppService.cs b/src/Ray.BiliBiliTool.Application/DailyTaskAppService.cs index 68cd129e0..9bdbaf3d4 100644 --- a/src/Ray.BiliBiliTool.Application/DailyTaskAppService.cs +++ b/src/Ray.BiliBiliTool.Application/DailyTaskAppService.cs @@ -47,17 +47,14 @@ public void DoDailyTask() { if (_securityOptions.IsSkipDailyTask) { - _logger.LogWarning("\r\n已配置为跳过每日任务"); + _logger.LogWarning("已配置为跳过每日任务"); return; } - _logger.LogInformation("\r\n-----开始每日任务-----\r\n"); + _logger.LogInformation("-----开始每日任务-----\r\n"); - UseInfo userInfo; - DailyTaskInfo dailyTaskInfo; - - userInfo = Login(); - dailyTaskInfo = GetDailyTaskStatus(); + UseInfo userInfo = Login(); + DailyTaskInfo dailyTaskInfo = GetDailyTaskStatus(); WatchAndShareVideo(dailyTaskInfo); AddCoinsForVideo(); diff --git a/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj b/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj index 79b3ba350..92cb7fbfa 100644 --- a/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj +++ b/src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj @@ -4,7 +4,7 @@ Exe net5.0 Ray - 1.0.17 + 1.0.18 @@ -33,14 +33,14 @@ - + - - + + diff --git a/test/InfrastructureTest/InfrastructureTest.csproj b/test/InfrastructureTest/InfrastructureTest.csproj index a9a8296c1..4de04c2c7 100644 --- a/test/InfrastructureTest/InfrastructureTest.csproj +++ b/test/InfrastructureTest/InfrastructureTest.csproj @@ -6,7 +6,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive