Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions setup-powershellget/Setup/ShortcutStartup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,30 @@ Param(
[switch]$Install
)

cd c:\
$welcomeMessage = @"
$error.clear()
try {
if ($Install.IsPresent) {
Write-Output @"

Finalizing installation of Azure PowerShell.
Installing Azure Modules from PowerShell Gallery.
This may take some time...
"@
Get-PackageProvider -Name NuGet -ForceBootstrap
Install-Module AzureRM.Installer
Install-AzureRM
} else {
cd c:\
$welcomeMessage = @"
For a list of all Azure cmdlets type 'help azure'.
For a list of Azure Pack cmdlets type 'Get-Command *wapack*'.
"@
Write-Output $welcomeMessage
Write-Output $welcomeMessage

$VerbosePreference = "Continue"
$VerbosePreference = "Continue"
}
}
catch { Write-Output $error }
if ($error) {
Read-Host -Prompt "An error occured during installation. Press any key..."
}
2 changes: 1 addition & 1 deletion setup-powershellget/azurecmd.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<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 -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 -Install\&quot;&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"/>

<InstallExecuteSequence>
<Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
Expand Down
2 changes: 1 addition & 1 deletion tools/Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
$scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
. ($scriptFolder + '.\SetupEnv.ps1')

msbuild "$env:AzurePSRoot\build.proj" /t:BuildDebug
msbuild "$env:AzurePSRoot\build.proj" /t:Build
13 changes: 4 additions & 9 deletions tools/BuildInstaller.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,8 @@ if ($wixInstallRoot -eq $null){
#and we just register both 3.8 & 3.5 to simplify the script
$env:path = $env:path + ";$wixInstallRoot"

# Build the cmdlets in debug mode
msbuild "$env:AzurePSRoot\build.proj" /t:"BuildDebug"
# Build the cmdlets and installer in debug mode
msbuild "$env:AzurePSRoot\build.proj" /t:Build

# Regenerate the installer files
&"$env:AzurePSRoot\tools\Installer\generate.ps1" 'Debug'

# Build the installer
msbuild "$env:AzurePSRoot\build.proj" /t:"BuildSetupDebug"

Write-Host "MSI file path: $env:AzurePSRoot\setup\build\Debug\AzurePowerShell.msi"
Write-Host "MSI file path: $env:AzurePSRoot\setup\build\Debug\AzurePowerShell.msi"
Write-Host "MSI for PowerShell Gallery: $env:AzurePSRoot\setup-powershellget\build\Debug\AzurePowerShellGet.msi"
2 changes: 1 addition & 1 deletion tools/RunCheckInTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
. ($scriptFolder + '.\SetupTestEnv.ps1')

$env:AZURE_TEST_MODE="Playback"
msbuild.exe $env:AzurePSRoot\build.proj /t:"Test;BuildSetupDebug"
msbuild.exe $env:AzurePSRoot\build.proj /t:Test
2 changes: 1 addition & 1 deletion tools/RunMockedScenarioTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
$scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
. ($scriptFolder + '.\SetupTestEnv.ps1')

msbuild.exe $env:AzurePSRoot\build.proj /t:"BuildDebug;BeforeRunTests;MockedScenarioTests"
msbuild.exe $env:AzurePSRoot\build.proj /t:"Build;BeforeRunTests;MockedScenarioTests"