From e9eabf966c0be6de47f26c962026eca55c51d82f Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Mon, 31 Oct 2022 17:46:21 +0100
Subject: [PATCH] Cleaning a bit the MsBuild task

---
 src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj | 8 ++++----
 src/Greenshot/Greenshot.csproj                       | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj b/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj
index c29263448..f17e1ec78 100644
--- a/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj
+++ b/src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj
@@ -3,7 +3,10 @@
     <DefineConstants>$(DefineConstants);GREENSHOT_BUILDTASKS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" version="17.3.2" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" version="17.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>   
     <PackageReference Include="SixLabors.ImageSharp.Drawing" version="1.0.0-beta15" />
   </ItemGroup>
   <ItemGroup>
@@ -11,7 +14,4 @@
       <Link>Emojis.cs</Link>
     </Compile>
   </ItemGroup>
-  <Target Name="CleanupBuildAssemblies" AfterTargets="AfterBuild">
-    <Exec Command="del $(TargetDir)\Microsoft.Build.*.dll" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 53ff2fe71..f9978f8fd 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -33,6 +33,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Greenshot.Base\Greenshot.Base.csproj" />
     <ProjectReference Include="..\Greenshot.Editor\Greenshot.Editor.csproj" />
+    <ProjectReference Include="..\Greenshot.BuildTasks\Greenshot.BuildTasks.csproj" ReferenceOutputAssembly="false" />
     <FilesToHash Include="$(SolutionDir)$(SolutionName)\$(OutDir)\*" />
   </ItemGroup>
 
@@ -65,7 +66,7 @@
     </Task>
   </UsingTask>
 
-  <UsingTask TaskName="EmojiDataTask" TaskFactory="TaskHostFactory" AssemblyFile="..\Greenshot.BuildTasks\bin\Debug\net472\Greenshot.BuildTasks.dll" />
+  <UsingTask TaskName="EmojiDataTask" TaskFactory="TaskHostFactory" AssemblyFile="..\Greenshot.BuildTasks\bin\$(Configuration)\$(TargetFramework)\Greenshot.BuildTasks.dll" />
 
   <Target Name="GenerateEmojiTestTxtFile" BeforeTargets="BeforeBuild">
     <EmojiDataTask EmojiTestTxtFile="..\Greenshot.Editor\Controls\Emoji\emoji-test.txt" OutputFilename="$(SolutionDir)$(SolutionName)\$(OutDir)\emojis.xml" />