Combine packaging props and publish props for deb packages

Commit migrated from https://github.com/dotnet/core-setup/commit/25f8974b793cf75e6509083e6d3b1b67fac298a8

diff --git a/src/installer/dir.props b/src/installer/dir.props
index 783789f..39af4de 100644 (file)
--- a/src/installer/dir.props
+++ b/src/installer/dir.props
@@ -20,18 +20,6 @@
     <HostPolicyBaseName>$(LibPrefix)hostpolicy$(LibSuffix)</HostPolicyBaseName>      
   </PropertyGroup>
 
-  <!-- Use actual publishable (non-dummy) package name produced by the build system for this RID -->
-  <!-- TODO: chcosta - do we really need this? -->
-  <PropertyGroup Condition="'$(TargetRid)' != ''">
-    <PackageTargetRid>$(TargetRid)</PackageTargetRid>
-    <PackageTargetRid Condition="'$(TargetRid)' == 'osx.10.11-x64'">osx.10.10-x64</PackageTargetRid>
-    <PackageTargetRid Condition="'$(TargetRid)' == 'rhel.7.0-x64'">rhel.7-x64</PackageTargetRid>
-    <PackageTargetRid Condition="'$(TargetRid)' == 'rhel.7.1-x64'">rhel.7-x64</PackageTargetRid>
-    <PackageTargetRid Condition="'$(TargetRid)' == 'rhel.7.2-x64'">rhel.7-x64</PackageTargetRid>
-    <PackageTargetRid Condition="'$(TargetRid)' == 'rhel.7.3-x64'">rhel.7-x64</PackageTargetRid>
-    <PackageTargetRid Condition="'$(TargetRid)' == 'rhel.7.2-x64'">rhel.7-x64</PackageTargetRid>    
-  </PropertyGroup>
-
   <PropertyGroup>
     <CrossGenSymbolExtension>.map</CrossGenSymbolExtension>
     <CrossGenSymbolExtension Condition="'$(OSGroup)' == 'Windows_NT'">.ni.pdb</CrossGenSymbolExtension>

diff --git a/src/installer/pkg/packaging/dir.props b/src/installer/pkg/packaging/dir.props
index 0a4b661..708c409 100644 (file)
--- a/src/installer/pkg/packaging/dir.props
+++ b/src/installer/pkg/packaging/dir.props
@@ -16,11 +16,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProductMoniker>$(SharedFrameworkNugetVersion)-$(PackageTargetRid)</ProductMoniker>
-    <HostResolverVersionMoniker>$(HostResolverVersion)-$(PackageTargetRid)</HostResolverVersionMoniker>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <CombinedCompressedFile>dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension)</CombinedCompressedFile>
     <HostFxrCompressedFile>dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension)</HostFxrCompressedFile>
     <SharedFrameworkCompressedFile>dotnet-runtime-internal-$(ProductMoniker)$(CompressedFileExtension)</SharedFrameworkCompressedFile>
@@ -28,14 +23,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <CombinedInstallerFile>$(CombinedInstallerStart)$(ProductMoniker)$(CombinedInstallerExtension)</CombinedInstallerFile>
-    <CombinedInstallerEngine>$(CombinedInstallerStart)$(ProductMoniker)-engine.exe</CombinedInstallerEngine>
-    <SharedHostInstallerFile>$(SharedHostInstallerStart)$(ProductMoniker)$(InstallerExtension)</SharedHostInstallerFile>
-    <HostFxrInstallerFile>$(HostFxrInstallerStart)$(HostResolverVersionMoniker)$(InstallerExtension)</HostFxrInstallerFile>
-    <SharedFrameworkInstallerFile>$(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension)</SharedFrameworkInstallerFile>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <ProductBrandPrefix>Microsoft .NET Core $(ProductionVersion)</ProductBrandPrefix>
     <ProductBrandPrefix Condition="'$(ReleaseBrandSuffix)'!=''">Microsoft .NET Core $(ProductionVersion) $(ReleaseBrandSuffix)</ProductBrandPrefix>
     <SharedHostBrandName>$(ProductBrandPrefix) Host</SharedHostBrandName>

diff --git a/src/installer/publish/dir.targets b/src/installer/publish/dir.targets
index d28c172..3862365 100644 (file)
--- a/src/installer/publish/dir.targets
+++ b/src/installer/publish/dir.targets
@@ -70,14 +70,14 @@
            Text=" Missing parameters for debian publish." />
            
     <ItemGroup>
-      <DebInstallerFile Include="$(SharedHostInstallerStart)$(ProductMoniker).deb" >
+      <DebInstallerFile Include="$(SharedHostInstallerFile)" >
         <PackageName>dotnet-host</PackageName>
       </DebInstallerFile>
-      <DebInstallerFile Include="$(HostFxrInstallerStart)$(HostResolverVersionMoniker).deb" >
-        <PackageName>dotnet-hostfxr-$(HostResolverVersion.ToLower())</PackageName>
+      <DebInstallerFile Include="$(HostFxrInstallerFile)" >
+        <PackageName>$([System.IO.Path]::GetFileNameWithoutExtension('$(HostFxrInstallerFile)'))</PackageName>
       </DebInstallerFile>
-      <DebInstallerFile Include="$(SharedFrameworkInstallerStart)$(ProductMoniker).deb">
-        <PackageName>dotnet-runtime-$(SharedFrameworkNugetVersion.ToLower())</PackageName>
+      <DebInstallerFile Include="$(SharedFrameworkInstallerFile)">
+        <PackageName>$([System.IO.Path]::GetFileNameWithoutExtension('$(SharedFrameworkInstallerFile)'))</PackageName>
       </DebInstallerFile>
 
       <DebInstallerFile>