From 17b0d7ddcb9c4fa3c6d30938e81c310c12eab9cc Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 26 Jul 2024 11:43:59 +0800
Subject: [PATCH] build: update build scripts

---
 .github/workflows/ci.yml                       | 8 ++++----
 build/build.osx.command                        | 4 ++--
 build/build.windows.ps1                        | 4 ++--
 build/resources/appimage/publish-appimage.conf | 4 ++--
 src/SourceGit.csproj                           | 7 ++++++-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d7acac8..374bd841 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r win-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r win-x64
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -43,7 +43,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-x64
       - name: Packing Program
         run:  tar -cvf sourcegit.osx-x64.tar -C publish/ .
       - name: Upload Artifact
@@ -66,7 +66,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64
       - name: Packing Program
         run: tar -cvf sourcegit.osx-arm64.tar -C publish/ .
       - name: Upload Artifact
@@ -89,7 +89,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-x64
       - name: Rename Executable File
         run: mv publish/SourceGit publish/sourcegit
       - name: Packing Program
diff --git a/build/build.osx.command b/build/build.osx.command
index 985dbebc..f60c87b7 100755
--- a/build/build.osx.command
+++ b/build/build.osx.command
@@ -9,13 +9,13 @@ cp resources/app/App.icns SourceGit.app/Contents/Resources/App.icns
 sed "s/SOURCE_GIT_VERSION/${version}/g" resources/app/App.plist > SourceGit.app/Contents/Info.plist
 
 mkdir -p SourceGit.app/Contents/MacOS
-dotnet publish ../src/SourceGit.csproj -c Release -r osx-arm64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ../src/SourceGit.csproj -c Release -r osx-arm64 -o SourceGit.app/Contents/MacOS
 zip sourcegit_${version}.osx-arm64.zip -r SourceGit.app -x "*/*\.dsym/*"
 
 rm -rf SourceGit.app/Contents/MacOS
 
 mkdir -p SourceGit.app/Contents/MacOS
-dotnet publish ../src/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ../src/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS
 zip sourcegit_${version}.osx-x64.zip -r SourceGit.app -x "*/*\.dsym/*"
 
 rm -rf SourceGit.app
diff --git a/build/build.windows.ps1 b/build/build.windows.ps1
index a218d5cd..23735e4c 100644
--- a/build/build.windows.ps1
+++ b/build/build.windows.ps1
@@ -6,7 +6,7 @@ if (Test-Path SourceGit) {
 
 Remove-Item *.zip -Force
 
-dotnet publish ..\src\SourceGit.csproj -c Release -r win-arm64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ..\src\SourceGit.csproj -c Release -r win-arm64 -o SourceGit
 
 Remove-Item SourceGit\*.pdb -Force
 
@@ -16,7 +16,7 @@ if (Test-Path SourceGit) {
     Remove-Item SourceGit -Recurse -Force
 }
 
-dotnet publish ..\src\SourceGit.csproj -c Release -r win-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ..\src\SourceGit.csproj -c Release -r win-x64 -o SourceGit
 
 Remove-Item SourceGit\*.pdb -Force
 
diff --git a/build/resources/appimage/publish-appimage.conf b/build/resources/appimage/publish-appimage.conf
index 6b17ddc0..ea44ee3b 100644
--- a/build/resources/appimage/publish-appimage.conf
+++ b/build/resources/appimage/publish-appimage.conf
@@ -82,7 +82,7 @@ DOTNET_PROJECT_PATH="../../../src/SourceGit.csproj"
 # Additional useful arguments include:
 # "-p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:TrimMode=link"
 # Refer: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-publish
-DOTNET_PUBLISH_ARGS="-c Release -p:DebugType=None -p:DebugSymbols=false -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained"
+DOTNET_PUBLISH_ARGS="-c Release -p:DebugType=None -p:DebugSymbols=false"
 
 
 ########################################
@@ -137,4 +137,4 @@ PKG_APPIMAGE_SUFFIX=".AppImage"
 APPIMAGETOOL_COMMAND="appimagetool"
 
 # Internal use only. Used for compatibility between conf and script. Do not modify.
-CONF_IMPL_VERSION=1
\ No newline at end of file
+CONF_IMPL_VERSION=1
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 6ddadd46..143554bb 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -9,7 +9,12 @@
     <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
-
+    
+    <PublishAot>true</PublishAot>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>link</TrimMode>
+    <OptimizationPreference>Size</OptimizationPreference>
+    
     <Product>SourceGit</Product>
     <Description>OpenSource GIT client</Description>
     <Company>sourcegit-scm</Company>