From df99235497f7da1a61bb7ac54b8233501538c575 Mon Sep 17 00:00:00 2001
From: stankovski <denis.stankovski@gmail.com>
Date: Tue, 22 Sep 2015 08:43:07 -0700
Subject: [PATCH] Updated scripts to use new msbuild configuration

---
 setup-powershellget/Setup/ShortcutStartup.ps1 |  6 ++++--
 tools/Build.ps1                               |  2 +-
 tools/BuildInstaller.ps1                      | 13 ++++---------
 tools/RunCheckInTests.ps1                     |  2 +-
 tools/RunMockedScenarioTests.ps1              |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/setup-powershellget/Setup/ShortcutStartup.ps1 b/setup-powershellget/Setup/ShortcutStartup.ps1
index 176d463e97ef..8cca43a090df 100644
--- 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
index 0f7389778785..5dee2cff9a86 100644
--- 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
\ No newline at end of file
+msbuild "$env:AzurePSRoot\build.proj" /t:Build
\ No newline at end of file
diff --git a/tools/BuildInstaller.ps1 b/tools/BuildInstaller.ps1
index 1898c28be8cf..7b391af94584 100644
--- 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"
\ No newline at end of file
+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"
\ No newline at end of file
diff --git a/tools/RunCheckInTests.ps1 b/tools/RunCheckInTests.ps1
index e9f018df4bef..ede1a57f61bc 100644
--- 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"
\ No newline at end of file
+msbuild.exe $env:AzurePSRoot\build.proj /t:Test
\ No newline at end of file
diff --git a/tools/RunMockedScenarioTests.ps1 b/tools/RunMockedScenarioTests.ps1
index 0229dfe9caaf..afe2a204e1f3 100644
--- 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"
\ No newline at end of file
+msbuild.exe $env:AzurePSRoot\build.proj /t:"Build;BeforeRunTests;MockedScenarioTests"
\ No newline at end of file