From 286d306051375c296016b7bf38b00f8ccaf910f8 Mon Sep 17 00:00:00 2001
From: Robin Krom <robin.krom@gmail.com>
Date: Tue, 4 Jun 2019 20:06:28 +0200
Subject: [PATCH] Preparations for https://github.com/mono/linker/issues/595
 [skip ci]

---
 azure-pipelines.yml            | 4 ++--
 src/Directory.Build.props      | 4 ++++
 src/Greenshot/Greenshot.csproj | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 83bcb1dbb..26199bf03 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,7 +35,7 @@ steps:
     command: 'publish'
     publishWebProjects: false
     projects: 'src\Greenshot\Greenshot.csproj'
-    arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x64 /p:PublishReadyToRun=true'
+    arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x64'
     zipAfterPublish: false
 
 - task: CmdLine@2
@@ -49,7 +49,7 @@ steps:
     command: 'publish'
     publishWebProjects: false
     projects: 'src\Greenshot\Greenshot.csproj'
-    arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x86 /p:PublishReadyToRun=true'
+    arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:PublishTrimmed=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x86'
     zipAfterPublish: false
 
 - task: CmdLine@2
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f18c2d178..01d7c9ec3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -53,6 +53,10 @@
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Addon.'))">
+    <RootPackageReference>true</RootPackageReference>
+  </PropertyGroup>
+
   <ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.3.167">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index ebe50da3b..2349b5a19 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -57,9 +57,13 @@
   
   <ItemGroup>
     <ProjectReference Include="..\Greenshot.Addon.ExternalCommand\Greenshot.Addon.ExternalCommand.csproj" />
+    <TrimmerRootAssembly Include="Greenshot.Addon.ExternalCommand" />
     <ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj" />
+    <TrimmerRootAssembly Include="Greenshot.Addon.InternetExplorer" />
     <ProjectReference Include="..\Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj" />
+    <TrimmerRootAssembly Include="Greenshot.Addon.LegacyEditor" />
     <ProjectReference Include="..\Greenshot.Addon.Office\Greenshot.Addon.Office.csproj" />
+    <TrimmerRootAssembly Include="Greenshot.Addon.Office" />
     <ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
     <ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" />
     <ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />