Merge pull request #12 from aneillans/master

Resolve on-premise issues
MethodsAndPractices · Aug 5, 2017 · 7c4b611 · 7c4b611
2 parents 3bc1603 + 758d53a
commit 7c4b611
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Team.psd1 b/Team.psd1
@@ -13,7 +13,7 @@
    RootModule = ''
 
    # Version number of this module.
-   ModuleVersion = '0.1.28'
+   ModuleVersion = '0.1.29'
 
    # Supported PSEditions
    # CompatiblePSEditions = @()

diff --git a/src/common.ps1 b/src/common.ps1
@@ -94,7 +94,7 @@ function _getProjects {
    $instance = $env:TEAM_ACCT
 
    # Build the url to list the projects
-   $listurl = $instance + '/_apis' + $resource + '?api-version=' + $version
+   $listurl = $instance + '/_apis' + $resource + '?api-version=' + $version + '&$top=9999'
    Write-Verbose "listurl = $listurl"
 
    # Call the REST API

diff --git a/src/team.psm1 b/src/team.psm1
@@ -158,8 +158,10 @@ function Add-TeamAccount {
       }
 
       # If they only gave an account name add visualstudio.com
-      if($Account -match  "(?<protocol>https?\://)?(?<account>[A-Z0-9][-A-Z0-9]*[A-Z0-9])(?<domain>\.visualstudio\.com)?") {
-         $Account = "https://$($matches.account).visualstudio.com"
+      if ($Account -notlike "*/*") {
+        if($Account -match  "(?<protocol>https?\://)?(?<account>[A-Z0-9][-A-Z0-9]*[A-Z0-9])(?<domain>\.visualstudio\.com)?") {
+           $Account = "https://$($matches.account).visualstudio.com"
+        }
       }
 
       $encodedPat = [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes(":$_pat"))