refactor(build): uniformize dotnet publish properties

qwqcode · Jan 9, 2025 · e6bee3a · e6bee3a
1 parent 37dd971
commit e6bee3a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/SubRenamer/SubRenamer.csproj b/SubRenamer/SubRenamer.csproj
@@ -6,10 +6,11 @@
         <TargetFramework>net8.0</TargetFramework>
         <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
         <Nullable>enable</Nullable>
-        <TrimMode>copyused</TrimMode>
-        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-        <!--Public AOT-->
+        <!-- Public AOT -->
         <PublishAot>true</PublishAot>
+        <TrimMode>link</TrimMode>
+        <PublishTrimmed>true</PublishTrimmed>
+        <SelfContained>true</SelfContained>
         <InvariantGlobalization>true</InvariantGlobalization>
         <StripSymbols>true</StripSymbols>
         <NoWarn>IL2057;IL2026;IL2104;IL3053</NoWarn>
@@ -33,14 +34,7 @@
     <LinkerArg Include="-mmacosx-version-min=11.0" />
   </ItemGroup>
 
-	<ItemGroup>
-        <!--This helps with theme dll-s trimming.
-        If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
-        https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
-        <TrimmableAssembly Include="Avalonia.Themes.Fluent" />
-        <TrimmableAssembly Include="Avalonia.Themes.Default" />
-    </ItemGroup>
-
+  <!-- https://github.com/AvaloniaUI/Avalonia/issues/9503 -->
     <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win')) And '$(ENABLE_NATIVE_LIBS)' == 'true'">
         <DirectPInvoke Include="libHarfBuzzSharp" />
         <NativeLibrary Include="native\libHarfBuzzSharp.lib" Condition="$(RuntimeIdentifier.StartsWith('win'))" />

diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 mkdir -p dist/SubRenamer
-dotnet publish ../SubRenamer/SubRenamer.csproj -c Release -r linux-x64 -o dist/SubRenamer -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ../SubRenamer/SubRenamer.csproj -c Release -r linux-x64 -o dist/SubRenamer
 
 if command -v upx &> /dev/null; then
   upx -fq dist/SubRenamer/SubRenamer dist/SubRenamer/*.so

diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh
@@ -9,15 +9,15 @@ cp resources/App.plist dist/SubRenamer.app/Contents/Info.plist
 cp resources/App.icns dist/SubRenamer.app/Contents/Resources/App.icns
 
 mkdir -p dist/SubRenamer.app/Contents/MacOS
-dotnet publish $CS_PROJ -c Release -r osx-arm64 -o dist/SubRenamer.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish $CS_PROJ -c Release -r osx-arm64 -o dist/SubRenamer.app/Contents/MacOS
 cd dist
 zip SubRenamer_macos_arm64.zip -9 -r SubRenamer.app -x "*/*\.dsym/*"
 cd ..
 
 rm -rf dist/SubRenamer.app/Contents/MacOS
 
 mkdir -p dist/SubRenamer.app/Contents/MacOS
-dotnet publish $CS_PROJ -c Release -r osx-x64 -o dist/SubRenamer.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish $CS_PROJ -c Release -r osx-x64 -o dist/SubRenamer.app/Contents/MacOS
 cd dist
 zip SubRenamer_macos_amd64.zip -9 -r SubRenamer.app -x "*/*\.dsym/*"
 cd ..
diff --git a/scripts/build-win.ps1 b/scripts/build-win.ps1
@@ -6,7 +6,7 @@ if (Test-Path dist\SubRenamer_windows_amd64.zip) {
     Remove-Item dist\SubRenamer_windows_amd64.zip -Force
 }
 
-dotnet publish ..\SubRenamer\SubRenamer.csproj -c Release -r win-x64 -o dist\SubRenamer -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ..\SubRenamer\SubRenamer.csproj -c Release -r win-x64 -o dist\SubRenamer
 
 $files = Get-ChildItem -Path dist\SubRenamer
 $files | Where-Object { $_.Name -ne "SubRenamer.exe" } | Remove-Item -Force