优化发布脚本，使用-p:PublishTrimmed=true特性，有效减少包大小

RayWangQvQ · Dec 18, 2020 · 56f13eb · 56f13eb
1 parent 3f38e58
commit 56f13eb
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 29 deletions.
diff --git 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
@@ -9,29 +9,27 @@ on:
 
 jobs:
   build:
-    name: Publish release and upload asset
+    name: publish relesae
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
         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
@@ -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
diff --git a/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj b/src/Ray.BiliBiliTool.Agent/Ray.BiliBiliTool.Agent.csproj
@@ -7,8 +7,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Refit" Version="5.2.1" />
-    <PackageReference Include="Refit.HttpClientFactory" Version="5.2.1" />
+    <PackageReference Include="Refit" Version="5.2.4" />
+    <PackageReference Include="Refit.HttpClientFactory" Version="5.2.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
     <Authors>Ray</Authors>
-    <Version>1.0.17</Version>
+    <Version>1.0.18</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,14 +33,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Refit" Version="5.2.1" />
-    <PackageReference Include="Refit.HttpClientFactory" Version="5.2.1" />
+    <PackageReference Include="Refit" Version="5.2.4" />
+    <PackageReference Include="Refit.HttpClientFactory" Version="5.2.4" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Serilog.Sinks.TextWriter" Version="2.1.0" />
   </ItemGroup>

diff --git a/test/InfrastructureTest/InfrastructureTest.csproj b/test/InfrastructureTest/InfrastructureTest.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>