From cb4c3d402e05dccfc3f29e5bfd75c6c645fa5825 Mon Sep 17 00:00:00 2001
From: "Steve Lee (POWERSHELL)" <slee@microsoft.com>
Date: Mon, 23 Sep 2019 17:11:38 -0700
Subject: [PATCH 1/2] [package] add env var to differentiate client/server in
 telemetry when installed via MSI

---
 assets/Product.wxs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index f0fc38f0f51..f3f0d416913 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -126,10 +126,15 @@
       <ComponentRef Id="ApplicationProgramsMenuShortcut"/>
       <ComponentRef Id="RegistryEntries"/>
       <ComponentRef Id="SetPath"/>
+      <ComponentRef Id="Telemetry"/>
       <ComponentRef Id="ExplorerContextMenu"/>
     </Feature>
     <!-- We need to show EULA, and provide option to customize download location -->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+    <!-- Need to get the Windows product name from the registry -->
+    <Property Id="WINDOWS_PRODUCT_NAME">
+      <RegistrySearch Id="ProductName" Root="HKLM" Type="raw" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="ProductName" />
+    </Property>
     <!-- Prerequisite check for Windows Universal C runtime -->
     <Property Id="UNIVERSAL_C_RUNTIME_INSTALLED" Secure="yes">
       <DirectorySearch Id="WindowsDirectory" Path="[WindowsFolder]">
@@ -157,16 +162,19 @@
             <Component Id="ProductVersionFolder" Guid="{e1a7f05e-0cd6-4227-80a8-e4fb311f045c}">
               <CreateFolder/>
             </Component>
+            <Component Id="Telemetry" Guid="{80520f20-471d-4d08-adc8-bab637627b39}" KeyPath="yes">
+              <Environment Id="POWERSHELL_DISTRIBUTION_CHANNEL" Action="create" Name="POWERSHELL_DISTRIBUTION_CHANNEL" Permanent="no" System="yes" Value="MSI:[WINDOWS_PRODUCT_NAME]"/>
+            </Component>
             <Component Id="RegistryEntries" Guid="{402e52f7-baf8-489d-af21-f756a6ca3530}">
-                <!-- create key for easy detection of a particular version of a powershell core package
-                     The upgrade code is used in the key because it will change when we allow SxS       -->
-                <RegistryKey Root="HKLM" Key="Software\Microsoft\PowerShellCore\InstalledVersions\$(var.UpgradeCode)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-                    <RegistryValue Type="string" Value="$(var.ProductSemanticVersion)" Name="SemanticVersion"/>
-                </RegistryKey>
-                <!-- register ourselves in application registry so can be started using just Win+R `pwsh.exe` -->
-                <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\pwsh.exe" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-                    <RegistryValue Type="string" Value="[$(var.ProductDirectoryName)]pwsh.exe"/>
-                </RegistryKey>
+              <!-- create key for easy detection of a particular version of a powershell core package
+                    The upgrade code is used in the key because it will change when we allow SxS       -->
+              <RegistryKey Root="HKLM" Key="Software\Microsoft\PowerShellCore\InstalledVersions\$(var.UpgradeCode)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+                  <RegistryValue Type="string" Value="$(var.ProductSemanticVersion)" Name="SemanticVersion"/>
+              </RegistryKey>
+              <!-- register ourselves in application registry so can be started using just Win+R `pwsh.exe` -->
+              <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\pwsh.exe" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+                  <RegistryValue Type="string" Value="[$(var.ProductDirectoryName)]pwsh.exe"/>
+              </RegistryKey>
             </Component>
             <!-- add ourselves to %PATH% so pwsh.exe can be started from Windows PowerShell or cmd.exe -->
             <Component Id="SetPath" Guid="{9dbb7763-7baf-48e7-b025-3bdedcb0632f}" KeyPath="yes">

From 8358ea86e306263387deefcbb8f0ce687ede2c1c Mon Sep 17 00:00:00 2001
From: "Steve Lee (POWERSHELL)" <slee@microsoft.com>
Date: Mon, 23 Sep 2019 17:32:57 -0700
Subject: [PATCH 2/2] [package] Change id to use PascalCasing to be consistent

---
 assets/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index f3f0d416913..82ee672072b 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -163,7 +163,7 @@
               <CreateFolder/>
             </Component>
             <Component Id="Telemetry" Guid="{80520f20-471d-4d08-adc8-bab637627b39}" KeyPath="yes">
-              <Environment Id="POWERSHELL_DISTRIBUTION_CHANNEL" Action="create" Name="POWERSHELL_DISTRIBUTION_CHANNEL" Permanent="no" System="yes" Value="MSI:[WINDOWS_PRODUCT_NAME]"/>
+              <Environment Id="PowerShellDistributionChannel" Action="create" Name="POWERSHELL_DISTRIBUTION_CHANNEL" Permanent="no" System="yes" Value="MSI:[WINDOWS_PRODUCT_NAME]"/>
             </Component>
             <Component Id="RegistryEntries" Guid="{402e52f7-baf8-489d-af21-f756a6ca3530}">
               <!-- create key for easy detection of a particular version of a powershell core package