Merge branch 'master' into tenant-domain-name

markcowl · web-flow · commit 41194c31da97 · 2018-12-05T16:28:23.000-08:00
diff --git a/src/ScenarioTest.ResourceManager/Common.ps1 b/src/ScenarioTest.ResourceManager/Common.ps1
@@ -603,7 +603,7 @@ function Get-Location
         }
     }
     $locations = $resourceTypes.Locations
-    if($UseCanonical)
+    if($UseCanonical -and $locations -ne $null)
     {
         $locations = $locations | ForEach-Object { Normalize-Location $_ }
     }

Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ function Get-Location`
`603`	`603`	`}`
`604`	`604`	`}`
`605`	`605`	`$locations = $resourceTypes.Locations`
`606`		`- if($UseCanonical)`
	`606`	`+ if($UseCanonical -and $locations -ne $null)`
`607`	`607`	`{`
`608`	`608`	`$locations = $locations \| ForEach-Object { Normalize-Location $_ }`
`609`	`609`	`}`