From b81fb5892ac8e0fc3af2a03ac735e17de9800366 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 22 Sep 2021 16:08:55 -0700 Subject: [PATCH] Generate Mariner RPM Fixes #12077 --- src/redist/targets/GenerateRPMs.targets | 7 +++++++ src/redist/targets/GetRuntimeInformation.targets | 1 + 2 files changed, 8 insertions(+) diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index ccbd0a79f..935684431 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -180,6 +180,12 @@ SkipUnchangedFiles="False" UseHardlinksIfPossible="False"/> + + $(RedistLayoutPath)templates/ $(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(SdkRPMInstallerFile) + $(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(RepoRoot)/Documentation/manpages $(RepoRoot)/test/EndToEnd/EndToEnd.csproj diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 549b8e48b..5133c3a38 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -38,6 +38,7 @@ Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. --> Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture) + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(Architecture)