From 75eb4e851939b98cb7b9da1d6147853fa9bbaf07 Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Sun, 26 Jul 2020 21:51:51 +0100
Subject: [PATCH] Move runtime copy into a separate target

---
 src/Directory.Build.targets                    |  1 +
 src/NzbDrone.Core.Test/Radarr.Core.Test.csproj |  9 ---------
 src/NzbDrone.Core/Radarr.Core.csproj           |  9 ---------
 src/Targets/CopyRuntimes.targets               | 11 +++++++++++
 src/Targets/MonoFacades.targets                |  2 +-
 5 files changed, 13 insertions(+), 19 deletions(-)
 create mode 100644 src/Targets/CopyRuntimes.targets

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 71ec08d0d..e8efeb5ec 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -7,4 +7,5 @@
   <Import Project="Targets/PublishAllRids.targets" />
   <Import Project="Targets/FixBindingRedirects.targets" />
   <Import Project="Targets/MonoFacades.targets" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and !$(RuntimeIdentifier.StartsWith('win'))" />
+  <Import Project="Targets/CopyRuntimes.targets" />
 </Project>
diff --git a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj
index a6c6163ed..45facb3a1 100644
--- a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj
@@ -18,9 +18,6 @@
     <ProjectReference Include="..\NzbDrone.Test.Common\Radarr.Test.Common.csproj" />
     <ProjectReference Include="..\NzbDrone.Core\Radarr.Core.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <RuntimeFiles Include="..\Runtimes\$(RuntimeIdentifier)\*" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Logo\1024.png">
       <Link>Files\1024.png</Link>
@@ -30,10 +27,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <Target Name="CopyRuntimeFilesOnBuild" AfterTargets="AfterBuild">
-    <Copy SourceFiles="@(RuntimeFiles)" DestinationFolder="$(OutDir)" />
-  </Target>
-  <Target Name="CopyRuntimeFilesOnPublish" AfterTargets="Publish">
-    <Copy SourceFiles="@(RuntimeFiles)" DestinationFolder="$(PublishDir)" />
-  </Target>
 </Project>
diff --git a/src/NzbDrone.Core/Radarr.Core.csproj b/src/NzbDrone.Core/Radarr.Core.csproj
index 2c4f69ac7..6ad3b0ff6 100644
--- a/src/NzbDrone.Core/Radarr.Core.csproj
+++ b/src/NzbDrone.Core/Radarr.Core.csproj
@@ -25,9 +25,6 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
   </ItemGroup>
-  <ItemGroup>
-    <RuntimeFiles Include="..\Runtimes\$(RuntimeIdentifier)\*" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\..\Logo\64.png">
       <Link>Resources\Logo\64.png</Link>
@@ -38,10 +35,4 @@
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Target Name="CopyRuntimeFilesOnBuild" AfterTargets="AfterBuild">
-    <Copy SourceFiles="@(RuntimeFiles)" DestinationFolder="$(OutDir)" />
-  </Target>
-  <Target Name="CopyRuntimeFilesOnPublish" AfterTargets="Publish">
-    <Copy SourceFiles="@(RuntimeFiles)" DestinationFolder="$(PublishDir)" />
-  </Target>
 </Project>
diff --git a/src/Targets/CopyRuntimes.targets b/src/Targets/CopyRuntimes.targets
new file mode 100644
index 000000000..f311ef3d7
--- /dev/null
+++ b/src/Targets/CopyRuntimes.targets
@@ -0,0 +1,11 @@
+<Project>
+  <ItemGroup>
+    <RuntimeFiles Include="..\Runtimes\$(RuntimeIdentifier)\*" />
+  </ItemGroup>
+  <Target Name="CopyRuntimeFilesOnBuild" AfterTargets="AfterBuild">
+    <Copy SourceFiles="@(RuntimeFiles)" DestinationFolder="$(OutDir)" />
+  </Target>
+  <Target Name="CopyRuntimeFilesOnPublish" AfterTargets="Publish">
+    <Copy SourceFiles="@(RuntimeFiles)" DestinationFolder="$(PublishDir)" />
+  </Target>
+</Project>
diff --git a/src/Targets/MonoFacades.targets b/src/Targets/MonoFacades.targets
index 6e1cc5484..7e358209c 100644
--- a/src/Targets/MonoFacades.targets
+++ b/src/Targets/MonoFacades.targets
@@ -13,7 +13,7 @@
   -->
 
   <PropertyGroup>
-    <MonoFacadesPath>$(MSBuildThisFileDirectory)Libraries\Mono\</MonoFacadesPath>
+    <MonoFacadesPath>$(MSBuildThisFileDirectory)..\Libraries\Mono\</MonoFacadesPath>
     <ResolveReferencesDependsOn>
       $(ResolveReferencesDependsOn);
       SubstituteMonoFacadesBuild