switching properties and variables

Author: markcowl

setup/azurecmd.wxs

@@ -32,17 +32,17 @@
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
     <Property Id="ALLUSERS" Value="1" />
     <!-- per machine install-->
-
+    <property Id="PSGETMODULEPATH" Value="$(var.PlatformProgramFilesFolder)WindowsPowerShell\Modules\" />
     <Property Id="PSCOMPATIBLEVERSION">
       <RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
     </Property>
 
     <Property Id="POWERSHELLGETMODULESINSTALLED" >
-      <DirectorySearch Id="AZURERMPROFILEMODULE" Path="$(var.PlatformProgramFilesFolder)WindowsPowerShell\Modules\AzureRM.Profile" AssignToProperty="yes"/>
+      <DirectorySearch Id="AZURERMPROFILEMODULE" Path="[PSGETMODULEPATH]AzureRM.Profile" AssignToProperty="yes"/>
     </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 = "$(var.PlatformProgramFilesFolder)WindowsPowerShell\Modules\AzureRM.Profile")
+      Installed or NOT (POWERSHELLGETMODULESINSTALLED = "[PSGETMODULEPATH]AzureRM.Profile")
     </Condition>
 
 
@@ -83,7 +83,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="$(var.PlatformProgramFilesFolder)\WindowsPowerShell\Modules;[PowerShellFolder]ResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
+        <Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[PSGETMODULEPATH];[PowerShellFolder]ResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
       </Component>
     </DirectoryRef>