From 25f125748dc0352d66385281e7a4468621233739 Mon Sep 17 00:00:00 2001
From: George Pollard <gpollard@microsoft.com>
Date: Tue, 18 Jul 2023 16:16:44 +1200
Subject: [PATCH] Update packaging of LibFuzzerDotNetLoader (#3248)

* Trim LibFuzzerDotNetLoader

* Trim more, update invocations

* Undo trimming

* Also reduce size of SharpFuzz

* Undo Sharpfuzz changes; they break it for some reason
---
 .../LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.csproj      | 6 ++++++
 src/ci/dotnet-fuzzing-tools.ps1                             | 2 +-
 src/ci/dotnet-fuzzing-tools.sh                              | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/agent/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.csproj b/src/agent/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.csproj
index 5554e45f83..80b629e517 100644
--- a/src/agent/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.csproj
+++ b/src/agent/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.csproj
@@ -6,6 +6,12 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <!-- make published binaries as small as possible -->
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>true</PublishSingleFile>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <DebuggerSupport>false</DebuggerSupport>
+    <!-- /end -->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ci/dotnet-fuzzing-tools.ps1 b/src/ci/dotnet-fuzzing-tools.ps1
index c6ba756655..95c1c7fa1d 100644
--- a/src/ci/dotnet-fuzzing-tools.ps1
+++ b/src/ci/dotnet-fuzzing-tools.ps1
@@ -26,7 +26,7 @@ popd
 
 # Build SharpFuzz and our dynamic loader harness for `libfuzzer-dotnet`.
 pushd src/agent/LibFuzzerDotnetLoader
-dotnet publish . -c Release -o $ARTIFACTS/LibFuzzerDotnetLoader --sc -r win10-x64
+dotnet publish . -c Release -o $ARTIFACTS/LibFuzzerDotnetLoader -r win10-x64
 if ($LASTEXITCODE -ne 0) { throw "dotnet publish exited with $LASTEXITCODE" }
 popd
 
diff --git a/src/ci/dotnet-fuzzing-tools.sh b/src/ci/dotnet-fuzzing-tools.sh
index 14e199b7fd..8395b14ce1 100755
--- a/src/ci/dotnet-fuzzing-tools.sh
+++ b/src/ci/dotnet-fuzzing-tools.sh
@@ -34,7 +34,7 @@ popd
 
 # Build SharpFuzz and our dynamic loader harness for `libfuzzer-dotnet`.
 pushd src/agent/LibFuzzerDotnetLoader
-dotnet publish . -c Release -o $ARTIFACTS/LibFuzzerDotnetLoader --sc -r linux-x64
+dotnet publish . -c Release -o $ARTIFACTS/LibFuzzerDotnetLoader -r linux-x64
 popd
 
 # Build `libfuzzer-dotnet`.