From 5b7b8fe6dc3bd4a2f105239c464f99bb952110b5 Mon Sep 17 00:00:00 2001
From: Karthik Rajasekaran <karajas@microsoft.com>
Date: Thu, 25 May 2017 16:39:51 -0700
Subject: [PATCH] Combine deb package props with deb publish props

Commit migrated from https://github.com/dotnet/core-setup/commit/71e078560e53542e46de7cfe084c2a7ccfee3ae8
---
 src/installer/pkg/packaging/deb/package.props | 9 ---------
 src/installer/publish/dir.targets             | 6 +++---
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/installer/pkg/packaging/deb/package.props b/src/installer/pkg/packaging/deb/package.props
index 5142be7..2b9c211 100644
--- a/src/installer/pkg/packaging/deb/package.props
+++ b/src/installer/pkg/packaging/deb/package.props
@@ -6,14 +6,5 @@
     <toolConsumerProjectName>dotnet-deb-tool-consumer.csproj</toolConsumerProjectName>
     <consumingProjectDirectory>$(IntermediateOutputRootPath)$(toolConsumerProjectName)</consumingProjectDirectory>
     <debPackaginfConfigPath>$(PackagingRoot)deb/</debPackaginfConfigPath>
-
-    <SharedHostDebPkgName>dotnet-host</SharedHostDebPkgName>
-    <SharedHostDebPkgName>$(SharedHostDebPkgName.ToLower())</SharedHostDebPkgName>
-    
-    <HostFxrDebPkgName>dotnet-hostfxr-$(HostResolverVersion)</HostFxrDebPkgName>
-    <HostFxrDebPkgName>$(HostFxrDebPkgName.ToLower())</HostFxrDebPkgName>
-    
-    <SharedFxDebPkgName>dotnet-runtime-$(SharedFrameworkNugetVersion)</SharedFxDebPkgName>
-    <SharedFxDebPkgName>$(SharedFxDebPkgName.ToLower())</SharedFxDebPkgName>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/installer/publish/dir.targets b/src/installer/publish/dir.targets
index 3862365..9d0b869 100644
--- a/src/installer/publish/dir.targets
+++ b/src/installer/publish/dir.targets
@@ -71,13 +71,13 @@
            
     <ItemGroup>
       <DebInstallerFile Include="$(SharedHostInstallerFile)" >
-        <PackageName>dotnet-host</PackageName>
+        <PackageName>$(SharedHostDebPkgName)</PackageName>
       </DebInstallerFile>
       <DebInstallerFile Include="$(HostFxrInstallerFile)" >
-        <PackageName>$([System.IO.Path]::GetFileNameWithoutExtension('$(HostFxrInstallerFile)'))</PackageName>
+        <PackageName>$(HostFxrDebPkgName)</PackageName>
       </DebInstallerFile>
       <DebInstallerFile Include="$(SharedFrameworkInstallerFile)">
-        <PackageName>$([System.IO.Path]::GetFileNameWithoutExtension('$(SharedFrameworkInstallerFile)'))</PackageName>
+        <PackageName>$(SharedFxDebPkgName)</PackageName>
       </DebInstallerFile>
 
       <DebInstallerFile>
-- 
2.7.4