Merge pull request #23 from webmd-health-services/feature/buildmaster…

…-6.1.25

0.9.0

BuildMasterAutomation/BuildMasterAutomation.psd1

@@ -12,7 +12,7 @@
     RootModule = 'BuildMasterAutomation.psm1'
 
     # Version number of this module.
-    ModuleVersion = '0.8.0'
+    ModuleVersion = '0.9.0'
 
     # ID used to uniquely identify this module
     GUID = 'cc5a1865-e5f8-45f2-b0d3-317a1611a965'
@@ -144,8 +144,9 @@ The BuildMasterAutomation module is a PowerShell module for working with BuildMa
 
             # ReleaseNotes of this module
             ReleaseNotes = @'
-* Added support for BuildMaster 6.1.17. Fixed an issue where environments created with `New-BMEnvironment` are disabled/inactive in that version.
-* Added `Inactive` switch to `New-BMEnvironment` to create inactive/disabled environments. The default is to create active/enabled environments.
+* Improved import speed by merging all functions into the module's .psm1 file.
+* Updating to support BuildMaster 6.1.25.
+* Fixed: New-BMServerRole requires a request body in BuildMaster 6.1.25.
 '@
         } # End of PSData hashtable
 

BuildMasterAutomation/BuildMasterAutomation.psm1

@@ -1,5 +1,11 @@
 
 Add-Type -AssemblyName 'System.Web'
 
-Get-ChildItem -Path (Join-Path -Path $PSScriptRoot -ChildPath 'Functions') -Filter '*.ps1' |
-    ForEach-Object { . $_.FullName }
+$functionsDir = Join-Path -Path $PSScriptRoot -ChildPath 'Functions'
+if( (Test-Path -Path $functionsDir -PathType Container) )
+{
+    foreach( $item in (Get-ChildItem -Path $functionsDir -Filter '*.ps1') )
+    {
+        . $item.FullName
+    }
+}

BuildMasterAutomation/Functions/New-BMServerRole.ps1

@@ -35,5 +35,5 @@ function New-BMServerRole
     Use-CallerPreference -Cmdlet $PSCmdlet -SessionState $ExecutionContext.SessionState
 
     $encodedName = [uri]::EscapeDataString($Name)
-    Invoke-BMRestMethod -Session $Session -Name ('infrastructure/roles/create/{0}' -f $encodedName) -Method Post
+    Invoke-BMRestMethod -Session $Session -Name ('infrastructure/roles/create/{0}' -f $encodedName) -Method Post -Body '{}'
 }

init.ps1

@@ -27,7 +27,7 @@ Set-StrictMode -Version 'Latest'
 
 $runningUnderAppVeyor = (Test-Path -Path 'env:APPVEYOR')
 
-$version = '6.1.17'
+$version = '6.1.25'
 Write-Verbose -Message ('Testing BuildMaster {0}' -f $version)
 $sqlServer = $null
 $installerPath = 'SQL'

whiskey.yml

@@ -22,6 +22,13 @@ Build:
     OnlyDuring: Build
     Path: init.ps1
 
+- MergeFile:
+    OnlyBy: BuildServer
+    Path: BuildMasterAutomation\Functions\*.ps1
+    DestinationPath: BuildMasterAutomation\BuildMasterAutomation.psm1
+    DeleteSourceFiles: true
+    TextSeparator: "$(NewLine)$(NewLine)"
+
 - Pester4:
     Path: Tests\*.Tests.ps1
     Verbose: false