Skip to content

Vmss #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 216 commits into from
Oct 8, 2015
Merged

Vmss #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
216 commits
Select commit Hold shift + click to select a range
adf5743
showing error message
Sep 16, 2015
0eede1d
cmdlet name fix
Sep 16, 2015
d531100
adding output types to cmdlet
Sep 18, 2015
cc183cd
merge
Sep 19, 2015
d5b7740
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Sep 21, 2015
f0a258d
Update New-AzureQuickVM
hyonholee Sep 22, 2015
6e2937f
Fix Get-AzureRemoteDesktopFile cmdlet with Launch parameter
hyonholee Sep 22, 2015
534c3f6
rg name optional, adding sqoop support, misc. bug fixes
Sep 23, 2015
f917639
Fix Get-AzureRMRemoteDesktopFile
hyonholee Sep 25, 2015
5be0fc7
Adding BootDiagnostics feature:
hyonholee Sep 25, 2015
f794738
Updating storage cmdlets for Arm [#102956048]
markcowl Sep 25, 2015
752dd50
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 25, 2015
e77f993
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 25, 2015
0a39e08
Removing dependency on service management types from storage library
markcowl Sep 25, 2015
8185b5b
Fix Get-AzureRMRemoteDesktopFile cmdlet
hyonholee Sep 26, 2015
89c26d7
Add boot diagnostic feature
hyonholee Sep 26, 2015
ce5ba4b
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 26, 2015
485a4ff
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 28, 2015
c7659ca
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 28, 2015
22e8990
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 28, 2015
fd39b26
Merge branch 'dev' of https://github.com/hyonholee/azure-powershell i…
hyonholee Sep 28, 2015
d438dd9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 28, 2015
84558c9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 29, 2015
1a9e7bf
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 29, 2015
f895f08
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 29, 2015
ca5d5ab
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Sep 29, 2015
cd7d07f
Enabling storage account creation and piping in service managment mode
markcowl Sep 29, 2015
0974856
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 29, 2015
a96738e
Remove VaueFromPipeline attribute from input parameters with type str…
markcowl Sep 30, 2015
e7d911d
[#102956048] Make ARM cmdlets rely on RMProfileProvider
markcowl Sep 30, 2015
214b928
resource manager changes
markcowl Sep 30, 2015
d922821
Merging with upstream and fixing tests
markcowl Sep 30, 2015
7db5cee
fixing script action bug
Sep 30, 2015
726e197
merge from latest
Sep 30, 2015
a915cb7
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 30, 2015
7606edf
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 30, 2015
ebacc4f
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar Sep 30, 2015
b1b6309
Adding wmfversion param to the set cmdlet for ASM
eshaparmar Sep 30, 2015
0657745
Added WMF version param to ARM
eshaparmar Sep 30, 2015
9e9422b
Fixing piping issues with Get-AzureRmSubscription, Improving object …
markcowl Oct 1, 2015
7c403c7
Add Save-AzureRMVhd Test
hyonholee Oct 1, 2015
2173bc4
Update New-AzureVM and Add tests for BootDiagnostics
hyonholee Oct 1, 2015
eebf8ed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Oct 1, 2015
e0ab966
Merge branch 'dev' of https://github.com/hyonholee/azure-powershell i…
hyonholee Oct 1, 2015
85d304e
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Oct 1, 2015
eb25091
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
eshaparmar Oct 1, 2015
9fe922f
Adding unit tests, scenario tests, and fixing test infrastructure
markcowl Oct 2, 2015
951c275
Merging with upstream and fixing context piping issues
markcowl Oct 2, 2015
cab4d2d
Removing app.config files and faulty namespace
markcowl Oct 2, 2015
68888c9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Oct 2, 2015
a8a4581
Revert skipMD5 hash parameter in Add-AzureVhd
hyonholee Oct 2, 2015
f69b0e6
Add StatusCode to PSComputeLongRunningOperation
hyonholee Oct 2, 2015
656aa0d
Re-record Compute tests
hyonholee Oct 2, 2015
326a632
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Oct 2, 2015
2948d32
Fixing wix file for build
markcowl Oct 2, 2015
636ae15
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
eshaparmar Oct 2, 2015
c08da62
adding warning message, adding sqoop cmdlet
Oct 2, 2015
ccbb5f5
renaming ClusterCredential to HttpCredential
Oct 2, 2015
ddd00c4
[fixes #103630362] Add version check scripts to Profile module
jianghaolu Sep 29, 2015
59172d7
Add tests on Profile module version check
jianghaolu Sep 29, 2015
1cc2b3b
Bump up ADF nuget to 4.0.0
Oct 2, 2015
1d9bf62
Re-run ADF mock tests and attached new session records.
Oct 2, 2015
87c9bc7
updating help files
Oct 2, 2015
34e3c3e
Isolating tests from environment changes; fixing issue with setting s…
markcowl Oct 2, 2015
c3c3274
display script action bug fix
Oct 2, 2015
3f07f40
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Oct 2, 2015
3abfda8
Add Find-Resource cmdlet and test/help file
vivsriaus Oct 2, 2015
5d352cc
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
eshaparmar Oct 2, 2015
05c6a21
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Oct 2, 2015
afc63c1
Adding automatic RP registration handler.
Oct 2, 2015
8bc078f
Merge branch 'dev' of github.com:Azure/azure-powershell into rp
Oct 2, 2015
6992987
Capture new test record
vivsriaus Oct 2, 2015
23f693d
Edit help for extension resource type
vivsriaus Oct 2, 2015
d760e8a
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
stankovski Oct 2, 2015
dd4eb8b
disable auditing tests
markcowl Oct 2, 2015
463f127
Merging with upstream
markcowl Oct 2, 2015
fd3793d
Fixed test broken by removal of TemplateFile parameter from New-Azure…
stankovski Oct 2, 2015
2b73653
Delete ResourceManager.sln
ravbhatnagar Oct 2, 2015
83d33b1
Fix test on checking profile versions
jianghaolu Oct 2, 2015
5476ccf
Merge pull request #1047 from vivsriaus/FindResource
amarzavery Oct 2, 2015
bc1b9ba
Merge pull request #1021 from shefaliv/dev
stankovski Oct 2, 2015
4f5f9a5
Merge pull request #1035 from dscsolutions/wmfparam
stankovski Oct 2, 2015
33ac507
Add FindResourceGroupCmdlet
Oct 2, 2015
740f2a1
add Get ERserviceProvider cmdlet
deepakswifty Oct 3, 2015
9f124a3
Merge pull request #1050 from stankovski/dev
stankovski Oct 3, 2015
b6dbc51
Merge pull request #1046 from yitao-zhang/adf4.0
stankovski Oct 3, 2015
11ea787
Merge pull request #1051 from ravbhatnagar/dev
stankovski Oct 3, 2015
e33f84d
Add parameter set AzureRmResourceGroup
Oct 3, 2015
bf14f68
Fix test category for live only tests
markcowl Oct 3, 2015
d772790
Fix environment cmdlets to not require a context
markcowl Oct 3, 2015
3034441
updating hdi refs
Oct 3, 2015
7ee8f0c
Fix data collection cmdlets to not require login
markcowl Oct 3, 2015
0525010
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Oct 3, 2015
f12920e
Fix test issues
Oct 3, 2015
f4c9564
Update according to PR comments
hyonholee Oct 3, 2015
244c6f8
Automatic RP registration
Oct 3, 2015
e00709f
Change the method name.
hyonholee Oct 3, 2015
2b8b055
Add Id to deployment cmdlets, add a test and update help file. Also r…
vivsriaus Oct 3, 2015
c42176f
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Oct 3, 2015
437141f
Remove app.config
vivsriaus Oct 3, 2015
8b11ce9
Revert set azure lock file in csproj
vivsriaus Oct 3, 2015
46711cd
building
Oct 3, 2015
aef0e20
Delete Get-AzureRmLocation
Oct 3, 2015
11ad873
update compute lib
deepakswifty Oct 3, 2015
36a1a5a
Add cmdlet info headers (CommandName and ParameterSetName)
vivsriaus Oct 3, 2015
6c1c812
Fix storage tests to handle exceptions rather than error stream writes
markcowl Oct 3, 2015
ac99f7e
[#104343046] add a keyword help decorator script
devigned Oct 3, 2015
985bd73
[#104343046] add copyright header to doc commands
devigned Oct 3, 2015
899292a
[#104343046] remove the debug output and fix Node creation
devigned Oct 3, 2015
ba64190
[#104343046] add progress notifications
devigned Oct 3, 2015
de75d6e
[Fixes #104343046] update the keyworks for each command
devigned Oct 3, 2015
eb49df1
Fix subscription issues with sql tests
markcowl Oct 3, 2015
485b9fd
Fix UT
ogail Oct 3, 2015
8d5cedc
Merge pull request #1059 from devigned/feature/keywords
ogail Oct 3, 2015
4b8dd40
Merge pull request #1058 from vivsriaus/Headers
ogail Oct 3, 2015
f91e06c
Merge pull request #1053 from DeepakRajendranMsft/ExpressRouteService…
ogail Oct 3, 2015
a5ce138
Merge pull request #1054 from chidmdxx/AddParameterSetGetResourceGroup
ogail Oct 3, 2015
56d97ab
Merge pull request #1052 from chidmdxx/FindResourceGroupCmdlet
ogail Oct 3, 2015
f2674a6
Merge pull request #1055 from shefaliv/dev
ogail Oct 3, 2015
b13ef44
Cleaning up unused properties and fixing tests
markcowl Oct 3, 2015
6eb81ec
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Oct 3, 2015
4372922
Updates to sql test infrastructure
markcowl Oct 3, 2015
1fbfe45
additional sql test fixes
markcowl Oct 3, 2015
94641e1
Merge pull request #138 from Azure/dev
huangpf Oct 3, 2015
29dab36
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Oct 4, 2015
e2efa78
fixing setup
markcowl Oct 4, 2015
cc209e2
Merge upstream dev
Oct 4, 2015
0507b60
Add Remove Command
huangpf Oct 4, 2015
320939f
Fix client factory for sql tests
markcowl Oct 4, 2015
621d66f
Amending http client handling and adding error details to trace
markcowl Oct 5, 2015
9396469
Merge branch 'dev' of github.com:Azure/azure-powershell into storagec…
markcowl Oct 5, 2015
fb993b0
Removing product info header handlers
markcowl Oct 5, 2015
edfd4f2
Disabling test for disabled functionality
markcowl Oct 5, 2015
a368dce
Removing additional logging and try/catch for default headers
markcowl Oct 5, 2015
fed6d76
Responding to review feedback
markcowl Oct 5, 2015
8d4d9a3
Merge pull request #1041 from markcowl/storagecontext
markcowl Oct 5, 2015
a649695
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Oct 5, 2015
81dbb31
Add dummy session record
jianghaolu Oct 5, 2015
1446ace
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Oct 5, 2015
bfb5796
Merge pull request #139 from Azure/dev
huangpf Oct 5, 2015
8831bdc
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Oct 5, 2015
8fb9a31
Update WXI
huangpf Oct 5, 2015
543395b
Merge branch 'dev' of github.com:Azure/azure-powershell into rp
Oct 5, 2015
578b16b
Merge branch 'rp' of github.com:ogail/azure-powershell into rp
Oct 5, 2015
7f07d06
[#104553236] Add back CmdletInfoHandler to AzurePSCmdlet
jianghaolu Oct 5, 2015
49d4bf8
[#104647710] Add link to getting started
jianghaolu Oct 5, 2015
4bc6bc9
Update WXI
huangpf Oct 5, 2015
61ea799
Merge pull request #1063 from jianghaolu/shortcut
jianghaolu Oct 5, 2015
21e8851
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
Oct 5, 2015
fb40ff4
Fix build for ARM
jianghaolu Oct 5, 2015
c200843
Merge pull request #1056 from vivsriaus/DeploymentId
ogail Oct 5, 2015
5d59732
Save all
jianghaolu Oct 5, 2015
0570089
Merge pull request #1044 from hyonholee/dev
ogail Oct 5, 2015
b166af3
Add Command
huangpf Oct 5, 2015
0e1387b
Merge pull request #1057 from chidmdxx/DeleteAzureRmLocaion
ogail Oct 5, 2015
56edc0c
Merge branch 'dev' of github.com:Azure/azure-powershell into rp
Oct 5, 2015
c7e818a
handle value parse
huangpf Oct 5, 2015
02ab411
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Oct 5, 2015
88f386c
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Oct 5, 2015
6393fe4
Add help info for policy assignment and policy definition cmdlets
vivsriaus Oct 5, 2015
6397bb3
Address CR comments
Oct 5, 2015
cb0fd30
Update help file for AzureRmResourceGroup operations
Oct 6, 2015
108b449
Merge pull request #1062 from jianghaolu/iclone
markcowl Oct 6, 2015
701607f
Merge pull request #1065 from vivsriaus/PolicyHelp
markcowl Oct 6, 2015
fab05c1
Updated logic for Install/Uninstall AzureRM and added Import-AzureRM
stankovski Oct 5, 2015
f9a2886
Merge pull request #1066 from stankovski/dev
stankovski Oct 6, 2015
ad1aa1c
Merge pull request #140 from Azure/dev
huangpf Oct 6, 2015
a50858c
Remove dep. on ARM client package and add extra test
Oct 6, 2015
7c3fed3
[#105020746] Added uninstall to MSI
stankovski Oct 6, 2015
62647dc
Merge pull request #1069 from stankovski/dev
stankovski Oct 6, 2015
1980710
Regenerate MSI
Oct 6, 2015
392af20
Print inner exceptions for profile module test
jianghaolu Oct 6, 2015
6412020
Fix for file locking with Install-AzureRM
stankovski Oct 6, 2015
4e22d6e
Merge pull request #1070 from stankovski/dev
stankovski Oct 6, 2015
a6ca3e7
Merge pull request #141 from Azure/dev
huangpf Oct 6, 2015
5c9d426
Merge pull request #1060 from ogail/rp
ogail Oct 6, 2015
409e636
Merge branch 'dev' of github.com:Azure/azure-powershell into script
jianghaolu Oct 6, 2015
034579d
Added uninstall for Azure.Storage module
stankovski Oct 6, 2015
1e67494
Merge pull request #1071 from stankovski/dev
stankovski Oct 6, 2015
62dd429
Update
huangpf Oct 6, 2015
710ff46
Add nuget bootstrap to profile module test
jianghaolu Oct 6, 2015
eaa365a
Misc. fixes for install and uninstall
stankovski Oct 7, 2015
a7cb5b5
Fix
huangpf Oct 7, 2015
ce83a6d
Fix
huangpf Oct 7, 2015
f0d05ba
Remove legacy object format from resource cmdlets
vivsriaus Oct 7, 2015
9ecd0db
Merge pull request #142 from Azure/dev
huangpf Oct 7, 2015
6b5c1db
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Oct 7, 2015
19bcef2
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
Oct 7, 2015
5af67d2
Update WXI
huangpf Oct 7, 2015
1b63ae3
update wxi
huangpf Oct 7, 2015
bc90ea7
Update WXI
huangpf Oct 7, 2015
ffaf229
Changed install to be single-threaded
stankovski Oct 7, 2015
4909ad0
Merge pull request #1074 from stankovski/dev
Oct 7, 2015
f2f9f61
Merge pull request #143 from Azure/dev
huangpf Oct 7, 2015
1926b62
Fix login issues, serialization issues with profile, and issues with …
markcowl Oct 7, 2015
7e23309
removing unintended change to azure account
markcowl Oct 7, 2015
aa01623
remove SkuName parameter from the ExpressRouteCmdlet, fix test
deepakswifty Oct 7, 2015
2321bdb
Comments and class resources cleanup
markcowl Oct 7, 2015
cef5395
Merge pull request #1002 from jianghaolu/script
Oct 7, 2015
1c7b941
Merge pull request #1067 from chidmdxx/AddParametersToHelp
Oct 7, 2015
80e9e91
Merge pull request #1075 from vivsriaus/RemoveLegacyObject
Oct 7, 2015
4e7a1f8
Responding to review feedback
markcowl Oct 7, 2015
5ce4649
Merge pull request #1077 from DeepakRajendranMsft/SkUBugER
ogail Oct 7, 2015
1f870bf
Merge pull request #1078 from markcowl/loginfix
markcowl Oct 7, 2015
bfc1a5e
Added uninstall for AzureRM from MSI
stankovski Oct 7, 2015
5c624bc
Merge pull request #1080 from stankovski/dev
markcowl Oct 7, 2015
3b08900
Merge pull request #144 from Azure/dev
huangpf Oct 7, 2015
7839c83
Merge pull request #145 from huangpf/dev
huangpf Oct 7, 2015
158dfdb
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
hyonholee Oct 8, 2015
9ca18cd
Merge pull request #147 from AzureRT/dev
huangpf Oct 8, 2015
73d4f71
Update
huangpf Oct 8, 2015
541cc20
Update Scripts
huangpf Oct 8, 2015
faec4cd
Add Check for CLI
huangpf Oct 8, 2015
ff367f4
Update Verbose Output
huangpf Oct 8, 2015
45f0ea5
Update Verbose Output
huangpf Oct 8, 2015
df92ee8
Update RDFE Generated Commands
huangpf Oct 8, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
51 changes: 42 additions & 9 deletions setup-powershellget/Setup/ShortcutStartup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ----------------------------------------------------------------------------------
[CmdletBinding()]
[CmdletBinding(DefaultParametersetName="none")]
Param(
[Parameter(Mandatory=$False, HelpMessage="Use Install parameter to install Azure modules from PowerShell Gallery.")]
[switch]$Install
[Parameter(Mandatory=$True, HelpMessage="Use Install parameter to install Azure modules from PowerShell Gallery.", ParameterSetName="install")]
[switch]$Install,
[Parameter(Mandatory=$True, HelpMessage="Use Uninstall parameter to uninstall Azure modules from PowerShell Gallery.", ParameterSetName="uninstall")]
[switch]$Uninstall
)

function EnsureRegistryPath
Expand All @@ -38,7 +40,7 @@ try {
Write-Output @"

Finalizing installation of Azure PowerShell.
Installing Azure Modules from PowerShell Gallery.
Installing AzureRM Modules from PowerShell Gallery.
This may take some time...
"@
$env:PSModulePath = "$env:USERPROFILE\Documents\WindowsPowerShell\Modules;$env:ProgramFiles\WindowsPowerShell\Modules;$env:SystemRoot\system32\WindowsPowerShell\v1.0\Modules\"
Expand All @@ -49,16 +51,47 @@ This may take some time...

Import-Module PowerShellGet

Install-Module AzureRM
Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."
Update-AzureRM
} else {
$DefaultPSRepository = $env:DefaultPSRepository
if ([string]::IsNullOrWhiteSpace($DefaultPSRepository))
{
$DefaultPSRepository = "PSGallery"
}

$_InstallationPolicy = (Get-PSRepository -Name $DefaultPSRepository).InstallationPolicy
try
{
Set-PSRepository -Name $DefaultPSRepository -InstallationPolicy Trusted

Install-Module AzureRM -Repository $DefaultPSRepository
Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."

Update-AzureRM -Repository $DefaultPSRepository
} finally {
# Clean up
Set-PSRepository -Name $DefaultPSRepository -InstallationPolicy $_InstallationPolicy
}
}
elseif ($Uninstall.IsPresent)
{
Write-Output @"

Finalizing uninstallation of Azure PowerShell.
This may take some time...
"@
$env:PSModulePath = "$env:USERPROFILE\Documents\WindowsPowerShell\Modules;$env:ProgramFiles\WindowsPowerShell\Modules;$env:SystemRoot\system32\WindowsPowerShell\v1.0\Modules\"

Uninstall-AzureRM
Uninstall-Module -Name AzureRM -Confirm:$false -Force
}
else
{
cd c:\
$welcomeMessage = @"
For a list of all Azure RM cmdlets type 'help azurerm'.

To start using Azure RM login via Login-AzureRmAccount cmdlet.
To switch between subscriptions use Set-AzureRmContext.
For more details, see http://aka.ms/azps-getting-started.

To use Azure Service Management cmdlets please execute the following cmdlet:
Install-Module Azure
Expand All @@ -73,6 +106,6 @@ catch
Write-Output "An error occured during installation."
Write-Output $error
Write-Output "Press any key..."
$host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
$key = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
}

2 changes: 2 additions & 0 deletions setup-powershellget/azurecmd.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,14 @@
<CustomAction Id="UpdatePSShortcut" BinaryKey="CustomActions" DllEntry="UpdatePSShortcut" Execute ="deferred" Impersonate="no"/>
<CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;Set-ExecutionPolicy RemoteSigned -Force&quot;" Execute="deferred" Impersonate="no" Return="check"/>
<CustomAction Id="RunModuleInstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;. \&quot;[PowerShellFolder]\ShortcutStartup.ps1\&quot; -Install&quot;" Execute="deferred" Impersonate="no" Return="check"/>
<CustomAction Id="RunModuleUninstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;. \&quot;[PowerShellFolder]\ShortcutStartup.ps1\&quot; -Uninstall&quot;" Execute="deferred" Impersonate="no" Return="check"/>

<InstallExecuteSequence>
<Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
<Custom Action="UpdatePSShortcut" After="SetCustomActionDataValue">NOT Installed</Custom>
<Custom Action="SetExecutionPolicy" After="UpdatePSShortcut">NOT Installed</Custom>
<Custom Action="RunModuleInstallScript" After="SetExecutionPolicy">NOT Installed</Custom>
<Custom Action="RunModuleUninstallScript" After="InstallInitialize">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
</InstallExecuteSequence>

<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\media\License.rtf" />
Expand Down
Loading