From 67aff8ec5560fa0f8130b583a45729ad74035540 Mon Sep 17 00:00:00 2001
From: Virgile Bello <virgile@xenko.com>
Date: Tue, 5 May 2020 10:30:20 +0200
Subject: [PATCH] [Build] Fix automatic Pack when building from command line

---
 sources/targets/Stride.Core.PreSettings.targets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sources/targets/Stride.Core.PreSettings.targets b/sources/targets/Stride.Core.PreSettings.targets
index 4dae76290..f4bd4ae5d 100644
--- a/sources/targets/Stride.Core.PreSettings.targets
+++ b/sources/targets/Stride.Core.PreSettings.targets
@@ -114,6 +114,21 @@
     </ItemGroup>
   </Target>
 
+  <!-- Force a full Build & Pack if dependency was only built with a single TargetFramework (which would set IsInnerBuild and skip any Pack logic)
+       This is only a problem when building from command line, Visual Studio builds each project completely.
+       We use SkipPackOnInnerBuild to avoid infinite recursion. -->
+  <Target Name="_StrideTriggerPackOnInnerBuild"
+        BeforeTargets="CoreCompile"
+        Condition="'$(BuildingInsideVisualStudio)' != 'true' And '$(GeneratePackageOnBuild)' == 'true' And '$(SkipPackOnInnerBuild)' != 'true'">
+    <MSBuild Projects="@(_MSBuildProjectReferenceExistent)"
+             Condition="'%(_MSBuildProjectReferenceExistent.SetTargetFramework)' != ''"
+             BuildInParallel="$(BuildInParallel)"
+             Properties="SkipPackOnInnerBuild=true"
+             Targets="Build;Pack"
+             RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove);TargetFramework;RuntimeIdentifier">
+    </MSBuild>
+  </Target>
+
   <Target Name="GetPackagingOutputs" Condition=" '$(StrideRuntime)' == 'true' And '$(StrideRuntimeNetStandard)' == 'true' " />
 
   <!-- Use default runtime as ref assembly -->