Skip to content

Commit df99235

Browse files
committed
Updated scripts to use new msbuild configuration
1 parent 4e303e7 commit df99235

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

setup-powershellget/Setup/ShortcutStartup.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ Param(
2020
$error.clear()
2121
try {
2222
if ($Install.IsPresent) {
23-
Write-Output @"Installing Azure Modules from PowerShell Gallery.
24-
This may take some time...
23+
Write-Output @"
2524
25+
Finalizing installation of Azure PowerShell.
26+
Installing Azure Modules from PowerShell Gallery.
27+
This may take some time...
2628
"@
2729
Get-PackageProvider -Name NuGet -ForceBootstrap
2830
Install-Module AzureRM.Installer

tools/Build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
$scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
1616
. ($scriptFolder + '.\SetupEnv.ps1')
1717

18-
msbuild "$env:AzurePSRoot\build.proj" /t:BuildDebug
18+
msbuild "$env:AzurePSRoot\build.proj" /t:Build

tools/BuildInstaller.ps1

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,8 @@ if ($wixInstallRoot -eq $null){
5050
#and we just register both 3.8 & 3.5 to simplify the script
5151
$env:path = $env:path + ";$wixInstallRoot"
5252

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

56-
# Regenerate the installer files
57-
&"$env:AzurePSRoot\tools\Installer\generate.ps1" 'Debug'
58-
59-
# Build the installer
60-
msbuild "$env:AzurePSRoot\build.proj" /t:"BuildSetupDebug"
61-
62-
Write-Host "MSI file path: $env:AzurePSRoot\setup\build\Debug\AzurePowerShell.msi"
56+
Write-Host "MSI file path: $env:AzurePSRoot\setup\build\Debug\AzurePowerShell.msi"
57+
Write-Host "MSI for PowerShell Gallery: $env:AzurePSRoot\setup-powershellget\build\Debug\AzurePowerShellGet.msi"

tools/RunCheckInTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
1616
. ($scriptFolder + '.\SetupTestEnv.ps1')
1717

1818
$env:AZURE_TEST_MODE="Playback"
19-
msbuild.exe $env:AzurePSRoot\build.proj /t:"Test;BuildSetupDebug"
19+
msbuild.exe $env:AzurePSRoot\build.proj /t:Test

tools/RunMockedScenarioTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
$scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
1616
. ($scriptFolder + '.\SetupTestEnv.ps1')
1717

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

0 commit comments

Comments
 (0)