From e65734d22514d619dc96e6c1ac984020813226e7 Mon Sep 17 00:00:00 2001
From: Tom Beech <beech.tom@gmail.com>
Date: Thu, 13 May 2021 13:27:16 -0700
Subject: [PATCH] (GH-2550) Do not ship with PuppetBolt PowerShell module

This updates the Windows MSI build to not install the PuppetBolt
PowerShell module. Users should now install the PuppetBolt PowerShell
module through the PowerShell Gallery.
---
 resources/windows/wix/componentgroup.wxs.erb |  1 -
 resources/windows/wix/directorylist.wxs.erb  |  8 --
 resources/windows/wix/powershell.wxs.erb     | 77 --------------------
 3 files changed, 86 deletions(-)
 delete mode 100644 resources/windows/wix/powershell.wxs.erb

diff --git a/resources/windows/wix/componentgroup.wxs.erb b/resources/windows/wix/componentgroup.wxs.erb
index a8ee4af9..7966bc6f 100644
--- a/resources/windows/wix/componentgroup.wxs.erb
+++ b/resources/windows/wix/componentgroup.wxs.erb
@@ -9,7 +9,6 @@
 
       <!-- We can add all components by referencing this one thing -->
       <ComponentGroupRef Id="AppComponentGroup" />
-      <ComponentGroupRef Id="PowerShellModuleComponentGroup" />
 
       <!-- All of these Include refs are expected to be present -->
       <ComponentGroupRef Id="FragmentProperties" />
diff --git a/resources/windows/wix/directorylist.wxs.erb b/resources/windows/wix/directorylist.wxs.erb
index 126daa61..65a66847 100644
--- a/resources/windows/wix/directorylist.wxs.erb
+++ b/resources/windows/wix/directorylist.wxs.erb
@@ -17,14 +17,6 @@
           <%= @platform.generate_service_bin_dirs(self.get_services, self) %>
           </Directory>
         </Directory>
-
-        <Directory Id="PowerShellDir" Name="WindowsPowerShell">
-          <Directory Id="PowerShellModuleDir" Name="Modules">
-            <Directory Id="PowerShellBoltModuleDir" Name="PuppetBolt">
-              <Directory Id="PowerShellBoltModuleHelpDir" Name="en-US" />
-            </Directory>
-          </Directory>
-        </Directory>
       </Directory>
     </DirectoryRef>
   </Fragment>
diff --git a/resources/windows/wix/powershell.wxs.erb b/resources/windows/wix/powershell.wxs.erb
deleted file mode 100644
index a8962438..00000000
--- a/resources/windows/wix/powershell.wxs.erb
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version='1.0' encoding='windows-1252'?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <!-- Puppet Bolt Powershell Module -->
-  <Fragment>
-    <ComponentGroup Id="PowerShellModuleComponentGroup">
-      <Component
-        Id="PuppetBolt.psd1"
-        Directory="PowerShellBoltModuleDir"
-        Guid="AB7C3449-AFE5-4786-B4EC-C4A6C501BE11">
-        <File
-          Id="PuppetBolt.psd1"
-          Source="$(var.AppSourcePath)\share\PowerShell\Modules\PuppetBolt\PuppetBolt.psd1"
-          KeyPath="yes" />
-      </Component>
-
-      <Component
-        Id="PuppetBolt.psm1"
-        Directory="PowerShellBoltModuleDir"
-        Guid="FEEF56D9-A6DD-42F2-B7E7-A6E3A176A37C">
-        <File
-          Id="PuppetBolt.psm1"
-          Source="$(var.AppSourcePath)\share\PowerShell\Modules\PuppetBolt\PuppetBolt.psm1"
-          KeyPath="yes" />
-      </Component>
-
-      <Component
-        Id="about_bolt_inventory.help.txt"
-        Directory="PowerShellBoltModuleHelpDir"
-        Guid="90b31dd1-28ef-4276-b672-8e87d432f70f">
-        <File
-          Id="about_bolt_inventory.help.txt"
-          Source="$(var.AppSourcePath)\share\PowerShell\Modules\PuppetBolt\en-US\about_bolt_inventory.help.txt"
-          KeyPath="yes" />
-      </Component>
-
-      <Component
-        Id="about_bolt_logging.help.txt"
-        Directory="PowerShellBoltModuleHelpDir"
-        Guid="82bafeda-d6f2-46c9-be76-274f6c31e395">
-        <File
-          Id="about_bolt_logging.help.txt"
-          Source="$(var.AppSourcePath)\share\PowerShell\Modules\PuppetBolt\en-US\about_bolt_logging.help.txt"
-          KeyPath="yes" />
-      </Component>
-
-      <Component
-        Id="about_bolt_module.help.txt"
-        Directory="PowerShellBoltModuleHelpDir"
-        Guid="990971d5-bcc6-4764-93be-e77dadc92153">
-        <File
-          Id="about_bolt_module.help.txt"
-          Source="$(var.AppSourcePath)\share\PowerShell\Modules\PuppetBolt\en-US\about_bolt_module.help.txt"
-          KeyPath="yes" />
-      </Component>
-
-      <Component
-        Id="about_bolt_modulepath.help.txt"
-        Directory="PowerShellBoltModuleHelpDir"
-        Guid="8ca73494-6aee-4437-ba45-c63cef8bad1f">
-        <File
-          Id="about_bolt_modulepath.help.txt"
-          Source="$(var.AppSourcePath)\share\PowerShell\Modules\PuppetBolt\en-US\about_bolt_modulepath.help.txt"
-          KeyPath="yes" />
-      </Component>
-
-      <Component
-        Id="about_bolt_project.help.txt"
-        Directory="PowerShellBoltModuleHelpDir"
-        Guid="11b6aacc-a4de-4cc6-90e1-cc61ebb4696c">
-        <File
-          Id="about_bolt_project.help.txt"
-          Source="$(var.AppSourcePath)\share\PowerShell\Modules\PuppetBolt\en-US\about_bolt_project.help.txt"
-          KeyPath="yes" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>