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.
This commit is contained in:
parent
e0e642a543
commit
d3e2ea2488
5 changed files with 26 additions and 28 deletions
41
.vsts-ci.yml
41
.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
|
||||
# - ${{ 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
|
|
@ -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' " />
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -291,8 +291,8 @@
|
|||
LayoutTemplates;
|
||||
LayoutBundledTools;
|
||||
RetargetTools;
|
||||
LayoutAppHostTemplate;
|
||||
CrossgenLayout;
|
||||
LayoutAppHostTemplate;
|
||||
SignLayout"
|
||||
AfterTargets="Build">
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue