From e7055d897e182a9c9a7d15e9d06fca3466fce13b Mon Sep 17 00:00:00 2001
From: Jared <translucency@outlook.com>
Date: Sun, 20 Dec 2020 07:45:21 -0800
Subject: [PATCH] Add trimming back.

---
 .../Properties/PublishProfiles/desktop-linux-x64.pubxml     | 2 +-
 .../Properties/PublishProfiles/packaged-linux-x64.pubxml    | 2 +-
 Desktop.Win/Desktop.Win.csproj                              | 6 ++++++
 .../Properties/PublishProfiles/desktop-win-x86.pubxml       | 3 ++-
 .../Properties/PublishProfiles/packaged-win-x64.pubxml      | 2 +-
 .../Properties/PublishProfiles/packaged-win-x86.pubxml      | 2 +-
 Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml   | 2 +-
 Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml   | 2 +-
 Utilities/Publish.ps1                                       | 6 +++---
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml
index 0235ac31f..ee95cca0c 100644
--- a/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml
+++ b/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml
@@ -12,7 +12,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
     <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
index d4dfdb003..5f3f9311d 100644
--- a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
+++ b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
@@ -12,6 +12,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj
index e33b04bf0..fa03238f6 100644
--- a/Desktop.Win/Desktop.Win.csproj
+++ b/Desktop.Win/Desktop.Win.csproj
@@ -33,6 +33,12 @@
     <None Remove="Assets\Remotely_Icon.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <TrimmerRootAssembly Include="System.Runtime"/>
+    <TrimmerRootAssembly Include="System.Runtime.Extensions"/>
+    <TrimmerRootAssembly Include="System.Diagnostics.Debug"/>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="2.0.2" />
     <PackageReference Include="NAudio" Version="1.10.0" />
diff --git a/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml
index a257db3d0..541c75dbb 100644
--- a/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml
@@ -13,6 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
+    <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
index 8f300e908..3ee4b8bea 100644
--- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
index f7d52492f..7babed0ef 100644
--- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml
index c4f995bdf..c89833b57 100644
--- a/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml
@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
index 024aae556..f8f21da8e 100644
--- a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1
index 0c9fc2e81..aacc6b362 100644
--- a/Utilities/Publish.ps1
+++ b/Utilities/Publish.ps1
@@ -117,9 +117,9 @@ if ((Test-Path -Path "$Root\Agent\bin\Release\net5.0\linux-x64\publish") -eq $tr
 
 
 # Publish Core clients.
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output "$Root\Agent\bin\Release\net5.0\win10-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\net5.0\linux-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output "$Root\Agent\bin\Release\net5.0\win10-x86\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release -p:PublishTrimmed=True --output "$Root\Agent\bin\Release\net5.0\win10-x64\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release -p:PublishTrimmed=True --output "$Root\Agent\bin\Release\net5.0\linux-x64\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release -p:PublishTrimmed=True --output "$Root\Agent\bin\Release\net5.0\win10-x86\publish" "$Root\Agent"
 
 New-Item -Path "$Root\Agent\bin\Release\net5.0\win10-x64\publish\Desktop\" -ItemType Directory -Force
 New-Item -Path "$Root\Agent\bin\Release\net5.0\win10-x86\publish\Desktop\" -ItemType Directory -Force