From d2528332b2c2a3d7659bb00f18318332ed962114 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Sun, 4 Nov 2018 18:52:13 -0800
Subject: [PATCH] Move, merge, and rename RPM targets

---
 old/build/package/Installer.RPM.props                    | 9 ---------
 .../redist/targets/GenerateRPMs.targets                  | 8 +++++++-
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 old/build/package/Installer.RPM.props
 rename old/build/package/Installer.RPM.targets => src/redist/targets/GenerateRPMs.targets (97%)

diff --git a/old/build/package/Installer.RPM.props b/old/build/package/Installer.RPM.props
deleted file mode 100644
index 1b93101c3..000000000
--- a/old/build/package/Installer.RPM.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RpmConfigJsonName>rpm_config.json</RpmConfigJsonName>
-    <TemplatesDir>$(RepoRoot)/packaging/rpm/templates</TemplatesDir>
-    <ScriptsDir>$(RepoRoot)/packaging/rpm/scripts</ScriptsDir>
-    <AfterInstallHostScriptName>after_install_host.sh</AfterInstallHostScriptName>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/old/build/package/Installer.RPM.targets b/src/redist/targets/GenerateRPMs.targets
similarity index 97%
rename from old/build/package/Installer.RPM.targets
rename to src/redist/targets/GenerateRPMs.targets
index acb7531d6..3dba50058 100644
--- a/old/build/package/Installer.RPM.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project='Installer.RPM.props'/>
+
+  <PropertyGroup>
+    <RpmConfigJsonName>rpm_config.json</RpmConfigJsonName>
+    <TemplatesDir>$(RepoRoot)/packaging/rpm/templates</TemplatesDir>
+    <ScriptsDir>$(RepoRoot)/packaging/rpm/scripts</ScriptsDir>
+    <AfterInstallHostScriptName>after_install_host.sh</AfterInstallHostScriptName>
+  </PropertyGroup>
 
   <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CLIBuildDll)"/>
   <UsingTask TaskName="BuildFPMToolPreReqs" AssemblyFile="$(CLIBuildDll)"/>