From 5df3288c550d3300f02ace5c85f56c3ecf5c6363 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 27 Dec 2018 15:01:45 -0800
Subject: [PATCH 1/2] Adding a call to generate a targz for the combined Sdk +
 runtimes. We were missing that.

---
 src/redist/targets/GenerateArchives.targets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets
index 3577fb8d4..49d0ff566 100644
--- a/src/redist/targets/GenerateArchives.targets
+++ b/src/redist/targets/GenerateArchives.targets
@@ -20,6 +20,13 @@
         DestinationArchive="$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk).zip"
         OverwriteDestination="true" />
 
+    <TarGzFileCreateFromDirectory
+        Condition=" '$(OSName)' != 'win' "
+        SourceDirectory="$(RedistLayoutPath)"
+        DestinationArchive="$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk).tar.gz"
+        OverwriteDestination="true"
+        IgnoreExitCode="$(IgnoreTarExitCode)"/>
+
     <TarGzFileCreateFromDirectory
         Condition=" '$(OSName)' != 'win' "
         SourceDirectory="$(RedistLayoutPath)"

From 0433e6b549fbbd4049631a325c51b94d42c52e5f Mon Sep 17 00:00:00 2001
From: Livar <licavalc@microsoft.com>
Date: Thu, 27 Dec 2018 15:27:24 -0800
Subject: [PATCH 2/2] Addressing code review comment.

Fixing the set of files we put in the internal.tar.gz file.
---
 src/redist/targets/GenerateArchives.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets
index 49d0ff566..135542317 100644
--- a/src/redist/targets/GenerateArchives.targets
+++ b/src/redist/targets/GenerateArchives.targets
@@ -29,7 +29,7 @@
 
     <TarGzFileCreateFromDirectory
         Condition=" '$(OSName)' != 'win' "
-        SourceDirectory="$(RedistLayoutPath)"
+        SourceDirectory="$(SdkInternalLayoutPath)"
         DestinationArchive="$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk).tar.gz"
         OverwriteDestination="true"
         IgnoreExitCode="$(IgnoreTarExitCode)"/>