Correcting installer to handle cross-architecture module installations

Author: markcowl

setup/azurecmd.wxs

@@ -27,17 +27,26 @@
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
     <Property Id="ALLUSERS" Value="1" />
     <!-- per machine install-->
-    <CustomAction Id="PropertyAssign" Property="PSGETMODULEPATH" Value="[ProgramFiles6432Folder]WindowsPowerShell\Modules" />
     <Property Id="PSCOMPATIBLEVERSION">
       <RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
     </Property>
 
+    <SetProperty Action="SetBase64" Id="BaseModulesFolder" Value="[ProgramFiles64Folder]WindowsPowerShell\Modules" Before="AppSearch">
+      VersionNT64
+    </SetProperty>
+
+    <SetProperty Action="SetBase32" Id="BaseModulesFolder" Value="[ProgramFilesFolder]WindowsPowerShell\Modules" Before="AppSearch">
+      NOT VersionNT64
+    </SetProperty>
+
     <Property Id="POWERSHELLGETMODULESINSTALLED" >
-      <DirectorySearch Id="AZURERMPROFILEMODULE" Path="[PSGETMODULEPATH]AzureRM.Profile" AssignToProperty="yes"/>
+      <DirectorySearch Id="PROGRAMFILESCONTAINER" Path="[BaseModulesFolder]">
+        <DirectorySearch Id= "PROFILEMODULE" Path="AzureRM.Profile"/>
+      </DirectorySearch>
     </Property>
 
-    <Condition Message="Azure Resource Manager Modules from the PowerShell Gallery are installed on this machine.  Please remove these modules before installing.">
-      Installed or NOT (POWERSHELLGETMODULESINSTALLED = "[PSGETMODULEPATH]AzureRM.Profile")
+    <Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine.  Please remove these modules before installing this MSI.">
+      <![CDATA[Installed or NOT(POWERSHELLGETMODULESINSTALLED >< "AzureRM.Profile")]]>
     </Condition>
 
 
@@ -78,7 +87,7 @@
       <Component Id="PSModulePath.System" Guid="273525B9-7AAB-421A-90C8-8E50A1840B8D">
         <CreateFolder />
         <!-- Work around bug that PowerShell does not always consider default module paths. -->
-        <Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[PSGETMODULEPATH];[PowerShellFolder]ResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
+        <Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
       </Component>
     </DirectoryRef>