Fixing policy script

Author: markcowl

setup/Setup/SetExecutionPolicy.ps1

@@ -12,14 +12,13 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
-Get-ExecutionPolicy -List | Where-Object {$_.ExecutionPolicy -eq "Restricted"} | 
-% {
-  try 
-  {
-    Set-ExecutionPolicy -Scope $_.Scope -ExecutionPolicy RemoteSigned -Force -ErrorAction "SilentlyContinue"
-  }
-  catch
-  {
-    # do not fail if execution policy cannot be set for this scope
-  }
+
+try 
+{
+  Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force -ErrorAction "SilentlyContinue"
+}
+catch
+{
+  # do not fail if execution policy cannot be set for this scope
 }
+

setup/azurecmd.wxs

@@ -123,7 +123,7 @@
     <CustomAction Id="UpdatePSShortcut" BinaryKey="CustomActions" DllEntry="UpdatePSShortcut" Execute ="deferred" Impersonate="no"/>
     <CustomAction Id="SetCustomActionDataValue" Return="check" Property="UpdatePSShortcut"
                      Value="ShortcutPath=[AzureSdkMenu]Microsoft Azure PowerShell.lnk;DefaultShortcutPath=[ProgramMenuFolder]System Tools\Windows PowerShell.lnk" />
-    <CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -ExecutionPolicy Bypass -Command &quot;.\&quot;[PowerShellFolder]\SetExecutionPolicy.ps1&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
+    <CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -ExecutionPolicy Bypass -Command &quot;&quot;[PowerShellFolder]SetExecutionPolicy.ps1&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
 
     <InstallExecuteSequence>
       <Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>