From e4800b58000e78cb8cd329842611127a41e9cfa6 Mon Sep 17 00:00:00 2001 From: ogail Date: Thu, 22 Oct 2015 17:44:46 -0700 Subject: [PATCH 01/10] Initial commit for gen msi from psget --- tools/SaveModules.ps1 | 107 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 tools/SaveModules.ps1 diff --git a/tools/SaveModules.ps1 b/tools/SaveModules.ps1 new file mode 100644 index 000000000000..1d8fc3b9b5a9 --- /dev/null +++ b/tools/SaveModules.ps1 @@ -0,0 +1,107 @@ +$AzureMajorVersion = "0" + +$AzureRMModules = @( + "AzureRM.ApiManagement", + "AzureRM.Automation", + "AzureRM.Backup", + "AzureRM.Batch", + "AzureRM.Compute", + "AzureRM.DataFactories", + "AzureRM.Dns", + "AzureRM.HDInsight", + "AzureRM.Insights", + "AzureRM.KeyVault", + "AzureRM.Network", + "AzureRM.OperationalInsights", + "AzureRM.RedisCache", + "AzureRM.Resources", + "AzureRM.SiteRecovery", + "AzureRM.Sql", + "AzureRM.Storage", + "AzureRM.StreamAnalytics", + "AzureRM.Tags", + "AzureRM.TrafficManager", + "AzureRM.UsageAggregates", + "AzureRM.Websites" +) + +$AzureRMPath = "$PSScriptRoot\..\src\Package\Debug\ResourceManager\AzureResourceManager" + +$AzureSMPath = "$PSScriptRoot\..\src\Package\Debug\ServiceManagement" + +function Save-ModuleWithVersionCheck([string]$Name,[string]$MajorVersion,[string]$Repository,[string]$Path) +{ + $_MinVer = "$MajorVersion.0.0.0" + $_MaxVer = "$MajorVersion.9999.9999.9999" + $script:InstallCounter ++ + try { + Save-Module -Name $Name -Repository $Repository -MinimumVersion $_MinVer -MaximumVersion $_MaxVer -ErrorAction Stop -Path $Path + $versionFolder = Get-ChildItem "$Path\$Name\" | Select-Object -First 1 + Get-ChildItem $versionFolder.FullName -Recurse | Copy-Item -Destination "$Path\$Name\" + Remove-Item $versionFolder.FullName -Force -Recurse + $v = $versionFolder.Name + Write-Output "$Name $v..." + } catch { + Write-Warning "Skipping $Name package..." + Write-Warning $_ + } +} + +<# + .Synopsis + Save Azure Resource Manager cmdlet modules + + .Description + Installs all the available Azure Resource Manager cmdlet modules that have a matching major version. + + .Parameter MajorVersion + Specifies the major version. + + .Parameter Repository + Limit the search for "AzureRM" cmdlets in a specific repository. +#> +function Save-AzureModule +{ + + param( + [Parameter(Position=0, Mandatory = $false)] + [string] + $MajorVersion = $AzureMajorVersion, + [Parameter(Position=1, Mandatory = $false)] + [string] + $Repository = "PSGallery", + [switch] + $Force = $false) + + Write-Output "Saving AzureRM modules." + + $_InstallationPolicy = (Get-PSRepository -Name $Repository).InstallationPolicy + $script:InstallCounter = 0 + + try + { + Remove-Item -Recurse -Force $AzureRMPath + New-Item -ItemType Directory -Force -Path $AzureRMPath + + Remove-Item -Recurse -Force $AzureSMPath + New-Item -ItemType Directory -Force -Path $AzureSMPath + + Set-PSRepository -Name $Repository -InstallationPolicy Trusted + + Save-ModuleWithVersionCheck "Azure.Storage" $MajorVersion $Repository $AzureRMPath + Save-ModuleWithVersionCheck "Azure" $MajorVersion $Repository $AzureSMPath + + # Start new job + $AzureRMModules | ForEach { + Save-ModuleWithVersionCheck $_ $MajorVersion $Repository $AzureRMPath + } + + Save-ModuleWithVersionCheck "AzureRM.Profile" $MajorVersion $Repository $AzureRMPath + + } finally { + # Clean up + Set-PSRepository -Name $Repository -InstallationPolicy $_InstallationPolicy + } +} + +Save-AzureModule \ No newline at end of file From b9f1f8e4fa95fe79ff1f2db5c803a617f0501f1d Mon Sep 17 00:00:00 2001 From: ogail Date: Mon, 26 Oct 2015 09:58:14 -0700 Subject: [PATCH 02/10] Fix save for Azure --- tools/BuildInstaller.ps1 | 3 +++ tools/SaveModules.ps1 | 29 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tools/BuildInstaller.ps1 b/tools/BuildInstaller.ps1 index 150fb3fddde4..1fd8e2b6c83b 100644 --- a/tools/BuildInstaller.ps1 +++ b/tools/BuildInstaller.ps1 @@ -50,6 +50,9 @@ if ($wixInstallRoot -eq $null){ #and we just register both 3.8 & 3.5 to simplify the script $env:path = $env:path + ";$wixInstallRoot" +# Save Azure PowerShell packages +&"$env:AzurePSRoot\tools\SaveModules.ps1" + # Regenerate the installer files &"$env:AzurePSRoot\tools\Installer\generate.ps1" 'Debug' diff --git a/tools/SaveModules.ps1 b/tools/SaveModules.ps1 index 1d8fc3b9b5a9..4621764b5d5c 100644 --- a/tools/SaveModules.ps1 +++ b/tools/SaveModules.ps1 @@ -37,9 +37,9 @@ function Save-ModuleWithVersionCheck([string]$Name,[string]$MajorVersion,[string try { Save-Module -Name $Name -Repository $Repository -MinimumVersion $_MinVer -MaximumVersion $_MaxVer -ErrorAction Stop -Path $Path $versionFolder = Get-ChildItem "$Path\$Name\" | Select-Object -First 1 - Get-ChildItem $versionFolder.FullName -Recurse | Copy-Item -Destination "$Path\$Name\" - Remove-Item $versionFolder.FullName -Force -Recurse - $v = $versionFolder.Name + Get-ChildItem $versionFolder.FullName | ForEach { Move-Item -Path $_.FullName -Destination "$Path\$Name\" } + Remove-Item $versionFolder.FullName -Recurse -Force + $v = $versionFolder.Name Write-Output "$Name $v..." } catch { Write-Warning "Skipping $Name package..." @@ -80,24 +80,23 @@ function Save-AzureModule try { - Remove-Item -Recurse -Force $AzureRMPath - New-Item -ItemType Directory -Force -Path $AzureRMPath - - Remove-Item -Recurse -Force $AzureSMPath - New-Item -ItemType Directory -Force -Path $AzureSMPath - + Remove-Item -Recurse -Force $AzureRMPath + New-Item -ItemType Directory -Force -Path $AzureRMPath + + Remove-Item -Recurse -Force $AzureSMPath + New-Item -ItemType Directory -Force -Path $AzureSMPath + Set-PSRepository -Name $Repository -InstallationPolicy Trusted - Save-ModuleWithVersionCheck "Azure.Storage" $MajorVersion $Repository $AzureRMPath - Save-ModuleWithVersionCheck "Azure" $MajorVersion $Repository $AzureSMPath - # Start new job $AzureRMModules | ForEach { Save-ModuleWithVersionCheck $_ $MajorVersion $Repository $AzureRMPath } - - Save-ModuleWithVersionCheck "AzureRM.Profile" $MajorVersion $Repository $AzureRMPath - + + Save-ModuleWithVersionCheck "Azure" $MajorVersion $Repository $AzureSMPath + Save-ModuleWithVersionCheck "Azure.Storage" $MajorVersion $Repository $AzureRMPath + Save-ModuleWithVersionCheck "AzureRM.Profile" $MajorVersion $Repository $AzureRMPath + } finally { # Clean up Set-PSRepository -Name $Repository -InstallationPolicy $_InstallationPolicy From b5f5aa470f23a36acb7a650ea5d128ee82e03647 Mon Sep 17 00:00:00 2001 From: ogail Date: Mon, 26 Oct 2015 10:15:53 -0700 Subject: [PATCH 03/10] Building Azure PowerShell MSI from PowerShellGet packages --- build.proj | 7 ++ setup/azurecmdfiles.wxi | 160 +++++++++++++++++++-------------------- tools/BuildInstaller.ps1 | 2 +- tools/SaveModules.ps1 | 4 +- 4 files changed, 86 insertions(+), 87 deletions(-) diff --git a/build.proj b/build.proj index 6dd3d0737bf8..9a5f94fec4d6 100644 --- a/build.proj +++ b/build.proj @@ -162,6 +162,13 @@ + + + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -3406,9 +3406,6 @@ - - - @@ -3972,9 +3969,6 @@ - - - @@ -4896,31 +4890,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5544,7 +5538,6 @@ - @@ -5720,7 +5713,6 @@ - diff --git a/tools/BuildInstaller.ps1 b/tools/BuildInstaller.ps1 index 1fd8e2b6c83b..b36a62d5bde3 100644 --- a/tools/BuildInstaller.ps1 +++ b/tools/BuildInstaller.ps1 @@ -57,7 +57,7 @@ $env:path = $env:path + ";$wixInstallRoot" &"$env:AzurePSRoot\tools\Installer\generate.ps1" 'Debug' # Build the cmdlets and installer in debug mode -msbuild "$env:AzurePSRoot\build.proj" /t:Build +msbuild "$env:AzurePSRoot\build.proj" /t:BuildInstaller 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/SaveModules.ps1 b/tools/SaveModules.ps1 index 4621764b5d5c..0e0a7842a23a 100644 --- a/tools/SaveModules.ps1 +++ b/tools/SaveModules.ps1 @@ -80,10 +80,10 @@ function Save-AzureModule try { - Remove-Item -Recurse -Force $AzureRMPath + Remove-Item -Recurse -Force $AzureRMPath -ErrorAction SilentlyContinue New-Item -ItemType Directory -Force -Path $AzureRMPath - Remove-Item -Recurse -Force $AzureSMPath + Remove-Item -Recurse -Force $AzureSMPath -ErrorAction SilentlyContinue New-Item -ItemType Directory -Force -Path $AzureSMPath Set-PSRepository -Name $Repository -InstallationPolicy Trusted From 5c8eca7b9ed9552e6ab703dcaaf6056cd5bb38a8 Mon Sep 17 00:00:00 2001 From: ogail Date: Mon, 26 Oct 2015 17:04:18 -0700 Subject: [PATCH 04/10] Apply code review feedback - Change output structure to flat one - Add ability to specify source repo - Assured PSGetModuleInfo.xml is being deleted. - Updated Installer to append PowerShell module only to PSModulePath --- build.proj | 15 +- setup/azurecmd.wxs | 4 +- setup/azurecmdfiles.wxi | 11492 ++++++++++++++++++--------------- tools/BuildInstaller.ps1 | 26 +- tools/Installer/generate.ps1 | 17 +- tools/SaveModules.ps1 | 88 +- 6 files changed, 6256 insertions(+), 5386 deletions(-) diff --git a/build.proj b/build.proj index 9a5f94fec4d6..250c9fe5e478 100644 --- a/build.proj +++ b/build.proj @@ -160,15 +160,14 @@ ContinueOnError="false" /> - - - - - + + + + + + + + + diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index 80fd77a1afa0..41153f4ad146 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -89,7 +89,7 @@ - + @@ -105,7 +105,7 @@ Name="Microsoft Azure PowerShell" Description="Microsoft PowerShell cmdlets" Target="[POWERSHELLPATH]\powershell.exe" - Arguments="-NoExit -ExecutionPolicy Bypass -File "[PowerShellFolder]ServiceManagement\Azure\Services\ShortcutStartup.ps1""/> + Arguments="-NoExit -ExecutionPolicy Bypass -File "[PowerShellFolder]Azure\Services\ShortcutStartup.ps1""/> diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 2d1c537564ad..1d62cfa1d3ad 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -2,5862 +2,6716 @@ - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + - - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/BuildInstaller.ps1 b/tools/BuildInstaller.ps1 index b36a62d5bde3..b66eec4d5e42 100644 --- a/tools/BuildInstaller.ps1 +++ b/tools/BuildInstaller.ps1 @@ -12,6 +12,14 @@ # limitations under the License. # ---------------------------------------------------------------------------------- +param( + [Parameter(Position = 0, Mandatory = $false)] + [string] + $BuildConfig = "Release", + [Parameter(Position = 1, Mandatory = $false)] + [string] + $RepositoryLocation = "http://psget/PSGallery/api/v2/") + $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent . ($scriptFolder + '.\SetupEnv.ps1') @@ -50,14 +58,16 @@ if ($wixInstallRoot -eq $null){ #and we just register both 3.8 & 3.5 to simplify the script $env:path = $env:path + ";$wixInstallRoot" +$repo = Get-PSRepository | where { $_.SourceLocation -eq $RepositoryLocation } +if ($repo -ne $null) { + $repoName = $repo.Name +} else { + $repoName = $(New-Guid).ToString() + Register-PSRepository -Name $repoName -SourceLocation $RepositoryLocation -PublishLocation $RepositoryLocation/package -InstallationPolicy Trusted +} + # Save Azure PowerShell packages -&"$env:AzurePSRoot\tools\SaveModules.ps1" +&"$env:AzurePSRoot\tools\SaveModules.ps1" $BuildConfig $repoName # Regenerate the installer files -&"$env:AzurePSRoot\tools\Installer\generate.ps1" 'Debug' - -# Build the cmdlets and installer in debug mode -msbuild "$env:AzurePSRoot\build.proj" /t:BuildInstaller - -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 +&"$env:AzurePSRoot\tools\Installer\generate.ps1" $BuildConfig \ No newline at end of file diff --git a/tools/Installer/generate.ps1 b/tools/Installer/generate.ps1 index bb0173e743e8..5dbef9b74f4e 100644 --- a/tools/Installer/generate.ps1 +++ b/tools/Installer/generate.ps1 @@ -14,17 +14,12 @@ param( [Parameter(Mandatory = $false, Position = 0)] - [string] $buildConfig + [string] + $buildConfig = "Release" ) $VerbosePreference = 'Continue' -if ([string]::IsNullOrEmpty($buildConfig)) -{ - Write-Verbose "Setting build configuration to 'Release'" - $buildConfig = 'Release' -} - Write-Verbose "Build configuration is set to $buildConfig" $output = Join-Path $env:AzurePSRoot "src\Package\$buildConfig" @@ -51,12 +46,12 @@ Get-ChildItem -Include $include -Exclude $exclude -Recurse -Path $output | Remov if (Get-Command "heat.exe" -ErrorAction SilentlyContinue) { - $azureFiles = Join-Path $env:AzurePSRoot 'setup\azurecmdfiles.wxi' + $azureFiles = Join-Path $env:AzurePSRoot 'setup\azurecmdfiles.wxi' heat dir $output -srd -sfrag -sreg -ag -g1 -cg azurecmdfiles -dr PowerShellFolder -var var.sourceDir -o $azureFiles - # Replace with - (gc $azureFiles).replace(' with + (gc $azureFiles).replace(' +param( + [Parameter(Position = 0, Mandatory = $false)] + [string] + $BuildConfig = "Release", + [Parameter(Position = 1, Mandatory = $false)] + [string] + $Repository = "PSGallery") + $AzureMajorVersion = "0" $AzureRMModules = @( @@ -25,9 +60,7 @@ $AzureRMModules = @( "AzureRM.Websites" ) -$AzureRMPath = "$PSScriptRoot\..\src\Package\Debug\ResourceManager\AzureResourceManager" - -$AzureSMPath = "$PSScriptRoot\..\src\Package\Debug\ServiceManagement" +$AzurePSPath = "$PSScriptRoot\..\src\Package\$BuildConfig" function Save-ModuleWithVersionCheck([string]$Name,[string]$MajorVersion,[string]$Repository,[string]$Path) { @@ -37,8 +70,6 @@ function Save-ModuleWithVersionCheck([string]$Name,[string]$MajorVersion,[string try { Save-Module -Name $Name -Repository $Repository -MinimumVersion $_MinVer -MaximumVersion $_MaxVer -ErrorAction Stop -Path $Path $versionFolder = Get-ChildItem "$Path\$Name\" | Select-Object -First 1 - Get-ChildItem $versionFolder.FullName | ForEach { Move-Item -Path $_.FullName -Destination "$Path\$Name\" } - Remove-Item $versionFolder.FullName -Recurse -Force $v = $versionFolder.Name Write-Output "$Name $v..." } catch { @@ -47,59 +78,36 @@ function Save-ModuleWithVersionCheck([string]$Name,[string]$MajorVersion,[string } } -<# - .Synopsis - Save Azure Resource Manager cmdlet modules - - .Description - Installs all the available Azure Resource Manager cmdlet modules that have a matching major version. - - .Parameter MajorVersion - Specifies the major version. - - .Parameter Repository - Limit the search for "AzureRM" cmdlets in a specific repository. -#> function Save-AzureModule { - - param( - [Parameter(Position=0, Mandatory = $false)] - [string] - $MajorVersion = $AzureMajorVersion, - [Parameter(Position=1, Mandatory = $false)] - [string] - $Repository = "PSGallery", - [switch] - $Force = $false) - - Write-Output "Saving AzureRM modules." + Write-Output "Saving Azure PowerShell modules." $_InstallationPolicy = (Get-PSRepository -Name $Repository).InstallationPolicy $script:InstallCounter = 0 try { - Remove-Item -Recurse -Force $AzureRMPath -ErrorAction SilentlyContinue - New-Item -ItemType Directory -Force -Path $AzureRMPath - - Remove-Item -Recurse -Force $AzureSMPath -ErrorAction SilentlyContinue - New-Item -ItemType Directory -Force -Path $AzureSMPath + Remove-Item -Recurse -Force $AzurePSPath -ErrorAction SilentlyContinue + New-Item -ItemType Directory -Force -Path $AzurePSPath Set-PSRepository -Name $Repository -InstallationPolicy Trusted - + Write-Output "Using Repository $Repository..." + + $MajorVersion = $AzureMajorVersion + # Start new job $AzureRMModules | ForEach { - Save-ModuleWithVersionCheck $_ $MajorVersion $Repository $AzureRMPath + Save-ModuleWithVersionCheck $_ $MajorVersion $Repository $AzurePSPath } - Save-ModuleWithVersionCheck "Azure" $MajorVersion $Repository $AzureSMPath - Save-ModuleWithVersionCheck "Azure.Storage" $MajorVersion $Repository $AzureRMPath - Save-ModuleWithVersionCheck "AzureRM.Profile" $MajorVersion $Repository $AzureRMPath + Save-ModuleWithVersionCheck "Azure" $MajorVersion $Repository $AzurePSPath + Save-ModuleWithVersionCheck "Azure.Storage" $MajorVersion $Repository $AzurePSPath + Save-ModuleWithVersionCheck "AzureRM.Profile" $MajorVersion $Repository $AzurePSPath } finally { # Clean up Set-PSRepository -Name $Repository -InstallationPolicy $_InstallationPolicy + Get-ChildItem -Path $AzurePSPath -Include PSGetModuleInfo.xml -Recurse -Force | Foreach { $_.Delete() } } } From 021bdb111c699d4fa25f6dbe7249978daa238981 Mon Sep 17 00:00:00 2001 From: ogail Date: Mon, 26 Oct 2015 17:30:23 -0700 Subject: [PATCH 05/10] Update output paths --- .../EnvironmentSetupHelper.cs | 16 ++++++------- .../BVT/StorageBVT.cs | 2 +- .../EnvironmentSetupHelper.cs | 24 +++++++++---------- .../Common/PowerShellTest.cs | 4 ++-- .../CredentialTests/CredentialTestHelper.cs | 8 +++---- .../DscExtension/DscExtensionTests.cs | 6 ++--- .../ResourceManagerTests.cs | 2 +- .../Scheduler/SchedulerTests.cs | 2 +- .../ServiceManagementTests.cs | 6 ++--- .../TrafficManagerTests.cs | 2 +- .../Common/FileSystemHelper.cs | 2 +- .../DisableAzureRemoteDesktopCommandTest.cs | 6 ++--- .../EnableAzureRemoteDesktopCommandTest.cs | 8 +++---- .../SaveAzureServiceProjectPackageTests.cs | 4 ++-- .../Utilities/AzureServiceTests.cs | 2 +- .../Utilities/CloudServiceClientTests.cs | 10 ++++---- .../UnitTests/UnitTestHelper.cs | 2 +- 17 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs b/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs index 03e16d6c5363..0ba57d2e496a 100644 --- a/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs +++ b/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs @@ -209,16 +209,16 @@ public void SetupModules(AzureModule mode, params string[] modules) this.modules = new List(); if (mode == AzureModule.AzureProfile) { - this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1")); - this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"AzureResourceManager.psd1")); } else if (mode == AzureModule.AzureServiceManagement) { - this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"Azure\Azure.psd1")); } else if (mode == AzureModule.AzureResourceManager) { - this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"AzureResourceManager.psd1")); } else { @@ -234,16 +234,16 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules) this.modules = new List(); if (mode == AzureModule.AzureProfile) { - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1")); - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureResourceManager.psd1")); } else if (mode == AzureModule.AzureServiceManagement) { - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Azure\Azure.psd1")); } else if (mode == AzureModule.AzureResourceManager) { - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureResourceManager.psd1")); } else { diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs b/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs index d9067b25d4bf..7e95452bcfa9 100644 --- a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs +++ b/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs @@ -80,7 +80,7 @@ public static void CLICommonBVTInitialize(TestContext testContext) Test.Info("Clean storage context in PowerShell"); PowerShellAgent.CleanStorageContext(); - PowerShellAgent.ImportModule(@".\ServiceManagement\Azure\Storage\Microsoft.WindowsAzure.Commands.Storage.dll"); + PowerShellAgent.ImportModule(@".\Azure\Storage\Microsoft.WindowsAzure.Commands.Storage.dll"); // import module diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs index feda09617c28..ced7b157895a 100644 --- a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs +++ b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs @@ -77,7 +77,7 @@ public string RMProfileModule get { return Path.Combine(this.PackageDirectory, - @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"); + @"AzureRM.Profile\AzureRM.Profile.psd1"); } } @@ -86,7 +86,7 @@ public string RMResourceModule get { return Path.Combine(this.PackageDirectory, - @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"); + @"AzureRM.Resources\AzureRM.Resources.psd1"); } } @@ -95,7 +95,7 @@ public string RMStorageModule get { return Path.Combine(this.PackageDirectory, - @"ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Storage.psd1"); + @"AzureRM.Storage\AzureRM.Storage.psd1"); } } @@ -105,7 +105,7 @@ public string RMStorageDataPlaneModule get { return Path.Combine(this.PackageDirectory, - @"ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1"); + @"Azure.Storage\Azure.Storage.psd1"); } } @@ -113,7 +113,7 @@ public string GetRMModulePath(string psd1FileName) { string basename = Path.GetFileNameWithoutExtension(psd1FileName); return Path.Combine(this.PackageDirectory, - @"ResourceManager\AzureResourceManager\" + basename + @"\" + psd1FileName); + @"" + basename + @"\" + psd1FileName); } /// /// Loads DummyManagementClientHelper with clients and throws exception if any client is missing. @@ -254,12 +254,12 @@ public void SetupModules(AzureModule mode, params string[] modules) this.modules = new List(); if (mode == AzureModule.AzureProfile) { - this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1")); - this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"AzureResourceManager.psd1")); } else if (mode == AzureModule.AzureServiceManagement) { - this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"Azure\Azure.psd1")); } this.modules.Add("Assert.ps1"); @@ -272,16 +272,16 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules) this.modules = new List(); if (mode == AzureModule.AzureProfile) { - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1")); - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureResourceManager.psd1")); } else if (mode == AzureModule.AzureServiceManagement) { - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Azure\Azure.psd1")); } else if (mode == AzureModule.AzureResourceManager) { - this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureResourceManager.psd1")); } else { diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs index 20ff0087ded7..686ac98bfa33 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs @@ -39,11 +39,11 @@ public PowerShellTest(AzureModule commandMode, params string[] modules) this.modules = new List(); if (commandMode == AzureModule.AzureServiceManagement) { - this.modules.Add(FileUtilities.GetContentFilePath(@"ServiceManagement\Azure\Azure.psd1")); + this.modules.Add(FileUtilities.GetContentFilePath(@"Azure\Azure.psd1")); } else if (commandMode == AzureModule.AzureResourceManager) { - this.modules.Add(FileUtilities.GetContentFilePath(@"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); + this.modules.Add(FileUtilities.GetContentFilePath(@"AzureResourceManager.psd1")); } else { diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs index ec37c894bf45..b04a152140cf 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs @@ -41,16 +41,16 @@ public void SetupModules(AzureModule mode, params string[] testModules) switch (mode) { case AzureModule.AzureProfile: - modules.Add(@"ServiceManagement\Azure\Azure.psd1"); - modules.Add(@"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"); + modules.Add(@"Azure\Azure.psd1"); + modules.Add(@"AzureResourceManager.psd1"); break; case AzureModule.AzureServiceManagement: - modules.Add(@"ServiceManagement\Azure\Azure.psd1"); + modules.Add(@"Azure\Azure.psd1"); break; case AzureModule.AzureResourceManager: - modules.Add(@"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"); + modules.Add(@"AzureResourceManager.psd1"); break; default: diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs index 93edb1a08323..eb4c1660e24a 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs @@ -65,9 +65,9 @@ protected void RunPowerShellTest(params string[] scripts) { "Resources\\DscExtension\\DscExtensionTests.ps1", "Resources\\ServiceManagement\\Common.ps1", - @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1", - @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\AzurePreview.psd1", - @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\PIR.psd1" + @"..\..\..\..\..\Package\Debug\Azure\Azure.psd1", + @"..\..\..\..\..\Package\Debug\Azure\Compute\AzurePreview.psd1", + @"..\..\..\..\..\Package\Debug\Azure\Compute\PIR.psd1" }; helper.SetupEnvironment(AzureModule.AzureServiceManagement); diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/ResourceManagerTests/ResourceManagerTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/ResourceManagerTests/ResourceManagerTests.cs index 67b67df7b297..8712d8b13101 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/ResourceManagerTests/ResourceManagerTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/ResourceManagerTests/ResourceManagerTests.cs @@ -52,7 +52,7 @@ protected void RunPowerShellTest(params string[] scripts) List modules = Directory.GetFiles("Resources\\ResourceManager", "*.ps1").ToList(); modules.Add("Common.ps1"); - modules.Add(@"..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureResourceManager.psd1"); + modules.Add(@"..\..\..\..\Package\Debug\AzureResourceManager.psd1"); helper.SetupEnvironment(AzureModule.AzureResourceManager); helper.SetupModules(modules.ToArray()); diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs index b84d3bf03a14..6826b41458dd 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs @@ -52,7 +52,7 @@ protected void RunPowerShellTest(params string[] scripts) List modules = Directory.GetFiles("Resources\\Scheduler", "*.ps1").ToList(); modules.Add("Common.ps1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); + modules.Add(@"..\..\..\..\..\Package\Debug\Azure\Azure.psd1"); helper.SetupEnvironment(AzureModule.AzureServiceManagement); helper.SetupModules(modules.ToArray()); diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs index 9fe205c03c4d..1a6d11ac93e0 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs @@ -53,9 +53,9 @@ protected void RunPowerShellTest(params string[] scripts) List modules = Directory.GetFiles(@"Resources\ServiceManagement", "*.ps1").ToList(); modules.Add("Common.ps1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\AzurePreview.psd1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\PIR.psd1"); + modules.Add(@"..\..\..\..\..\Package\Debug\Azure\Azure.psd1"); + modules.Add(@"..\..\..\..\..\Package\Debug\Azure\Compute\AzurePreview.psd1"); + modules.Add(@"..\..\..\..\..\Package\Debug\Azure\Compute\PIR.psd1"); helper.SetupEnvironment(AzureModule.AzureServiceManagement); helper.SetupModules(modules.ToArray()); diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs index 1db0072aecdf..56c31f09ec47 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs @@ -274,7 +274,7 @@ protected void RunPowerShellTest(params string[] scripts) List modules = Directory.GetFiles("Resources\\TrafficManager", "*.ps1").ToList(); modules.Add("Common.ps1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); + modules.Add(@"..\..\..\..\..\Package\Debug\Azure\Azure.psd1"); helper.SetupEnvironment(AzureModule.AzureServiceManagement); helper.SetupModules(modules.ToArray()); diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs index 1e9e2f94ec32..a93cb6062a44 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs @@ -304,7 +304,7 @@ public string CreateAzureSdkDirectoryAndImportPublishSettings(string publishSett /// Directory created for the service. public string CreateNewService(string serviceName) { - CloudServiceProject newService = new CloudServiceProject(RootPath, serviceName, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject newService = new CloudServiceProject(RootPath, serviceName, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); string path = Path.Combine(RootPath, serviceName); _previousDirectory = Environment.CurrentDirectory; Environment.CurrentDirectory = path; diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs index fa26a2a2dea0..006f71e73a99 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs @@ -136,7 +136,7 @@ public void EnableDisableRemoteDesktopForWebRole() disableRDCmdlet.DisableRemoteDesktop(); // Verify the role has been setup with forwarding, access, // and certs - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); EnableAzureRemoteDesktopCommandTest.VerifyWebRole(service.Components.Definition.WebRole[0], true); VerifyDisableRoleSettings(service); } @@ -161,7 +161,7 @@ public void EnableDisableRemoteDesktopForWebAndWorkerRoles() disableRDCmdlet.DisableRemoteDesktop(); // Verify the roles have been setup with forwarding, access, // and certs - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); EnableAzureRemoteDesktopCommandTest.VerifyWebRole(service.Components.Definition.WebRole[0], false); EnableAzureRemoteDesktopCommandTest.VerifyWorkerRole(service.Components.Definition.WorkerRole[0], true); VerifyDisableRoleSettings(service); @@ -188,7 +188,7 @@ public void EnableDisableEnableRemoteDesktopForWebAndWorkerRoles() EnableAzureRemoteDesktopCommandTest.EnableRemoteDesktop("user", "GoodPassword!"); // Verify the roles have been setup with forwarding, access, // and certs - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); EnableAzureRemoteDesktopCommandTest.VerifyWebRole(service.Components.Definition.WebRole[0], false); EnableAzureRemoteDesktopCommandTest.VerifyWorkerRole(service.Components.Definition.WorkerRole[0], true); EnableAzureRemoteDesktopCommandTest.VerifyRoleSettings(service); diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs index d4d4b7674f85..f30dca410b4c 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs @@ -184,7 +184,7 @@ public void EnableRemoteDesktopForWebRole() // Verify the role has been setup with forwarding, access, // and certs - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); VerifyWebRole(service.Components.Definition.WebRole[0], true); VerifyRoleSettings(service); } @@ -210,7 +210,7 @@ public void EnableRemoteDesktopForWebAndWorkerRoles() // Verify the roles have been setup with forwarding, access, // and certs - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); VerifyWebRole(service.Components.Definition.WebRole[0], false); VerifyWorkerRole(service.Components.Definition.WorkerRole[0], true); VerifyRoleSettings(service); @@ -247,7 +247,7 @@ public void EnableRemoteDesktopForMultipleWebAndWorkerRolesTwice() // Verify the roles have been setup with forwarding, access, // and certs - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); VerifyWebRole(service.Components.Definition.WebRole[0], false); VerifyWebRole(service.Components.Definition.WebRole[0], false); VerifyWorkerRole(service.Components.Definition.WorkerRole[0], true); @@ -281,7 +281,7 @@ public void EnableRemoteDesktopUnicode() // Verify the role has been setup with forwarding, access, // and certs - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); VerifyWebRole(service.Components.Definition.WebRole[0], true); VerifyRoleSettings(service); } diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs index 7802f1b702df..7f7bbd199549 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs @@ -67,7 +67,7 @@ public void TestCreatePackageSuccessfull() string rootPath = Path.Combine(files.RootPath, "NEW_SERVICE"); string packagePath = Path.Combine(rootPath, Resources.CloudPackageFileName); - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); service.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); cmdlet.ExecuteCmdlet(); @@ -110,7 +110,7 @@ public void TestCreatePackageWithMultipleRolesSuccessfull() string rootPath = Path.Combine(files.RootPath, "NEW_SERVICE"); string packagePath = Path.Combine(rootPath, Resources.CloudPackageFileName); - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); service.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); service.AddWorkerRole(Test.Utilities.Common.Data.NodeWorkerRoleScaffoldingPath); service.AddWorkerRole(Test.Utilities.Common.Data.NodeWorkerRoleScaffoldingPath); diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs index efe34f84501d..365b9225f613 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs @@ -595,7 +595,7 @@ public void TestResolveRuntimePackageUrls() AddAzureNodeWebRoleCommand addAzureWebRole = new AddAzureNodeWebRoleCommand() { RootPath = rootPath, CommandRuntime = mockCommandRuntime, Name = webRole2Name }; addAzureWebRole.ExecuteCmdlet(); - CloudServiceProject testService = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + CloudServiceProject testService = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); RuntimePackageHelper.SetRoleRuntime(testService.Components.Definition, matchWebRoleName, testService.Paths, version: "0.8.2"); RuntimePackageHelper.SetRoleRuntime(testService.Components.Definition, matchWorkerRoleName, testService.Paths, version: "0.8.2"); RuntimePackageHelper.SetRoleRuntime(testService.Components.Definition, overrideWebRoleName, testService.Paths, overrideUrl: "http://OVERRIDE"); diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs index 64ee165d9b13..c0f361a902d0 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs @@ -277,7 +277,7 @@ public void TestPublishNewCloudService() // Setup string rootPath = files.CreateNewService(serviceName); files.CreateAzureSdkDirectoryAndImportPublishSettings(); - var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); cloudServiceProject.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); @@ -313,7 +313,7 @@ public void TestUpgradeCloudService() // Setup string rootPath = files.CreateNewService(serviceName); files.CreateAzureSdkDirectoryAndImportPublishSettings(); - var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); cloudServiceProject.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); ExecuteInTempCurrentDirectory(rootPath, () => client.PublishCloudService(location: "West US")); @@ -344,7 +344,7 @@ public void TestCreateStorageServiceWithPublish() // Setup string rootPath = files.CreateNewService(serviceName); files.CreateAzureSdkDirectoryAndImportPublishSettings(); - var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); cloudServiceProject.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); ExecuteInTempCurrentDirectory(rootPath, () => client.PublishCloudService(location: "West US")); @@ -372,7 +372,7 @@ public void TestPublishWithCurrentStorageAccount() // Setup string rootPath = files.CreateNewService(serviceName); files.CreateAzureSdkDirectoryAndImportPublishSettings(); - var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); cloudServiceProject.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); subscription.Properties[AzureSubscription.Property.StorageAccount] = storageName; @@ -414,7 +414,7 @@ public void TestPublishWithDefaultLocation() // Setup string rootPath = files.CreateNewService(serviceName); files.CreateAzureSdkDirectoryAndImportPublishSettings(); - var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Services")); + var cloudServiceProject = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath(@"..\..\..\..\..\Package\Debug\Azure\Services")); cloudServiceProject.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); ExecuteInTempCurrentDirectory(rootPath, () => client.PublishCloudService()); diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs index bdafb5a7d878..eea8188810a8 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs @@ -245,7 +245,7 @@ public static void DumpStreams(this System.Management.Automation.PowerShell powe public static void ImportAzureModule(System.Management.Automation.PowerShell powershell) { // Import the test manifest file - powershell.InvokeBatchScript(@"Import-Module ..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); + powershell.InvokeBatchScript(@"Import-Module ..\..\..\..\Package\Debug\Azure\Azure.psd1"); Assert.IsTrue(powershell.Streams.Error.Count == 0); } From 1127281754b4c622931fc8f017be52574e492a77 Mon Sep 17 00:00:00 2001 From: ogail Date: Mon, 26 Oct 2015 18:12:31 -0700 Subject: [PATCH 06/10] Support building MSI from source --- build.proj | 2 +- setup/azurecmdfiles.wxi | 6717 -------------------------------------- tools/BuildInstaller.ps1 | 22 +- 3 files changed, 15 insertions(+), 6726 deletions(-) delete mode 100644 setup/azurecmdfiles.wxi diff --git a/build.proj b/build.proj index 250c9fe5e478..6ee2a4ec7c13 100644 --- a/build.proj +++ b/build.proj @@ -41,7 +41,7 @@ $(PublishDirectory)\Setup $(PublishDirectory)\TestResults true - http://psget/PSGallery/api/v2/ + https://dtlgalleryint.cloudapp.net/api/v2 all diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi deleted file mode 100644 index 1d62cfa1d3ad..000000000000 --- a/setup/azurecmdfiles.wxi +++ /dev/null @@ -1,6717 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/BuildInstaller.ps1 b/tools/BuildInstaller.ps1 index b66eec4d5e42..df916531d011 100644 --- a/tools/BuildInstaller.ps1 +++ b/tools/BuildInstaller.ps1 @@ -58,16 +58,22 @@ if ($wixInstallRoot -eq $null){ #and we just register both 3.8 & 3.5 to simplify the script $env:path = $env:path + ";$wixInstallRoot" -$repo = Get-PSRepository | where { $_.SourceLocation -eq $RepositoryLocation } -if ($repo -ne $null) { - $repoName = $repo.Name +if ($RepositoryLocation -eq "Local") { + # Fetch the cmdlets from source + msbuild "$env:AzurePSRoot\build.proj" /t:Build /p:Configuration=$BuildConfig } else { - $repoName = $(New-Guid).ToString() - Register-PSRepository -Name $repoName -SourceLocation $RepositoryLocation -PublishLocation $RepositoryLocation/package -InstallationPolicy Trusted + # Fetch the cmdlets from gallery + $repo = Get-PSRepository | where { $_.SourceLocation -eq $RepositoryLocation } + if ($repo -ne $null) { + $repoName = $repo.Name + } else { + $repoName = $(New-Guid).ToString() + Register-PSRepository -Name $repoName -SourceLocation $RepositoryLocation -PublishLocation $RepositoryLocation/package -InstallationPolicy Trusted + } + + # Save Azure PowerShell packages + &"$env:AzurePSRoot\tools\SaveModules.ps1" $BuildConfig $repoName } -# Save Azure PowerShell packages -&"$env:AzurePSRoot\tools\SaveModules.ps1" $BuildConfig $repoName - # Regenerate the installer files &"$env:AzurePSRoot\tools\Installer\generate.ps1" $BuildConfig \ No newline at end of file From babc5aded00a0cc07f6644239419c27457132bbb Mon Sep 17 00:00:00 2001 From: ogail Date: Mon, 26 Oct 2015 18:16:51 -0700 Subject: [PATCH 07/10] Update projects output paths --- src/Common/Storage/Commands.Storage/Commands.Storage.csproj | 4 ++-- .../Commands.ApiManagement.ServiceManagement.csproj | 4 ++-- .../Commands.ApiManagement/Commands.ApiManagement.csproj | 4 ++-- .../Automation/Commands.Automation/Commands.Automation.csproj | 4 ++-- .../Commands.AzureBackup/Commands.AzureBackup.csproj | 4 ++-- .../AzureBatch/Commands.Batch/Commands.Batch.csproj | 4 ++-- .../Compute/Commands.Compute/Commands.Compute.csproj | 4 ++-- .../Commands.DataFactories/Commands.DataFactories.csproj | 4 ++-- src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj | 4 ++-- .../HDInsight/Commands.HDInsight/Commands.HDInsight.csproj | 4 ++-- .../Insights/Commands.Insights/Commands.Insights.csproj | 4 ++-- .../KeyVault/Commands.KeyVault/Commands.KeyVault.csproj | 4 ++-- .../Network/Commands.Network/Commands.Network.csproj | 4 ++-- .../Commands.OperationalInsights.csproj | 4 ++-- .../Profile/Commands.Profile/Commands.Profile.csproj | 4 ++-- .../RedisCache/Commands.RedisCache/Commands.RedisCache.csproj | 4 ++-- .../Cmdlets/Commands.Resources.Rest.csproj | 4 ++-- .../Resources/Commands.Resources/Commands.Resources.csproj | 4 ++-- .../Commands.SiteRecovery/Commands.SiteRecovery.csproj | 4 ++-- src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj | 4 ++-- .../Commands.Management.Storage.csproj | 4 ++-- .../Commands.StreamAnalytics/Commands.StreamAnalytics.csproj | 4 ++-- src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj | 4 ++-- .../Commands.TrafficManager.Test.csproj | 2 +- .../Commands.TrafficManager2/Commands.TrafficManager.csproj | 4 ++-- .../Commands.UsageAggregates/Commands.UsageAggregates.csproj | 4 ++-- .../Websites/Commands.Websites/Commands.Websites.csproj | 4 ++-- .../Automation/Commands.Automation/Commands.Automation.csproj | 4 ++-- .../Commands.ServiceManagement.PlatformImageRepository.csproj | 4 ++-- .../Commands.ServiceManagement.Preview.csproj | 4 ++-- .../Commands.ServiceManagement.csproj | 4 ++-- src/ServiceManagement/Compute/Sync/Sync.csproj | 4 ++-- .../Compute/VhdManagement/VhdManagement.csproj | 4 ++-- .../Commands.ExpressRoute/Commands.ExpressRoute.csproj | 4 ++-- .../HDInsight/Commands.HDInsight/HDInsight.csproj | 4 ++-- .../Commands.ManagedCache/Commands.ManagedCache.csproj | 4 ++-- .../Commands.ServiceManagement.Network.csproj | 4 ++-- .../Profile/Commands.Profile/Commands.Profile.csproj | 4 ++-- .../Commands.RecoveryServices.csproj | 4 ++-- .../RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj | 2 +- .../Services/Commands.Utilities/Commands.Utilities.csproj | 4 ++-- src/ServiceManagement/Services/Commands/Commands.csproj | 4 ++-- .../Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj | 4 ++-- .../StorSimple/Commands.StorSimple/Commands.StorSimple.csproj | 4 ++-- .../Commands.TrafficManager/Commands.TrafficManager.csproj | 4 ++-- 45 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj b/src/Common/Storage/Commands.Storage/Commands.Storage.csproj index 06502f903834..1d81fb74af40 100644 --- a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj +++ b/src/Common/Storage/Commands.Storage/Commands.Storage.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Azure.Storage + ..\..\..\Package\Debug\Azure\Azure.Storage DEBUG;TRACE prompt 4 @@ -32,7 +32,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ServiceManagement\Azure\Azure.Storage + ..\..\..\Package\Release\Azure\Azure.Storage TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj index 9aee4afc1047..da9bc5f1760f 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj @@ -18,7 +18,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\ + ..\..\..\Package\Debug\AzureRM.ApiManagement\ TRACE;DEBUG;CODE_ANALYSIS prompt 4 @@ -30,7 +30,7 @@ pdbonly true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\ + ..\..\..\Package\Release\AzureRM.ApiManagement\ TRACE;SIGN AnyCPU bin\Release\Management.Automation.dll.CodeAnalysisLog.xml diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj index b191b8e44414..c02ff81ab1b6 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj @@ -18,7 +18,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\ + ..\..\..\Package\Debug\AzureRM.ApiManagement\ TRACE;DEBUG;CODE_ANALYSIS prompt 4 @@ -29,7 +29,7 @@ pdbonly true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\ + ..\..\..\Package\Release\AzureRM.ApiManagement\ TRACE;SIGN AnyCPU bin\Release\Management.Automation.dll.CodeAnalysisLog.xml diff --git a/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj b/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj index c5e00e12759e..2cc0595739f4 100644 --- a/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj +++ b/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Automation\ + ..\..\..\Package\Debug\AzureRM.Automation\ DEBUG;TRACE prompt 4 @@ -33,7 +33,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Automation\ + ..\..\..\Package\Release\AzureRM.Automation\ TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj index fb783fe3cb11..91c0f078f65a 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Backup\ + ..\..\..\Package\Debug\AzureRM.Backup\ DEBUG;TRACE prompt 4 @@ -30,7 +30,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Backup\ + ..\..\..\Package\Release\AzureRM.Backup\ TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj index 6a197b0b2a7f..aeea8601a6e1 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Batch\ + ..\..\..\Package\Debug\AzureRM.Batch\ TRACE;DEBUG;CODE_ANALYSIS prompt 4 @@ -30,7 +30,7 @@ pdbonly true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Batch\ + ..\..\..\Package\Release\AzureRM.Batch\ TRACE;SIGN prompt 4 diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj index ca9257a6919a..7e277cad1111 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj +++ b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Compute\ + ..\..\..\Package\Debug\AzureRM.Compute\ DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Compute + ..\..\..\Package\Release\AzureRM.Compute TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj index fc68b44edffa..fc8d047c5b24 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.DataFactories + ..\..\..\Package\Debug\AzureRM.DataFactories DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.DataFactories + ..\..\..\Package\Release\AzureRM.DataFactories TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj index 024cad8dcf12..1485fe9ea4e6 100644 --- a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj +++ b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Dns + ..\..\..\Package\Debug\AzureRM.Dns DEBUG;TRACE prompt 4 @@ -35,7 +35,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Dns\ + ..\..\..\Package\Release\AzureRM.Dns\ TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj index fd46f385941d..3a00fb461a96 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj @@ -18,7 +18,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.HDInsight\ + ..\..\..\Package\Debug\AzureRM.HDInsight\ DEBUG;TRACE prompt 4 @@ -26,7 +26,7 @@ pdbonly true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.HDInsight\ + ..\..\..\Package\Release\AzureRM.HDInsight\ TRACE prompt 4 diff --git a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj index 9b5d4b37a5d9..04b5c05ee15b 100644 --- a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj +++ b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Insights\ + ..\..\..\Package\Debug\AzureRM.Insights\ DEBUG;TRACE prompt 4 @@ -31,7 +31,7 @@ AnyCPU pdbonly true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Insights\ + ..\..\..\Package\Release\AzureRM.Insights\ TRACE prompt 4 diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj index 4552dfe47401..63cd7d4fa6c2 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj +++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.KeyVault + ..\..\..\Package\Debug\AzureRM.KeyVault DEBUG;TRACE prompt 4 @@ -30,7 +30,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.KeyVault + ..\..\..\Package\Release\AzureRM.KeyVault TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj index 8a7f87379979..dddab378d115 100644 --- a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj +++ b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Network\ + ..\..\..\Package\Debug\AzureRM.Network\ DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Network\ + ..\..\..\Package\Release\AzureRM.Network\ TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj index 9a6db5be884f..68d7fa27dc41 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights + ..\..\..\Package\Debug\AzureRM.OperationalInsights DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights + ..\..\..\Package\Release\AzureRM.OperationalInsights TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj index 4f63a3404830..27a158aa22c5 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj +++ b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\ + ..\..\..\Package\Debug\AzureRM.Profile\ DEBUG;TRACE prompt 4 @@ -28,7 +28,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Profile\ + ..\..\..\Package\Release\AzureRM.Profile\ TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj index 126f2cebd7a4..68631150bdc2 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj +++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.RedisCache + ..\..\..\Package\Debug\AzureRM.RedisCache TRACE;DEBUG;CODE_ANALYSIS prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.RedisCache + ..\..\..\Package\Release\AzureRM.RedisCache TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj index fdaf07082d78..48db3c9e9b74 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources\ + ..\..\..\..\Package\Debug\AzureRM.Resources\ DEBUG;TRACE prompt 4 @@ -30,7 +30,7 @@ true MSSharedLibKey.snk true - ..\..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Resources\ + ..\..\..\..\Package\Release\AzureRM.Resources\ TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj index 2846c64eb669..1994369e7aec 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj +++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources + ..\..\..\Package\Debug\AzureRM.Resources DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Resources + ..\..\..\Package\Release\AzureRM.Resources TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj index da4f8b21bc98..6bc486c8c339 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj @@ -18,7 +18,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\ + ..\..\..\Package\Debug\AzureRM.SiteRecovery\ DEBUG;TRACE prompt 4 @@ -26,7 +26,7 @@ pdbonly true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\ + ..\..\..\Package\Release\AzureRM.SiteRecovery\ TRACE prompt 4 diff --git a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj index 59cf8aedc37c..9cb86b50ce61 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj +++ b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Sql + ..\..\..\Package\Debug\AzureRM.Sql DEBUG;TRACE prompt 4 @@ -35,7 +35,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Sql\ + ..\..\..\Package\Release\AzureRM.Sql\ TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj index ea2335b1e7ab..0805f98518cc 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj +++ b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Storage\ + ..\..\..\Package\Debug\AzureRM.Storage\ DEBUG;TRACE prompt 4 @@ -31,7 +31,7 @@ pdbonly TRACE;SIGN true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Storage\ + ..\..\..\Package\Release\AzureRM.Storage\ TRACE bin\Release\Microsoft.Azure.Commands.Management.Storage.dll.CodeAnalysisLog.xml true diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj index 00e020b51410..3a5687587ea9 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics + ..\..\..\Package\Debug\AzureRM.StreamAnalytics DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics + ..\..\..\Package\Release\AzureRM.StreamAnalytics TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj index b01a284e5353..786f2c9359e0 100644 --- a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj +++ b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Tags + ..\..\..\Package\Debug\AzureRM.Tags DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Tags + ..\..\..\Package\Release\AzureRM.Tags TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj index 8946093f641f..438c0bd455d9 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj @@ -61,7 +61,7 @@ False - ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\Microsoft.Azure.Management.TrafficManager.dll + ..\..\..\Package\$(Configuration)\AzureRM.TrafficManager\Microsoft.Azure.Management.TrafficManager.dll False diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj index 2c3807b72bfd..241bdc490b70 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj @@ -21,7 +21,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.TrafficManager + ..\..\..\Package\Debug\AzureRM.TrafficManager DEBUG;TRACE prompt 4 @@ -33,7 +33,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.TrafficManager + ..\..\..\Package\Release\AzureRM.TrafficManager TRACE;SIGN true pdbonly diff --git a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj index 423ad98419a7..1e2203dbb6bb 100644 --- a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj +++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates + ..\..\..\Package\Debug\AzureRM.UsageAggregates DEBUG;TRACE prompt 4 @@ -28,7 +28,7 @@ pdbonly TRACE;SIGN true - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates + ..\..\..\Package\Release\AzureRM.UsageAggregates AnyCPU true true diff --git a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj index 3f52b556c5f9..df5c41a12a9c 100644 --- a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj +++ b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Websites\ + ..\..\..\Package\Debug\AzureRM.Websites\ DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Websites\ + ..\..\..\Package\Release\AzureRM.Websites\ TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj b/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj index 867218adb953..6d9f86a152de 100644 --- a/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj +++ b/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Automation\ + ..\..\..\Package\Debug\Azure\Automation\ DEBUG;TRACE prompt 4 @@ -33,7 +33,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\Automation\ + ..\..\..\Package\Release\Azure\Automation\ TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj index a220ce2f92bc..86054a6c582b 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Compute + ..\..\..\Package\Debug\Azure\Compute DEBUG;TRACE prompt 4 @@ -32,7 +32,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\Compute + ..\..\..\Package\Release\Azure\Compute TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj index e57d8501645a..e23e67dc36f6 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj @@ -21,7 +21,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Compute + ..\..\..\Package\Debug\Azure\Compute DEBUG;TRACE prompt 4 @@ -33,7 +33,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\Compute + ..\..\..\Package\Release\Azure\Compute TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj index acea516881bc..6dad5e90e119 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj @@ -21,7 +21,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Compute + ..\..\..\Package\Debug\Azure\Compute DEBUG;TRACE prompt 4 @@ -34,7 +34,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\Compute + ..\..\..\Package\Release\Azure\Compute TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Compute/Sync/Sync.csproj b/src/ServiceManagement/Compute/Sync/Sync.csproj index c5ba9c047121..76c6e1326fb9 100644 --- a/src/ServiceManagement/Compute/Sync/Sync.csproj +++ b/src/ServiceManagement/Compute/Sync/Sync.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Compute + ..\..\..\Package\Debug\Azure\Compute DEBUG;TRACE prompt 4 @@ -32,7 +32,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\Compute + ..\..\..\Package\Release\Azure\Compute TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj b/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj index f762ce3f01a7..1d3fd5be529d 100644 --- a/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj +++ b/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Compute + ..\..\..\Package\Debug\Azure\Compute DEBUG;TRACE prompt 4 @@ -32,7 +32,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\Compute + ..\..\..\Package\Release\Azure\Compute TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj index fcff395edb39..687ab352e3a4 100644 --- a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj +++ b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj @@ -18,7 +18,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\ExpressRoute\ + ..\..\..\Package\Debug\Azure\ExpressRoute\ DEBUG;TRACE prompt 4 @@ -30,7 +30,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\ExpressRoute\ + ..\..\..\Package\Release\Azure\ExpressRoute\ TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj b/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj index 7a88fdf7b078..74ba8e84bd1f 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\HDInsight + ..\..\..\Package\Debug\Azure\HDInsight DEBUG;TRACE prompt 4 @@ -28,7 +28,7 @@ false - ..\..\..\Package\Release\ServiceManagement\Azure\HDInsight + ..\..\..\Package\Release\Azure\HDInsight TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj index 3f8e74d83140..8ae13d55b6fa 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\ManagedCache + ..\..\..\Package\Debug\Azure\ManagedCache DEBUG;TRACE 4 true @@ -33,7 +33,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ServiceManagement\Azure\ManagedCache + ..\..\..\Package\Release\Azure\ManagedCache TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj index 296d8536e233..149077acc4bd 100644 --- a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj +++ b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Networking\ + ..\..\..\Package\Debug\Azure\Networking\ DEBUG;TRACE 4 true @@ -33,7 +33,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ServiceManagement\Azure\Networking\ + ..\..\..\Package\Release\Azure\Networking\ TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj b/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj index f096bd79dc7f..58ddbd340c53 100644 --- a/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj +++ b/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Services + ..\..\..\Package\Debug\Azure\Services DEBUG;TRACE prompt 4 @@ -28,7 +28,7 @@ false - ..\..\..\Package\Release\ServiceManagement\Azure\Services + ..\..\..\Package\Release\Azure\Services TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj index 504ca9a9c4d5..3136a7735853 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj @@ -21,7 +21,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\RecoveryServices\ + ..\..\..\Package\Debug\Azure\RecoveryServices\ DEBUG;TRACE prompt 4 @@ -34,7 +34,7 @@ false - ..\..\..\Package\Release\ServiceManagement\Azure\RecoveryServices + ..\..\..\Package\Release\Azure\RecoveryServices TRACE;SIGN;CODE_ANALYSIS true pdbonly diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj index 83f0d383e3a0..7c18119aa92a 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj @@ -6,7 +6,7 @@ AnyCPU {492D2AF2-950B-4F2E-8079-8794305313FD} Library - ..\..\..\Package\$(Configuration)\ServiceManagement\Azure\RemoteApp\ + ..\..\..\Package\$(Configuration)\Azure\RemoteApp\ Properties Microsoft.WindowsAzure.Commands.RemoteApp Microsoft.WindowsAzure.Commands.RemoteApp diff --git a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj index 6d387def6be5..7862a289df90 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Services + ..\..\..\Package\Debug\Azure\Services DEBUG;TRACE prompt 4 @@ -29,7 +29,7 @@ false - ..\..\..\Package\Release\ServiceManagement\Azure\Services + ..\..\..\Package\Release\Azure\Services TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj index 04541d37caa5..ef6406b64c7e 100644 --- a/src/ServiceManagement/Services/Commands/Commands.csproj +++ b/src/ServiceManagement/Services/Commands/Commands.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Services + ..\..\..\Package\Debug\Azure\Services DEBUG;TRACE prompt 4 @@ -31,7 +31,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\Services + ..\..\..\Package\Release\Azure\Services TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj index af4205458b2d..0031fda0e8a4 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Sql + ..\..\..\Package\Debug\Azure\Sql DEBUG;TRACE prompt 4 @@ -35,7 +35,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ServiceManagement\Azure\Sql + ..\..\..\Package\Release\Azure\Sql TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj b/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj index 56d58ef8be92..4c2a210a57bf 100644 --- a/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj +++ b/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\StorSimple\ + ..\..\..\Package\Debug\Azure\StorSimple\ DEBUG;TRACE prompt 4 @@ -30,7 +30,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Package\Release\ServiceManagement\Azure\StorSimple\ + ..\..\..\Package\Release\Azure\StorSimple\ TRACE;SIGN true pdbonly diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj index 5a55dcd86676..5495b48242fe 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\TrafficManager + ..\..\..\Package\Debug\Azure\TrafficManager DEBUG;TRACE prompt 4 @@ -33,7 +33,7 @@ OnBuildSuccess - ..\..\..\Package\Release\ServiceManagement\Azure\TrafficManager + ..\..\..\Package\Release\Azure\TrafficManager TRACE;SIGN true pdbonly From 66c326ef16aaabcac39db3033ffebeda4680ddb1 Mon Sep 17 00:00:00 2001 From: ogail Date: Tue, 27 Oct 2015 07:14:24 -0700 Subject: [PATCH 08/10] Fix output paths --- .../Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 | 2 +- src/Local.testsettings | 2 +- src/Local.x64.testsettings | 2 +- ...ure.Commands.ApiManagement.ServiceManagement.dll-help.psd1 | 2 +- .../Microsoft.Azure.Commands.ApiManagement.dll-help.psd1 | 2 +- .../Microsoft.Azure.Commands.AzureBackup.dll-help.psd1 | 2 +- .../Commands.Dns/Microsoft.Azure.Commands.Dns.dll-help.psd1 | 2 +- ...Microsoft.Azure.Commands.OperationalInsights.dll-Help.psd1 | 4 ++-- .../Microsoft.Azure.Commands.Profile.dll-Help.psd1 | 2 +- .../Microsoft.Azure.Commands.Resources.dll-Help.psd1 | 2 +- .../Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.psd1 | 2 +- .../Microsoft.Azure.Commands.StreamAnalytics.dll-Help.psd1 | 4 ++-- .../Commands.Tags/Microsoft.Azure.Commands.Tags.dll-help.psd1 | 2 +- .../Microsoft.Azure.Commands.TrafficManager.dll-help.psd1 | 2 +- .../Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1 | 2 +- .../Microsoft.Azure.Commands.Websites.dll-Help.psd1 | 2 +- .../Microsoft.Azure.Commands.Automation.dll-help.psd1 | 2 +- .../Common/Commands.ScenarioTest/WAPackIaaS/CmdletTestBase.cs | 2 +- ...ds.ServiceManagement.PlatformImageRepository.dll-Help.psd1 | 2 +- .../AzureVMMicrosoftAntimalwareExtensionFunctionalTests.ps1 | 2 +- ...soft.WindowsAzure.Commands.ServiceManagement.dll-Help.psd1 | 2 +- ...Microsoft.WindowsAzure.Commands.ExpressRoute.dll-help.psd1 | 2 +- .../Microsoft.WindowsAzure.Commands.HDInsight.dll-Help.psd1 | 2 +- .../Microsoft.Azure.Commands.ManagedCache.dll-help.psd1 | 2 +- .../Microsoft.WindowsAzure.Commands.Profile.dll-Help.psd1 | 2 +- .../Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.psd1 | 2 +- .../Microsoft.WindowsAzure.Commands.StorSimple.dll-help.psd1 | 2 +- ...crosoft.WindowsAzure.Commands.TrafficManager.dll-help.psd1 | 2 +- tools/AzureRM/AzureRM.psm1 | 2 +- tools/Docs/Get-AllCommands/Get-AllCommands.ps1 | 4 ++-- tools/Installer/generate.ps1 | 4 ++-- tools/PublishModules.ps1 | 4 ++-- tools/VerifyAzureSDK.ps1 | 2 +- 33 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 b/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 index 19c0010da379..a00f70ad29c2 100644 --- a/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 +++ b/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\Storage\Microsoft.WindowsAzure.Commands.Storage.dll' +NestedModules = '..\..\..\Package\Debug\Azure\Storage\Microsoft.WindowsAzure.Commands.Storage.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/Local.testsettings b/src/Local.testsettings index 119f7b79b1d8..a01c6687baf0 100644 --- a/src/Local.testsettings +++ b/src/Local.testsettings @@ -9,7 +9,7 @@ - + diff --git a/src/Local.x64.testsettings b/src/Local.x64.testsettings index e603d01a4369..f53ecb6b5711 100644 --- a/src/Local.x64.testsettings +++ b/src/Local.x64.testsettings @@ -4,7 +4,7 @@ - + diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.psd1 b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.psd1 index 1ebd2d8198ef..d6bc3e41fbac 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.psd1 +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll' +NestedModules = '..\..\..\Package\Debug\ApiManagement\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.psd1 b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.psd1 index 0b716c4ee335..a2ce5852f99f 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.psd1 +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll' +NestedModules = '..\..\..\Package\Debug\ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.dll-help.psd1 b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.dll-help.psd1 index 0a5fbe79cd1d..a03e61694e86 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.dll-help.psd1 +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.dll-help.psd1 @@ -61,7 +61,7 @@ FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureBackup\Microsoft.Azure.Commands.AzureBackup.dll' + '..\..\..\Package\Debug\AzureBackup\Microsoft.Azure.Commands.AzureBackup.dll' ) # Functions to export from this module diff --git a/src/ResourceManager/Dns/Commands.Dns/Microsoft.Azure.Commands.Dns.dll-help.psd1 b/src/ResourceManager/Dns/Commands.Dns/Microsoft.Azure.Commands.Dns.dll-help.psd1 index aff7c38b0600..85dd98b8a84a 100644 --- a/src/ResourceManager/Dns/Commands.Dns/Microsoft.Azure.Commands.Dns.dll-help.psd1 +++ b/src/ResourceManager/Dns/Commands.Dns/Microsoft.Azure.Commands.Dns.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Dns\Microsoft.Azure.Commands.Dns.dll' +NestedModules = '..\..\..\Package\Debug\Dns\Microsoft.Azure.Commands.Dns.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.psd1 b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.psd1 index 85f9ece171f4..ed3ef815b53d 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.psd1 +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.psd1 @@ -55,12 +55,12 @@ ScriptsToProcess = @() # Format files (.ps1xml) to be loaded when importing this module FormatsToProcess = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.format.ps1xml' + '..\..\..\Package\Debug\OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.format.ps1xml' ) # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.dll' + '..\..\..\Package\Debug\OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.dll' ) # Functions to export from this module diff --git a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.psd1 b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.psd1 index 0e82e959e647..1177a381ee91 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.psd1 +++ b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\Package\Debug\ServiceManagement\Azure\Services\Microsoft.WindowsAzure.Commands.Profile.dll' +NestedModules = '..\..\Package\Debug\Azure\Services\Microsoft.WindowsAzure.Commands.Profile.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.psd1 b/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.psd1 index d04c0be16ceb..0a86b4d06be6 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.psd1 +++ b/src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.psd1 @@ -61,7 +61,7 @@ FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Commands.Resources.dll' + '..\..\..\Package\Debug\AzureRM.Resources\Microsoft.Azure.Commands.Resources.dll' ) # Functions to export from this module diff --git a/src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.psd1 b/src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.psd1 index f8b93185e710..35d615d15569 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.psd1 +++ b/src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.psd1 @@ -61,7 +61,7 @@ FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Sql\Microsoft.Azure.Commands.Sql.dll' + '..\..\..\Package\Debug\AzureRM.Sql\Microsoft.Azure.Commands.Sql.dll' ) # Functions to export from this module diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Microsoft.Azure.Commands.StreamAnalytics.dll-Help.psd1 b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Microsoft.Azure.Commands.StreamAnalytics.dll-Help.psd1 index a4950b85b098..68c3c14ac5d4 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Microsoft.Azure.Commands.StreamAnalytics.dll-Help.psd1 +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Microsoft.Azure.Commands.StreamAnalytics.dll-Help.psd1 @@ -55,12 +55,12 @@ ScriptsToProcess = @() # Format files (.ps1xml) to be loaded when importing this module FormatsToProcess = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml' + '..\..\..\Package\Debug\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml' ) # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll' + '..\..\..\Package\Debug\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll' ) # Functions to export from this module diff --git a/src/ResourceManager/Tags/Commands.Tags/Microsoft.Azure.Commands.Tags.dll-help.psd1 b/src/ResourceManager/Tags/Commands.Tags/Microsoft.Azure.Commands.Tags.dll-help.psd1 index 71043eb83311..aa1c517bc18f 100644 --- a/src/ResourceManager/Tags/Commands.Tags/Microsoft.Azure.Commands.Tags.dll-help.psd1 +++ b/src/ResourceManager/Tags/Commands.Tags/Microsoft.Azure.Commands.Tags.dll-help.psd1 @@ -61,7 +61,7 @@ FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Tags\Microsoft.Azure.Commands.Tags.dll' + '..\..\..\Package\Debug\Tags\Microsoft.Azure.Commands.Tags.dll' ) # Functions to export from this module diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Microsoft.Azure.Commands.TrafficManager.dll-help.psd1 b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Microsoft.Azure.Commands.TrafficManager.dll-help.psd1 index 468f29e6f2ce..774a149ba687 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Microsoft.Azure.Commands.TrafficManager.dll-help.psd1 +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Microsoft.Azure.Commands.TrafficManager.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Commands.TrafficManager.dll' +NestedModules = '..\..\..\Package\Debug\TrafficManager\Microsoft.Azure.Commands.TrafficManager.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1 b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1 index 37af85403660..2440f7816b3a 100644 --- a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1 +++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll' +NestedModules = '..\..\..\Package\Debug\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ResourceManager/Websites/Commands.Websites/Microsoft.Azure.Commands.Websites.dll-Help.psd1 b/src/ResourceManager/Websites/Commands.Websites/Microsoft.Azure.Commands.Websites.dll-Help.psd1 index 77cb14b1eaad..ffdbf31cedc0 100644 --- a/src/ResourceManager/Websites/Commands.Websites/Microsoft.Azure.Commands.Websites.dll-Help.psd1 +++ b/src/ResourceManager/Websites/Commands.Websites/Microsoft.Azure.Commands.Websites.dll-Help.psd1 @@ -61,7 +61,7 @@ FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Websites\Microsoft.Azure.Commands.Websites.dll' + '..\..\..\Package\Debug\Websites\Microsoft.Azure.Commands.Websites.dll' ) # Functions to export from this module diff --git a/src/ServiceManagement/Automation/Commands.Automation/Microsoft.Azure.Commands.Automation.dll-help.psd1 b/src/ServiceManagement/Automation/Commands.Automation/Microsoft.Azure.Commands.Automation.dll-help.psd1 index 9bcf63596c99..7d4e220a363a 100644 --- a/src/ServiceManagement/Automation/Commands.Automation/Microsoft.Azure.Commands.Automation.dll-help.psd1 +++ b/src/ServiceManagement/Automation/Commands.Automation/Microsoft.Azure.Commands.Automation.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\Automation\Microsoft.Azure.Commands.Automation.dll' +NestedModules = '..\..\..\Package\Debug\Azure\Automation\Microsoft.Azure.Commands.Automation.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/WAPackIaaS/CmdletTestBase.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/WAPackIaaS/CmdletTestBase.cs index 326c4032f61f..f4a42817e605 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/WAPackIaaS/CmdletTestBase.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/WAPackIaaS/CmdletTestBase.cs @@ -73,7 +73,7 @@ private static System.Management.Automation.PowerShell CreatePipeline() private void InitializeWAPackConfiguration() { string directoryPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - var path = Path.GetFullPath(Path.Combine(directoryPath, "..\\..\\..\\Package\\Debug\\ServiceManagement\\Azure\\Azure.psd1")); + var path = Path.GetFullPath(Path.Combine(directoryPath, "..\\..\\..\\Package\\Debug\\Azure\\Azure.psd1")); this.PowerShell.Commands.Clear(); this.PowerShell.AddCommand("Import-Module").AddArgument(path).InvokeAndAssertForNoErrors(); diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll-Help.psd1 b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll-Help.psd1 index 02cd21741262..f46dfecff58c 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll-Help.psd1 +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll-Help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll' +NestedModules = '..\..\..\Package\Debug\Azure\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/MicrosoftAntimalware/AzureVMMicrosoftAntimalwareExtensionFunctionalTests.ps1 b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/MicrosoftAntimalware/AzureVMMicrosoftAntimalwareExtensionFunctionalTests.ps1 index 1f3cd2b614ce..3d242d3f9064 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/MicrosoftAntimalware/AzureVMMicrosoftAntimalwareExtensionFunctionalTests.ps1 +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/MicrosoftAntimalware/AzureVMMicrosoftAntimalwareExtensionFunctionalTests.ps1 @@ -5,7 +5,7 @@ $service_name = "" $storage_account_name = "" $path_to_xml_config = "" -Import-Module 'C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\ServiceManagement\Azure\Azure.psd1' +Import-Module 'C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\Azure\Azure.psd1' #help - should see get/remove/set help *vm*antimalware* diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.psd1 b/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.psd1 index e7af7051e410..a00bbfe74ab6 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.psd1 +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.dll' +NestedModules = '..\..\..\Package\Debug\Azure\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Microsoft.WindowsAzure.Commands.ExpressRoute.dll-help.psd1 b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Microsoft.WindowsAzure.Commands.ExpressRoute.dll-help.psd1 index 29d5a1f362ae..6bb3a25fe38b 100644 --- a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Microsoft.WindowsAzure.Commands.ExpressRoute.dll-help.psd1 +++ b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Microsoft.WindowsAzure.Commands.ExpressRoute.dll-help.psd1 @@ -9,7 +9,7 @@ @{ # Script module or binary module file associated with this manifest -ModuleToProcess = '..\..\..\Package\Debug\ServiceManagement\Azure\ExpressRoute\Microsoft.WindowsAzure.Commands.ExpressRoute.dll' +ModuleToProcess = '..\..\..\Package\Debug\Azure\ExpressRoute\Microsoft.WindowsAzure.Commands.ExpressRoute.dll' # Version number of this module. ModuleVersion = '0.9.10' diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Microsoft.WindowsAzure.Commands.HDInsight.dll-Help.psd1 b/src/ServiceManagement/HDInsight/Commands.HDInsight/Microsoft.WindowsAzure.Commands.HDInsight.dll-Help.psd1 index 9e63ca361531..3c51cdd5a72a 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Microsoft.WindowsAzure.Commands.HDInsight.dll-Help.psd1 +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Microsoft.WindowsAzure.Commands.HDInsight.dll-Help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\HDInsight\Microsoft.WindowsAzure.Commands.HDInsight.dll' +NestedModules = '..\..\..\Package\Debug\Azure\HDInsight\Microsoft.WindowsAzure.Commands.HDInsight.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Microsoft.Azure.Commands.ManagedCache.dll-help.psd1 b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Microsoft.Azure.Commands.ManagedCache.dll-help.psd1 index 3aafca768a00..c71262705419 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Microsoft.Azure.Commands.ManagedCache.dll-help.psd1 +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Microsoft.Azure.Commands.ManagedCache.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.Commands.ManagedCache.dll' +NestedModules = '..\..\..\Package\Debug\Azure\ManagedCache\Microsoft.Azure.Commands.ManagedCache.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.psd1 b/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.psd1 index 0e82e959e647..1177a381ee91 100644 --- a/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.psd1 +++ b/src/ServiceManagement/Profile/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\Package\Debug\ServiceManagement\Azure\Services\Microsoft.WindowsAzure.Commands.Profile.dll' +NestedModules = '..\..\Package\Debug\Azure\Services\Microsoft.WindowsAzure.Commands.Profile.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.psd1 b/src/ServiceManagement/Sql/Commands.SqlDatabase/Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.psd1 index df4b2f8ce47d..a040cc009bf2 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.psd1 +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.dll' +NestedModules = '..\..\..\Package\Debug\Azure\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.dll-help.psd1 b/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.dll-help.psd1 index 69af13d1a088..18dd338640dd 100644 --- a/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.dll-help.psd1 +++ b/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.dll-help.psd1 @@ -61,7 +61,7 @@ FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess NestedModules = @( - '..\..\..\Package\Debug\ServiceManagement\Azure\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.dll' + '..\..\..\Package\Debug\Azure\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.dll' ) # Functions to export from this module diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Microsoft.WindowsAzure.Commands.TrafficManager.dll-help.psd1 b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Microsoft.WindowsAzure.Commands.TrafficManager.dll-help.psd1 index de022ae50496..57d9cfab92cf 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Microsoft.WindowsAzure.Commands.TrafficManager.dll-help.psd1 +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Microsoft.WindowsAzure.Commands.TrafficManager.dll-help.psd1 @@ -60,7 +60,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '..\..\..\Package\Debug\ServiceManagement\Azure\TrafficManager\Microsoft.WindowsAzure.Commands.TrafficManager.dll' +NestedModules = '..\..\..\Package\Debug\Azure\TrafficManager\Microsoft.WindowsAzure.Commands.TrafficManager.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/tools/AzureRM/AzureRM.psm1 b/tools/AzureRM/AzureRM.psm1 index ee2ebdaaedde..f285b35059e1 100644 --- a/tools/AzureRM/AzureRM.psm1 +++ b/tools/AzureRM/AzureRM.psm1 @@ -47,7 +47,7 @@ function CheckIncompatibleVersion([bool]$Force) $path = ${env:ProgramFiles} } - if ( Test-Path "$path\Microsoft SDKs\Azure\PowerShell\ResourceManager\AzureResourceManager\AzureResourceManager.psd1") + if ( Test-Path "$path\Microsoft SDKs\Azure\PowerShell\AzureResourceManager.psd1") { if ($Force) { diff --git a/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 b/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 index 357d1897dd01..5abf77c27cdf 100644 --- a/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 +++ b/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 @@ -388,7 +388,7 @@ function Get-AllBuildServerCommands { #TestValues #$OutputPath = ".\Output"; - #$ManifestFullName = "C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\ResourceManager\AzureResourceManager\AzureResourceManager.psd1" + #$ManifestFullName = "C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\AzureResourceManager.psd1" #Clean Output Path Trailing \ if exists if($OutputPath.Substring(($OutputPath.Length - 1),1) -eq '\') @@ -690,7 +690,7 @@ function Get-AllBuildServerCommands { rm .\Output -Recurse -Force -ErrorAction SilentlyContinue #Comment these lines to selectivly build the output for either Service Management or Resource Manager -Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName "..\..\..\src\Package\Release\ServiceManagement\Azure\Azure.psd1" +Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName "..\..\..\src\Package\Release\Azure\Azure.psd1" Get-AllBuildServerCommands -OutputPath ".\Output" -ManifestFullName "..\..\AzureRM\AzureRM.psd1" $modules = (Get-ChildItem "..\..\..\src\Package\Release\ResourceManager" -Recurse -Include "*.psd1" -Exclude "*dll-help.psd1", "AzureResourceManager.psd1") | sort -Unique -Property Name diff --git a/tools/Installer/generate.ps1 b/tools/Installer/generate.ps1 index 5dbef9b74f4e..23c6a57936df 100644 --- a/tools/Installer/generate.ps1 +++ b/tools/Installer/generate.ps1 @@ -24,8 +24,8 @@ Write-Verbose "Build configuration is set to $buildConfig" $output = Join-Path $env:AzurePSRoot "src\Package\$buildConfig" Write-Verbose "The output folder is set to $output" -$serviceManagementPath = Join-Path $output "ServiceManagement\Azure" -$resourceManagerPath = Join-Path $output "ResourceManager\AzureResourceManager" +$serviceManagementPath = Join-Path $output "Azure" +$resourceManagerPath = $output Write-Verbose "Removing unneeded psd1 file for AzureResourceManager" Remove-Item -Force $resourceManagerPath\AzureResourceManager.psd1 -ErrorAction SilentlyContinue diff --git a/tools/PublishModules.ps1 b/tools/PublishModules.ps1 index 01517bc13f82..95461571a99d 100644 --- a/tools/PublishModules.ps1 +++ b/tools/PublishModules.ps1 @@ -63,14 +63,14 @@ if (($scope -eq 'All') -or $publishToLocal ) { } if (($scope -eq 'All') -or ($scope -eq 'ServiceManagement')) { - $modulePath = "$packageFolder\$buildConfig\ServiceManagement\Azure" + $modulePath = "$packageFolder\$buildConfig\Azure" # Publish Azure module Write-Host "Publishing ServiceManagement(aka Azure) module from $modulePath" Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName -Tags ("Azure") -LicenseUri "http://aka.ms/azps-license" } if (($scope -eq 'All') -or ($scope -eq 'AzureStorage')) { - $modulePath = "$packageFolder\$buildConfig\ServiceManagement\Azure\Azure.Storage" + $modulePath = "$packageFolder\$buildConfig\Azure\Azure.Storage" # Publish AzureStorage module Write-Host "Publishing AzureStorage module from $modulePath" Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName -Tags ("Azure") -LicenseUri "http://aka.ms/azps-license" diff --git a/tools/VerifyAzureSDK.ps1 b/tools/VerifyAzureSDK.ps1 index 6c4cf9bcf351..d04e792598f5 100644 --- a/tools/VerifyAzureSDK.ps1 +++ b/tools/VerifyAzureSDK.ps1 @@ -1,7 +1,7 @@ $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent . ($scriptFolder + '.\SetupEnv.ps1') -Import-Module "$env:AzurePSRoot\src\Package\Debug\ServiceManagement\azure\Azure.psd1" +Import-Module "$env:AzurePSRoot\src\Package\Debug\Azure\Azure.psd1" Write-Host "***Please read. this script requires the following product***" -ForegroundColor "Red" Write-Host "**Node.js for Windows (32-bits) at http://nodejs.org/download/ and Azure Node.js for Windows at http://azure.microsoft.com/en-us/downloads/" -ForegroundColor "Red" From b1d19f4f5370af96edb2c160457f4d84259ecd22 Mon Sep 17 00:00:00 2001 From: ogail Date: Tue, 27 Oct 2015 07:34:17 -0700 Subject: [PATCH 09/10] Fix Azure.Storage output path --- src/Common/Storage/Commands.Storage/Commands.Storage.csproj | 6 +++--- tools/PublishModules.ps1 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj b/src/Common/Storage/Commands.Storage/Commands.Storage.csproj index 1d81fb74af40..7e233b85c540 100644 --- a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj +++ b/src/Common/Storage/Commands.Storage/Commands.Storage.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\Azure\Azure.Storage + ..\..\..\Package\Debug\Azure.Storage DEBUG;TRACE prompt 4 @@ -32,7 +32,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\Azure\Azure.Storage + ..\..\..\Package\Release\Azure.Storage TRACE;SIGN true pdbonly @@ -317,6 +317,6 @@ - powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "..\..\..\ResourceManager\AzureResourceManager" + powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "..\..\..\Package\$(ConfigurationName)\Azure\Azure.Storage" \ No newline at end of file diff --git a/tools/PublishModules.ps1 b/tools/PublishModules.ps1 index 95461571a99d..9e6e1ee4f43a 100644 --- a/tools/PublishModules.ps1 +++ b/tools/PublishModules.ps1 @@ -70,7 +70,7 @@ if (($scope -eq 'All') -or ($scope -eq 'ServiceManagement')) { } if (($scope -eq 'All') -or ($scope -eq 'AzureStorage')) { - $modulePath = "$packageFolder\$buildConfig\Azure\Azure.Storage" + $modulePath = "$packageFolder\$buildConfig\Azure.Storage" # Publish AzureStorage module Write-Host "Publishing AzureStorage module from $modulePath" Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName -Tags ("Azure") -LicenseUri "http://aka.ms/azps-license" From 236cbb52fa11b7d59fe146c06f4b2f862761b1fc Mon Sep 17 00:00:00 2001 From: ogail Date: Thu, 29 Oct 2015 11:39:24 -0700 Subject: [PATCH 10/10] Fix doc gen paths --- .../Docs/Get-AllCommands/Get-AllCommands.ps1 | 1328 ++++++++--------- 1 file changed, 664 insertions(+), 664 deletions(-) diff --git a/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 b/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 index 5abf77c27cdf..6bb677b7deb2 100644 --- a/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 +++ b/tools/Docs/Get-AllCommands/Get-AllCommands.ps1 @@ -14,676 +14,676 @@ function Test-BuildMamlFolder { - Param - ( - [CmdletBinding()] - [parameter(Mandatory=$true)] - [String] - $MamlFolderPath, - [parameter(Mandatory=$true)] - [String] - $ModuleName, - [parameter(Mandatory=$false)] - [string[]] - $MissingCommands - ) - - #$MamlFolderPath = "\\srvua\PSPush2x\Main\DXPowerShellBlue\AGPM_Cmdlets\PSMAML\" - $MamlFileNames = (Get-ChildItem -Path $MamlFolderPath | WHERE { $_.Name -like "*.xml"}).Name - - $CmdletCount = 0 - $ParmCount = 0 - $ShortDescCount = 0 - $LongDescCount = 0 - $HelpExCount = 0 - $InputObjectDesccount = 0 - $OutputObjectDesccount = 0 - $MissingContent = 0 - - $jsonObject = New-Object -TypeName psobject - $jsonObject | Add-Member -MemberType NoteProperty -Name "ModuleHelpFound" -Value "true" - - $OutArray = @() - if($MissingCommands) - { - $array = $MissingCommands.Split(',') - $missingCommandsJsonObject = New-Object -TypeName psobject - - foreach($missingCommand in $array) - { - $missingCommandsJsonObject | Add-Member -MemberType NoteProperty -Name $missingCommand -Value 0 -Force - } - - $jsonObject | Add-Member -MemberType NoteProperty -Name "MissingCommands" -Value $missingCommandsJsonObject -Force - } - - foreach ($MamlFile in $MamlFileNames) - { - - $internalJsonObject = New-Object -TypeName psobject - - $FullName = $MamlFolderPath + $MamlFile - - [xml]$MamlXml = Get-Content $FullName - - $CmdletCount += 1 - $WarnCount = 0 - - $CmdletName = $MamlXml.command.details.name - $CmdletName = $CmdletName.Trim() - - - # Short Description - # Updated for PS MAML Files - - $ShortDescription = $MamlXml.command.details.description.para - - if ($ShortDescription.Length -gt 10 -and $ShortDescription) - { - $ShortDescCount += 1 - } - else - { - if (!$NoWarnings) - { - $OutArray += "No short description for $CmdletName." - $WarnCount += 1 - $internalJsonObject | Add-Member -MemberType NoteProperty -Name 'ShortDescription' -value 1 -Force - - } - } - - # Long Description - # Updated for PS MAML Files - - $LongDescription = $MamlXml.command.description.para - if ($LongDescription.Length -gt 10 -and $LongDescription) - { - $LongDescCount += 1 - } - else - { - if (!$NoWarnings) - { - $OutArray += "No long description for $CmdletName." - $WarnCount += 1 - $internalJsonObject | Add-Member -MemberType NoteProperty -Name 'LongDescription' -value 1 -Force - } - } - - # PS MAML Examples Count Check - #Updated for PS MAML Files - - $MamlExamples = $MamlXml.command.examples.example - - if($MamlExamples) - { - $ExNumber = 0 - ForEach($Example in $MamlExamples) - { - $ExCount += 1 - $ExNumber += 1 - $ExampleNumber = "Example" + $ExNumber - - if(!$Example.title) - { - $OutArray += "No example title found for an example in $CmdletName." - $internalJsonObject | Add-Member -MemberType NoteProperty -Name ($ExampleNumber + "_Title") -value 1 -Force - } - if(!$Example.introduction.para) - { - $OutArray += "No example introduction found for an example in $CmdletName." - $internalJsonObject | Add-Member -MemberType NoteProperty -Name ($ExampleNumber + "_Introduction") -value 3 -Force - } - if(!$Example.code) - { - $OutArray += "No example code found for an example in $CmdletName." - $internalJsonObject | Add-Member -MemberType NoteProperty -Name ($ExampleNumber + "_Code") -value 1 -Force - } - } - } - else - { - $OutArray += "No examples found for $CmdletName." - $internalJsonObject | Add-Member -MemberType NoteProperty -Name "Examples" -value 0 -Force - } - - #Cmdlet Input Object Description - #Updated for PS MAML Files - $InputObjects = $MamlXml.command.inputTypes.inputType - - if($InputObjects) - { - foreach($InputObj in $InputObjects) - { - $inputObjName = $InputObj.type.name - if ($inputObj.description.para.innertext) - { - $InputObjectDesccount += 1 - } - else - { - if (!$NoWarnings) - { - $OutArray += "No input object description for $inputObjName in $CmdletName" - $internalJsonObject | Add-Member -MemberType NoteProperty -Name "InputObject" -value 1 -Force - $WarnCount += 1 - } - } - } - } - - - #PS MAML Output Object Description - #Updated for PS MAML Files - - $OutPutObjects = $MamlXml.command.returnValues.returnValue - if($OutPutObjects) - { - foreach($outputObj in $OutPutObjects) - { - $outputObjName = $outputObj.type.name - if ($outputObj.description.para.innertext) - { - $OutputObjectDesccount += 1 - } - else - { - if (!$NoWarnings) - { - $OutArray += "No output object description for $outputObjName in $CmdletName" - $WarnCount += 1 - $internalJsonObject | Add-Member -MemberType NoteProperty -Name "OutputObject" -value 1 -Force - } - } - } - } - - # Parameter Descriptions - #Updated for PS MAML Files - $Parameters = $MamlXml.command.parameters.parameter - - foreach ($parm in $Parameters) - { - $ParmCount += 1 - $ParmName = $parm.Name - if ($parm.Description) - { - $ParmDescCount += 1 - } - else - { - if (!$NoWarnings) - { - $OutArray += "No parameter description for $CmdletName -$ParmName." - $WarnCount += 1 - $internalJsonObject | Add-Member -MemberType NoteProperty -Name "Parameter_$ParmName" -value 1 -Force - } - } - } - - #Evaluates Missing Elements - - if ($WarnCount -ne 0) - { - $MissingContent +=1 - $jsonObject | Add-Member -MemberType NoteProperty -Value $internalJsonObject -Name $CmdletName -Force - } - } - - if($MissingContent -gt 0) - { - $OutFileName = ($MamlFolderPath + " \..\..\..\" + $ModuleName + "_Report_MISSING_CONTENT.txt") - } - else - { - $OutFileName = ($MamlFolderPath + " \..\..\..\" + $ModuleName + "_Report.txt") - } - - #Computation of Percentage Complete - $fShortDescPercent = "{0:P1}" -f ($ShortDescCount/$CmdletCount) - $fLongDescPercent = "{0:P1}" -f ($LongDescCount/$CmdletCount) - $fExPercent = "{0:P1}" -f ($ExCount/$CmdletCount) - $fParmDescPercent = "{0:P1}" -f ($ParmDescCount/$ParmCount) - $fMissingContentPercent = "{0:P1}" -f ($MissingContent/$CmdletCount) - $fInputObject = "{0:P1}" -f ($InputObjectDesccount/$CmdletCount) - $fOutputObjectDesc = "{0:P1}" -f ($OutputObjectDesccount/$CmdletCount) - - ###Report Output into PowerShell Host - #Header Message - $OutArray += "`nReport Summary" - $OutArray += "--------------" - $OutArray += "Folder Path: $MamlFolderPath" - $OutArray += "Commands: $CmdletCount" - $OutArray += "Parameters: $ParmCount" - - #Short Desc Message - $ShortDescMessage = "Short Descriptions: $ShortDescCount ( $fShortDescPercent )" - if($fShortDescPercent -eq '100.0 %') - { - $OutArray += $ShortDescMessage - } - else - { - $OutArray += $ShortDescMessage - } - - #Long Desc Message - $LongDescMessage = "Long Descriptions: $LongDescCount ( $fLongDescPercent )" - if($fLongDescPercent -eq '100.0 %') - { - $OutArray += "Long Descriptions: $LongDescCount ( $fLongDescPercent )" - } - else - { - $OutArray += $LongDescMessage - } - - #Example Message - $ExamplesMessage = "Examples: $ExCount ( $fExPercent )" - if($fExPercent -eq '100.0 %') - { - $OutArray += $ExamplesMessage - } - else - { - $OutArray += $ExamplesMessage - } - $OutArray += " Minimum Required: $CmdletCount" - - #Input Object Message - $InputObjectMessage = "Input Objects: $InputObjectDesccount ( $fInputObject )" - if($fInputObject -eq '100.0 %') - { - $OutArray += $InputObjectMessage - } - else - { - $OutArray += $InputObjectMessage - } - - #Output Object Message - $OutputObjectMessage = "Output Object: $OutputObjectDesccount ( $fOutputObjectDesc )" - if($fOutputObjectDesc -eq '100.0 %') - { - $OutArray += $OutputObjectMessage - } - else - { - $OutArray += $OutputObjectMessage - } - - #Parameter Messaage - $ParameterMessage = "Parameter Descriptions: $ParmDescCount ( $fParmDescPercent )" - if($fParmDescPercent -eq '100.0 %') - { - $OutArray += $ParameterMessage - } - else - { - $OutArray += $ParameterMessage - } - - #Error & Closing Message - $OutArray += "Number of cmdlets missing content: $MissingContent ( $fMissingContentPercent )" - $OutArray += "--------------" - $OutArray | Out-File -FilePath $OutFileName - - if(($MissingCommands.Count -gt 0) -or ($MissingContent -gt 0)) - { - $OutFileName = ($MamlFolderPath + " \..\..\..\" + $ModuleName + ".json") - $jsonObject | ConvertTo-Json -Depth 10 | Out-file $OutFileName - } + Param + ( + [CmdletBinding()] + [parameter(Mandatory=$true)] + [String] + $MamlFolderPath, + [parameter(Mandatory=$true)] + [String] + $ModuleName, + [parameter(Mandatory=$false)] + [string[]] + $MissingCommands + ) + + #$MamlFolderPath = "\\srvua\PSPush2x\Main\DXPowerShellBlue\AGPM_Cmdlets\PSMAML\" + $MamlFileNames = (Get-ChildItem -Path $MamlFolderPath | WHERE { $_.Name -like "*.xml"}).Name + + $CmdletCount = 0 + $ParmCount = 0 + $ShortDescCount = 0 + $LongDescCount = 0 + $HelpExCount = 0 + $InputObjectDesccount = 0 + $OutputObjectDesccount = 0 + $MissingContent = 0 + + $jsonObject = New-Object -TypeName psobject + $jsonObject | Add-Member -MemberType NoteProperty -Name "ModuleHelpFound" -Value "true" + + $OutArray = @() + if($MissingCommands) + { + $array = $MissingCommands.Split(',') + $missingCommandsJsonObject = New-Object -TypeName psobject + + foreach($missingCommand in $array) + { + $missingCommandsJsonObject | Add-Member -MemberType NoteProperty -Name $missingCommand -Value 0 -Force + } + + $jsonObject | Add-Member -MemberType NoteProperty -Name "MissingCommands" -Value $missingCommandsJsonObject -Force + } + + foreach ($MamlFile in $MamlFileNames) + { + + $internalJsonObject = New-Object -TypeName psobject + + $FullName = $MamlFolderPath + $MamlFile + + [xml]$MamlXml = Get-Content $FullName + + $CmdletCount += 1 + $WarnCount = 0 + + $CmdletName = $MamlXml.command.details.name + $CmdletName = $CmdletName.Trim() + + + # Short Description + # Updated for PS MAML Files + + $ShortDescription = $MamlXml.command.details.description.para + + if ($ShortDescription.Length -gt 10 -and $ShortDescription) + { + $ShortDescCount += 1 + } + else + { + if (!$NoWarnings) + { + $OutArray += "No short description for $CmdletName." + $WarnCount += 1 + $internalJsonObject | Add-Member -MemberType NoteProperty -Name 'ShortDescription' -value 1 -Force + + } + } + + # Long Description + # Updated for PS MAML Files + + $LongDescription = $MamlXml.command.description.para + if ($LongDescription.Length -gt 10 -and $LongDescription) + { + $LongDescCount += 1 + } + else + { + if (!$NoWarnings) + { + $OutArray += "No long description for $CmdletName." + $WarnCount += 1 + $internalJsonObject | Add-Member -MemberType NoteProperty -Name 'LongDescription' -value 1 -Force + } + } + + # PS MAML Examples Count Check + #Updated for PS MAML Files + + $MamlExamples = $MamlXml.command.examples.example + + if($MamlExamples) + { + $ExNumber = 0 + ForEach($Example in $MamlExamples) + { + $ExCount += 1 + $ExNumber += 1 + $ExampleNumber = "Example" + $ExNumber + + if(!$Example.title) + { + $OutArray += "No example title found for an example in $CmdletName." + $internalJsonObject | Add-Member -MemberType NoteProperty -Name ($ExampleNumber + "_Title") -value 1 -Force + } + if(!$Example.introduction.para) + { + $OutArray += "No example introduction found for an example in $CmdletName." + $internalJsonObject | Add-Member -MemberType NoteProperty -Name ($ExampleNumber + "_Introduction") -value 3 -Force + } + if(!$Example.code) + { + $OutArray += "No example code found for an example in $CmdletName." + $internalJsonObject | Add-Member -MemberType NoteProperty -Name ($ExampleNumber + "_Code") -value 1 -Force + } + } + } + else + { + $OutArray += "No examples found for $CmdletName." + $internalJsonObject | Add-Member -MemberType NoteProperty -Name "Examples" -value 0 -Force + } + + #Cmdlet Input Object Description + #Updated for PS MAML Files + $InputObjects = $MamlXml.command.inputTypes.inputType + + if($InputObjects) + { + foreach($InputObj in $InputObjects) + { + $inputObjName = $InputObj.type.name + if ($inputObj.description.para.innertext) + { + $InputObjectDesccount += 1 + } + else + { + if (!$NoWarnings) + { + $OutArray += "No input object description for $inputObjName in $CmdletName" + $internalJsonObject | Add-Member -MemberType NoteProperty -Name "InputObject" -value 1 -Force + $WarnCount += 1 + } + } + } + } + + + #PS MAML Output Object Description + #Updated for PS MAML Files + + $OutPutObjects = $MamlXml.command.returnValues.returnValue + if($OutPutObjects) + { + foreach($outputObj in $OutPutObjects) + { + $outputObjName = $outputObj.type.name + if ($outputObj.description.para.innertext) + { + $OutputObjectDesccount += 1 + } + else + { + if (!$NoWarnings) + { + $OutArray += "No output object description for $outputObjName in $CmdletName" + $WarnCount += 1 + $internalJsonObject | Add-Member -MemberType NoteProperty -Name "OutputObject" -value 1 -Force + } + } + } + } + + # Parameter Descriptions + #Updated for PS MAML Files + $Parameters = $MamlXml.command.parameters.parameter + + foreach ($parm in $Parameters) + { + $ParmCount += 1 + $ParmName = $parm.Name + if ($parm.Description) + { + $ParmDescCount += 1 + } + else + { + if (!$NoWarnings) + { + $OutArray += "No parameter description for $CmdletName -$ParmName." + $WarnCount += 1 + $internalJsonObject | Add-Member -MemberType NoteProperty -Name "Parameter_$ParmName" -value 1 -Force + } + } + } + + #Evaluates Missing Elements + + if ($WarnCount -ne 0) + { + $MissingContent +=1 + $jsonObject | Add-Member -MemberType NoteProperty -Value $internalJsonObject -Name $CmdletName -Force + } + } + + if($MissingContent -gt 0) + { + $OutFileName = ($MamlFolderPath + " \..\..\..\" + $ModuleName + "_Report_MISSING_CONTENT.txt") + } + else + { + $OutFileName = ($MamlFolderPath + " \..\..\..\" + $ModuleName + "_Report.txt") + } + + #Computation of Percentage Complete + $fShortDescPercent = "{0:P1}" -f ($ShortDescCount/$CmdletCount) + $fLongDescPercent = "{0:P1}" -f ($LongDescCount/$CmdletCount) + $fExPercent = "{0:P1}" -f ($ExCount/$CmdletCount) + $fParmDescPercent = "{0:P1}" -f ($ParmDescCount/$ParmCount) + $fMissingContentPercent = "{0:P1}" -f ($MissingContent/$CmdletCount) + $fInputObject = "{0:P1}" -f ($InputObjectDesccount/$CmdletCount) + $fOutputObjectDesc = "{0:P1}" -f ($OutputObjectDesccount/$CmdletCount) + + ###Report Output into PowerShell Host + #Header Message + $OutArray += "`nReport Summary" + $OutArray += "--------------" + $OutArray += "Folder Path: $MamlFolderPath" + $OutArray += "Commands: $CmdletCount" + $OutArray += "Parameters: $ParmCount" + + #Short Desc Message + $ShortDescMessage = "Short Descriptions: $ShortDescCount ( $fShortDescPercent )" + if($fShortDescPercent -eq '100.0 %') + { + $OutArray += $ShortDescMessage + } + else + { + $OutArray += $ShortDescMessage + } + + #Long Desc Message + $LongDescMessage = "Long Descriptions: $LongDescCount ( $fLongDescPercent )" + if($fLongDescPercent -eq '100.0 %') + { + $OutArray += "Long Descriptions: $LongDescCount ( $fLongDescPercent )" + } + else + { + $OutArray += $LongDescMessage + } + + #Example Message + $ExamplesMessage = "Examples: $ExCount ( $fExPercent )" + if($fExPercent -eq '100.0 %') + { + $OutArray += $ExamplesMessage + } + else + { + $OutArray += $ExamplesMessage + } + $OutArray += " Minimum Required: $CmdletCount" + + #Input Object Message + $InputObjectMessage = "Input Objects: $InputObjectDesccount ( $fInputObject )" + if($fInputObject -eq '100.0 %') + { + $OutArray += $InputObjectMessage + } + else + { + $OutArray += $InputObjectMessage + } + + #Output Object Message + $OutputObjectMessage = "Output Object: $OutputObjectDesccount ( $fOutputObjectDesc )" + if($fOutputObjectDesc -eq '100.0 %') + { + $OutArray += $OutputObjectMessage + } + else + { + $OutArray += $OutputObjectMessage + } + + #Parameter Messaage + $ParameterMessage = "Parameter Descriptions: $ParmDescCount ( $fParmDescPercent )" + if($fParmDescPercent -eq '100.0 %') + { + $OutArray += $ParameterMessage + } + else + { + $OutArray += $ParameterMessage + } + + #Error & Closing Message + $OutArray += "Number of cmdlets missing content: $MissingContent ( $fMissingContentPercent )" + $OutArray += "--------------" + $OutArray | Out-File -FilePath $OutFileName + + if(($MissingCommands.Count -gt 0) -or ($MissingContent -gt 0)) + { + $OutFileName = ($MamlFolderPath + " \..\..\..\" + $ModuleName + ".json") + $jsonObject | ConvertTo-Json -Depth 10 | Out-file $OutFileName + } } function Split-HelpFiles { - [Cmdletbinding()] - Param - ( - [parameter(Mandatory=$true)] - [String] - $InputXML, - - [parameter(Mandatory=$true)] - [String] - $OutputPath - ) - - $namespace = @{command="http://schemas.microsoft.com/maml/dev/command/2004/10"; maml="http://schemas.microsoft.com/maml/2004/10"; dev="http://schemas.microsoft.com/maml/dev/2004/10"} - - if (!(test-path $OutputPath)) - { - mkdir $OutputPath - } - if (dir $InputXML | select-string "