From d3e2ea24881720ea5b52c6776287f42f5864ebf8 Mon Sep 17 00:00:00 2001
From: Parallels <livar@live.com>
Date: Mon, 24 Dec 2018 10:12:23 -0800
Subject: [PATCH] Fixing debs generation. The issue was that we were losing the
 exec permission on the apphost in the sdk folder. This caused it to not be
 picked up by dh_shlibsdeps. This happened because the order of the apphost
 acquisition was changed to be after crossgen, where we change permissions of
 all files under  the SDK folder to 644. The fix here was to make the apphost
 acquisition to happen after crossgen.

---
 .vsts-ci.yml                                  | 41 +++++++++----------
 eng/Publishing.props                          |  4 +-
 eng/Versions.props                            |  2 +-
 src/redist/targets/GenerateInstallers.targets |  5 +--
 src/redist/targets/GenerateLayout.targets     |  2 +-
 5 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index d8de2cfc6..085d993dd 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -200,17 +200,16 @@ jobs:
             _RuntimeIdentifier: '--runtime-id linux-musl-x64'
             _BuildArchitecture: 'x64'
             _DropSuffix: ''
-          # disabling this for now. I am missing something and it is not generating deb
-          # Build_Linux_Portable_Deb_Release_x64:
-          #   _BuildConfig: Release
-          #   _DockerParameter: '--docker ubuntu.16.04'
-          #   _LinuxPortable: '--linux-portable'
-          #   _RuntimeIdentifier: ''
-          #   _BuildArchitecture: 'x64'
-          #   _DropSuffix: ''
-          #   # Do not publish zips and tarballs. The linux-x64 binaries are
-          #   # already published by Build_LinuxPortable_Release_x64
-          #  _AdditionalBuildParameters: '/p:PublishBinaries=false'
+          Build_Linux_Portable_Deb_Release_x64:
+            _BuildConfig: Release
+            _DockerParameter: '--docker ubuntu.16.04'
+            _LinuxPortable: '--linux-portable'
+            _RuntimeIdentifier: ''
+            _BuildArchitecture: 'x64'
+            _DropSuffix: ''
+            # Do not publish zips and tarballs. The linux-x64 binaries are
+            # already published by Build_LinuxPortable_Release_x64
+            _AdditionalBuildParameters: '/p:PublishBinaries=false'
           Build_Linux_Portable_Rpm_Release_x64:
             _BuildConfig: Release
             _DockerParameter: '--docker rhel'
@@ -271,13 +270,13 @@ jobs:
                 /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key)
         displayName: Copy to latest
 
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-  - template: /eng/common/templates/phases/publish-build-assets.yml
-    parameters:
-      dependsOn:
-        - Windows_NT
-        - Linux
-        - Darwin
-        - Copy_SDK_To_Latest
-      queue:
-        name: Hosted VS2017
\ No newline at end of file
+# - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+#   - template: /eng/common/templates/phases/publish-build-assets.yml
+#     parameters:
+#       dependsOn:
+#         - Windows_NT
+#         - Linux
+#         - Darwin
+#         - Copy_SDK_To_Latest
+#       queue:
+#         name: Hosted VS2017
\ No newline at end of file
diff --git a/eng/Publishing.props b/eng/Publishing.props
index bcf0a5cbb..04dcd407a 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -4,8 +4,6 @@
 
   <Import Project="$(RepoRoot)\src\redist\targets\Versions.targets" />
 
-  <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets"/>
-
   <PropertyGroup>
     <Product>Sdk</Product>
     <BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
@@ -22,6 +20,8 @@
     <PublishBinaries Condition=" '$(PublishBinaries)' == '' ">true</PublishBinaries>
   </PropertyGroup>
 
+  <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' " />
+
   <ItemGroup>
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.zip" Condition=" '$(PublishBinaries)' == 'true' " />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.tar.gz" Condition=" '$(PublishBinaries)' == 'true' " />
diff --git a/eng/Versions.props b/eng/Versions.props
index 24f08d6e0..87e4a7ac8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27205-02</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27218-01</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
   </PropertyGroup>
 
diff --git a/src/redist/targets/GenerateInstallers.targets b/src/redist/targets/GenerateInstallers.targets
index 9af4a2bab..32a7bf21b 100644
--- a/src/redist/targets/GenerateInstallers.targets
+++ b/src/redist/targets/GenerateInstallers.targets
@@ -1,12 +1,11 @@
 <Project>
 
-  <!-- TODO: Add GenerateDebs to this list: https://github.com/dotnet/core-sdk/issues/201 -->
-
   <Target Name="GenerateInstallers"
           AfterTargets="Pack"
           DependsOnTargets="GetCurrentRuntimeInformation;
                             GenerateMsis;
                             GeneratePkgs;
-                            GenerateRpms;"
+                            GenerateRpms;
+                            GenerateDebs"
           />
 </Project>
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 404b6282c..3da5f6d88 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -291,8 +291,8 @@
                             LayoutTemplates;
                             LayoutBundledTools;
                             RetargetTools;
-                            LayoutAppHostTemplate;
                             CrossgenLayout;
+                            LayoutAppHostTemplate;
                             SignLayout"
           AfterTargets="Build">