Skip to content

Additional RPMs for CBL-Mariner #7951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikolaMilosavljevic merged 1 commit into from
Sep 23, 2021
Merged

Additional RPMs for CBL-Mariner #7951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/installer.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,15 @@
UseHardlinksIfPossible="False" />

<Message Text="$(MSBuildProjectName) -> $(InstallerFile)" Importance="high" />

<Copy Condition="'$(CreateRPMForCblMariner)' == 'true'"
SourceFiles="@(GeneratedRpmFiles)"
DestinationFiles="$(_InstallerFileCblMariner)"
OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" />

<Message Text="$(MSBuildProjectName) -> $(_InstallerFileCblMariner)" Importance="high" />
</Target>

<Target Name="GetRpmInstallerJsonProperties"
Expand Down
8 changes: 8 additions & 0 deletions src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/packaging-tools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@
<CompressedArchiveFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(CompressedFileExtension)</CompressedArchiveFile>
</PropertyGroup>

<PropertyGroup Condition="'$(InstallerExtension)' == '.rpm'">
<CreateRPMForCblMariner>true</CreateRPMForCblMariner>
<_CblMarinerVersionSuffix>cm.1</_CblMarinerVersionSuffix>
<_InstallerBuildPartCblMariner>$(ProductVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)</_InstallerBuildPartCblMariner>
<_InstallerFileNameWithoutExtensionCblMariner>$(InstallerName)-$(_InstallerBuildPartCblMariner)$(CrossArchContentsBuildPart)</_InstallerFileNameWithoutExtensionCblMariner>
<_InstallerFileCblMariner Condition="'$(_InstallerFileCblMariner)' == ''">$(AssetOutputPath)$(_InstallerFileNameWithoutExtensionCblMariner)$(InstallerExtension)</_InstallerFileCblMariner>
</PropertyGroup>

<!--
Set the directory containing contents to include in the archive (zip/tarball). This default
means the "shared" dir is inside the archive and it can be extracted directly into the dotnet
Expand Down