From ef6e762771f25a080c331b1b2121a9d558b776dd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 20 Mar 2018 10:49:01 -0700
Subject: [PATCH] MSI: remove the version from the product name (#6415)

MSI: remove the version from the product name

During patching the original MSI information is displayed.
This makes installing a patch for an MSI with a specific version very confusing.
---
 assets/Product.wxs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index 7da11e304f..0e1d42fd28 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -21,7 +21,13 @@
   <?define ProductSemanticVersionWithName = "$(var.ProductName)-$(env.ProductSemanticVersion)"?>
   <?define ProductProgFilesDir = "$(env.ProductProgFilesDir)" ?>
   <!-- The ProductCode is Product Id and needs to be unique for every PowerShell version to allow SxS install: http://wixtoolset.org/documentation/manual/v3/xsd/wix/product.html -->
-  <Product Id="$(var.ProductCode)" Name="$(var.ProductSemanticVersionWithName)-$(sys.BUILDARCH)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)">
+  <Product 
+    Id="$(var.ProductCode)" 
+    Name="PowerShell 6-$(sys.BUILDARCH)" 
+    Language="1033" 
+    Version="$(var.ProductVersion)" 
+    Manufacturer="Microsoft Corporation" 
+    UpgradeCode="$(var.UpgradeCode)">
     <!-- Properties About The Package -->
     <Package Id="*" Keywords="Installer" Platform="$(sys.BUILDARCH)" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Description="PowerShell package" Comments="PowerShell for every system" />
     <!-- Add PowerShell icon for executable -->