From 249c9b19c17ee53cc447b71c34d0e535586e353f Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 19 Jan 2022 21:21:15 -0800
Subject: [PATCH] Unconditionally enable `DebBuild` and `RpmBuild` - address a
build issue mentioned in dotnet/aspnetcore-internal#3988 - I accidentally
disabled these targets for targeting packs in 08968dd0d6ab
---
src/Installers/Debian/Directory.Build.targets | 3 +--
src/Installers/Rpm/Directory.Build.targets | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/Installers/Debian/Directory.Build.targets b/src/Installers/Debian/Directory.Build.targets
index 6b46efd2584..2d854470f15 100644
--- a/src/Installers/Debian/Directory.Build.targets
+++ b/src/Installers/Debian/Directory.Build.targets
@@ -27,8 +27,7 @@
<Target Name="Build" DependsOnTargets="DebBuild" />
<Target Name="Pack" />
- <Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)"
- Condition=" '$(MSBuildProjectName)' != 'Debian.TargetingPack' ">
+ <Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)">
<!-- Generate debian_config.json. We can't simply use WriteLinesToFile because of https://github.com/Microsoft/msbuild/issues/1622. Use our custom GenerateFileFromTemplate task instead -->
<PropertyGroup>
<DebianConfigProperties>
diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets
index 906b2cd30de..4bd792c1848 100644
--- a/src/Installers/Rpm/Directory.Build.targets
+++ b/src/Installers/Rpm/Directory.Build.targets
@@ -36,8 +36,7 @@
<Target Name="Build" DependsOnTargets="RpmBuild" />
<Target Name="Pack" />
- <Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)"
- Condition=" '$(MSBuildProjectName)' != 'Rpm.TargetingPack' ">
+ <Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)">
<!-- Create layout: Create changelog -->
<PropertyGroup>
<ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps>
--
GitLab