From 8f2a3bb314796e65b817929fec5162944d7fb6dd Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Wed, 13 Sep 2023 14:29:45 -0700
Subject: [PATCH] build: enable trimming and single file publish

---
 src/linux/Packaging.Linux/layout.sh                            | 1 -
 src/osx/Installer.Mac/layout.sh                                | 1 -
 .../Git-Credential-Manager/Git-Credential-Manager.csproj       | 3 +++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/linux/Packaging.Linux/layout.sh b/src/linux/Packaging.Linux/layout.sh
index 6679c39cae..0f174636bd 100755
--- a/src/linux/Packaging.Linux/layout.sh
+++ b/src/linux/Packaging.Linux/layout.sh
@@ -74,7 +74,6 @@ $DOTNET_ROOT/dotnet publish "$GCM_SRC" \
 	--framework="$FRAMEWORK" \
 	--runtime="$RUNTIME" \
 	--self-contained \
-	-p:PublishSingleFile=true \
 	--output="$(make_absolute "$PAYLOAD")" || exit 1
 
 # Collect symbols
diff --git a/src/osx/Installer.Mac/layout.sh b/src/osx/Installer.Mac/layout.sh
index ad8e2cfc26..293c3a43af 100755
--- a/src/osx/Installer.Mac/layout.sh
+++ b/src/osx/Installer.Mac/layout.sh
@@ -21,7 +21,6 @@ SRC="$ROOT/src"
 OUT="$ROOT/out"
 INSTALLER_SRC="$SRC/osx/Installer.Mac"
 GCM_SRC="$SRC/shared/Git-Credential-Manager"
-GCM_UI_SRC="$SRC/shared/Git-Credential-Manager.UI.Avalonia"
 
 # Build parameters
 FRAMEWORK=net8.0
diff --git a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
index a93b5cbb63..ea0c52e3ea 100644
--- a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
+++ b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
@@ -10,6 +10,9 @@
     <IsTestProject>false</IsTestProject>
     <LangVersion>latest</LangVersion>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>true</PublishTrimmed>
+    <InvariantGlobalization>true</InvariantGlobalization>
   </PropertyGroup>
 
   <ItemGroup>