Don't rename it

Author: wtgodbe

src/Installers/Windows/HostOptions/HostOptions.wixproj

@@ -2,11 +2,9 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
   <PropertyGroup>
-    <Name>$(HostOptionsName)</Name>
-    <OutputName>$(HostOptionsName)</OutputName>
     <OutputType>Package</OutputType>
     <ProductNameFolder>Microsoft ASP.NET Core Hosting Bundle Options</ProductNameFolder>
-    <ProductNameShort>AspNetCore.HostOptions</ProductNameShort>
+    <ProductNameShort>$(HostOptionsNameProductNameShort)</ProductNameShort>
     <Platform>x86</Platform>
     <ProjectGuid>20248cd1-c5aa-4f42-ad88-bc260d64deea</ProjectGuid>
     <IsShipping>true</IsShipping>
@@ -23,6 +21,8 @@
 
   <PropertyGroup>
     <PackageFileName>dotnet-hosting-options-$(PackageVersion)-win$(TargetExt)</PackageFileName>
+    <Name>$(PackageFileName)</Name>
+    <OutputName>$(PackageFileName)</OutputName>
     <ProductName>Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options</ProductName>
     <DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
   </PropertyGroup>

src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj

@@ -2,8 +2,6 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
   <PropertyGroup>
-    <Name>WindowsServerHostingBundle</Name>
-    <OutputName>WindowsServerHostingBundle</OutputName>
     <IsShipping>true</IsShipping>
     <ProjectGuid>6F1B115C-1903-40CB-837D-7961AB610F4E</ProjectGuid>
     <OutputType>Bundle</OutputType>
@@ -93,6 +91,8 @@
 
   <PropertyGroup>
     <PackageFileName>dotnet-hosting-$(PackageVersion)-win$(TargetExt)</PackageFileName>
+    <Name>$(PackageFileName)</Name>
+    <OutputName>$(PackageFileName)</OutputName>
 
     <BundleNameShort>Microsoft .NET $(PackageBrandingVersion)</BundleNameShort>
     <SharedFxPackageVersion>$(PackageVersion)</SharedFxPackageVersion>

src/Installers/Windows/Wix.props

@@ -17,7 +17,7 @@
 
   <PropertyGroup>
     <DefineSolutionProperties>false</DefineSolutionProperties>
-    <HostOptionsName>WindowsServerHostingBundleOptions</HostOptionsName>
+    <HostOptionsNameProductNameShort>AspNetCore.HostOptions</HostOptionsNameProductNameShort>
 
     <!-- Namespace used to generate stable UUID3 GUIDs for MSI ProductCode, etc. DO NOT CHANGE THESE. -->
     <HostingBundleNamespaceGuid>E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E</HostingBundleNamespaceGuid>

src/Installers/Windows/Wix.targets

@@ -48,17 +48,17 @@
   <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />
 
   <Target Name="_GeneratePackageGuids" Condition="'$(OutputType)' == 'package'">
-    <GenerateGuid Condition="'$(OutputName)' != '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs)">
+    <GenerateGuid Condition="'$(ProductNameShort)' != '$(HostOptionsNameProductNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs)">
       <Output TaskParameter="Guid" PropertyName="ProductCode" />
     </GenerateGuid>
-    <GenerateGuid Condition="'$(OutputName)' != '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs);$(OutputType)">
+    <GenerateGuid Condition="'$(ProductNameShort)' != '$(HostOptionsNameProductNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs);$(OutputType)">
       <Output TaskParameter="Guid" PropertyName="UpgradeCode" />
     </GenerateGuid>
 
-    <GenerateGuid Condition="'$(OutputName)' == '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(Version)">
+    <GenerateGuid Condition="'$(ProductNameShort)' == '$(HostOptionsNameProductNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(Version)">
       <Output TaskParameter="Guid" PropertyName="ProductCode" />
     </GenerateGuid>
-    <GenerateGuid Condition="'$(OutputName)' == '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(AspNetCoreMajorMinorVersion);$(OutputType)">
+    <GenerateGuid Condition="'$(ProductNameShort)' == '$(HostOptionsNameProductNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(AspNetCoreMajorMinorVersion);$(OutputType)">
       <Output TaskParameter="Guid" PropertyName="UpgradeCode" />
     </GenerateGuid>