From bd751a9cf63d4230c84113ee25ceaaf542e6a7bd Mon Sep 17 00:00:00 2001
From: Jared Goodwin <translucency@outlook.com>
Date: Sat, 4 Apr 2020 09:23:05 -0700
Subject: [PATCH] Switch to self-contained deployments.

---
 Agent.Installer.Win/Services/InstallerService.cs            | 2 +-
 Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml   | 3 ++-
 Desktop.Win/Properties/PublishProfiles/win-x64.pubxml       | 3 ++-
 Desktop.Win/Properties/PublishProfiles/win-x86.pubxml       | 3 ++-
 .../Properties/PublishProfiles/linux-x64.pubxml             | 2 +-
 .../Properties/PublishProfiles/win-x64-debug.pubxml         | 2 +-
 ScreenCast.Win/Properties/PublishProfiles/win-x64.pubxml    | 2 +-
 ScreenCast.Win/Properties/PublishProfiles/win-x86.pubxml    | 2 +-
 Utilities/Publish.ps1                                       | 6 +++---
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Agent.Installer.Win/Services/InstallerService.cs b/Agent.Installer.Win/Services/InstallerService.cs
index 901e5859..526ede86 100644
--- a/Agent.Installer.Win/Services/InstallerService.cs
+++ b/Agent.Installer.Win/Services/InstallerService.cs
@@ -42,7 +42,7 @@ namespace Remotely.Agent.Installer.Win.Services
                     return false;
                 }
 
-                await InstallDesktpRuntimeIfNeeded();
+                //await InstallDesktpRuntimeIfNeeded();
 
                 StopService();
 
diff --git a/Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml
index 269443d4..a7198d2b 100644
--- a/Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml
+++ b/Desktop.Linux/Properties/PublishProfiles/linux-x64.pubxml
@@ -10,8 +10,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>..\Server\wwwroot\Downloads</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml
index 28b6ceed..07b73b6e 100644
--- a/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml
@@ -10,8 +10,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>..\Server\wwwroot\Downloads\Win-x64\</PublishDir>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml
index 3c28a405..ed0048c3 100644
--- a/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml
+++ b/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml
@@ -10,8 +10,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>..\Server\wwwroot\Downloads\Win-x86\</PublishDir>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/ScreenCast.Linux/Properties/PublishProfiles/linux-x64.pubxml b/ScreenCast.Linux/Properties/PublishProfiles/linux-x64.pubxml
index 17d8b706..e76efdf9 100644
--- a/ScreenCast.Linux/Properties/PublishProfiles/linux-x64.pubxml
+++ b/ScreenCast.Linux/Properties/PublishProfiles/linux-x64.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>..\Agent\bin\Release\netcoreapp3.1\linux-x64\publish\ScreenCast</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
   </PropertyGroup>
diff --git a/ScreenCast.Win/Properties/PublishProfiles/win-x64-debug.pubxml b/ScreenCast.Win/Properties/PublishProfiles/win-x64-debug.pubxml
index 35947dd1..78ec3524 100644
--- a/ScreenCast.Win/Properties/PublishProfiles/win-x64-debug.pubxml
+++ b/ScreenCast.Win/Properties/PublishProfiles/win-x64-debug.pubxml
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>x64</Platform>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>..\Agent\bin\Release\netcoreapp3.1\win10-x64\publish\ScreenCast</PublishDir>
-    <SelfContained>false</SelfContained>
+    <SelfContained>True</SelfContained>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
diff --git a/ScreenCast.Win/Properties/PublishProfiles/win-x64.pubxml b/ScreenCast.Win/Properties/PublishProfiles/win-x64.pubxml
index 6134c414..99690cd1 100644
--- a/ScreenCast.Win/Properties/PublishProfiles/win-x64.pubxml
+++ b/ScreenCast.Win/Properties/PublishProfiles/win-x64.pubxml
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>x64</Platform>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>..\Agent\bin\Release\netcoreapp3.1\win10-x64\publish\ScreenCast</PublishDir>
-    <SelfContained>false</SelfContained>
+    <SelfContained>True</SelfContained>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
diff --git a/ScreenCast.Win/Properties/PublishProfiles/win-x86.pubxml b/ScreenCast.Win/Properties/PublishProfiles/win-x86.pubxml
index f408786c..16254fe5 100644
--- a/ScreenCast.Win/Properties/PublishProfiles/win-x86.pubxml
+++ b/ScreenCast.Win/Properties/PublishProfiles/win-x86.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>..\Agent\bin\Release\netcoreapp3.1\win10-x86\publish\ScreenCast</PublishDir>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
   </PropertyGroup>
diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1
index dc0f7ec9..eef2660d 100644
--- a/Utilities/Publish.ps1
+++ b/Utilities/Publish.ps1
@@ -98,9 +98,9 @@ if ((Test-Path -Path "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish")
 
 
 # Publish Core clients.
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --no-self-contained --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --no-self-contained --output "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --no-self-contained --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x86\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.1\linux-x64\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.1\win10-x86\publish" "$Root\Agent"
 
 New-Item -Path "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish\ScreenCast\" -ItemType Directory -Force
 New-Item -Path "$Root\Agent\bin\Release\netcoreapp3.1\win10-x86\publish\ScreenCast\" -ItemType Directory -Force