Updated scripts to use new msbuild configuration

azure-sdk · Sep 22, 2015 · df99235 · df99235
1 parent 4e303e7
commit df99235
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/setup-powershellget/Setup/ShortcutStartup.ps1 b/setup-powershellget/Setup/ShortcutStartup.ps1
@@ -20,9 +20,11 @@ Param(
 $error.clear()
 try {
 	if ($Install.IsPresent) {
-		Write-Output @"Installing Azure Modules from PowerShell Gallery. 
-This may take some time...
+		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

diff --git a/tools/Build.ps1 b/tools/Build.ps1
@@ -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
diff --git a/tools/BuildInstaller.ps1 b/tools/BuildInstaller.ps1
@@ -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"
diff --git a/tools/RunCheckInTests.ps1 b/tools/RunCheckInTests.ps1
@@ -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
diff --git a/tools/RunMockedScenarioTests.ps1 b/tools/RunMockedScenarioTests.ps1
@@ -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"