diff --git a/Directory.Build.targets b/Directory.Build.targets index eada23439c..c682d826c1 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -191,6 +191,13 @@ $(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) + + <_CblMarinerVersionSuffix>cm.1 + $(SharedHostInstallerStart)$(SharedFrameworkNugetVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)$(InstallerExtension) + $(HostFxrInstallerStart)$(HostResolverVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)$(InstallerExtension) + $(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)$(InstallerExtension) + + $(DotnetRuntimeDependenciesPackageInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) diff --git a/src/pkg/packaging-tools/installer.targets b/src/pkg/packaging-tools/installer.targets index 1361dc23ac..75ad921e04 100644 --- a/src/pkg/packaging-tools/installer.targets +++ b/src/pkg/packaging-tools/installer.targets @@ -140,6 +140,15 @@ UseHardlinksIfPossible="False" /> + + + + $(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(CompressedFileExtension) + + true + <_CblMarinerVersionSuffix>cm.1 + <_InstallerBuildPartCblMariner>$(ProductVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture) + <_InstallerFileNameWithoutExtensionCblMariner>$(InstallerName)-$(_InstallerBuildPartCblMariner)$(CrossArchContentsBuildPart) + <_InstallerFileCblMariner Condition="'$(_InstallerFileCblMariner)' == ''">$(AssetOutputPath)$(_InstallerFileNameWithoutExtensionCblMariner)$(InstallerExtension) + +