MethodsAndPractices · DarqueWarrior · Sep 17, 2018 · Jul 26, 2018 · Jul 29, 2018 · Jul 29, 2018
diff --git a/.docs/Add-VSTeamAccount.md b/.docs/Add-VSTeamAccount.md
@@ -85,9 +85,9 @@ Will add the account and use the OAuth Token provided by VSTS when you check the
 The Visual Studio Team Services (VSTS) account name to use.
 DO NOT enter the entire URL.
 
-Just the portion before visualstudio.com. For example in the
+Just the portion after dev.azure.com. For example in the
 following url mydemos is the account name.
-<https://mydemos.visualstudio.com>
+<https://dev.azure.com/mydemos>
 or
 The full Team Foundation Server (TFS) url including the collection.
 <http://localhost:8080/tfs/DefaultCollection>

diff --git a/.docs/Add-VSTeamProfile.md b/.docs/Add-VSTeamProfile.md
@@ -43,9 +43,9 @@ On Windows, allows you use to use Windows authentication against a local TFS ser
 The Visual Studio Team Services (VSTS) account name to use.
 DO NOT enter the entire URL.
 
-Just the portion before visualstudio.com. For example in the
+Just the portion after dev.azure.com. For example in the
 following url mydemos is the account name.
-<https://mydemos.visualstudio.com>
+<https://dev.azure.com/mydemos>
 or
 The full Team Foundation Server (TFS) url including the collection.
 <http://localhost:8080/tfs/DefaultCollection>

diff --git a/.docs/Invoke-VSTeamRequest.md b/.docs/Invoke-VSTeamRequest.md
@@ -130,7 +130,7 @@ Type: String
 
 ### -SubDomain
 
-The SubDomain between your account and visualstudio.com. For example, to target Release Management you must use the SubDomain vsrm.
+The SubDomain before .dev.azure.com. For example, to target Release Management you must use the SubDomain vsrm.
 
 ```yaml
 Type: String

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.0.8
+
+Merged [Pull Request](https://github.com/DarqueWarrior/vsteam/pull/93) from [Kai Walter](https://github.com/KaiWalter) which included the following:
+
+- replaced {accountname}.visualstudio.com with dev.azure.com/{accountname}
+
 ## 4.0.7
 
 Setting the Top to 10,000 when searching by email in Update-VSTeamUser. If you have a large number of users you should use by ID instead of by email. This addresses issue [90](https://github.com/DarqueWarrior/vsteam/issues/90).

diff --git a/VSTeam.psd1 b/VSTeam.psd1
@@ -13,7 +13,7 @@
    RootModule        = ''
 
    # Version number of this module.
-   ModuleVersion     = '4.0.7'
+   ModuleVersion     = '4.0.8'
 
    # Supported PSEditions
    # CompatiblePSEditions = @()

diff --git a/docs/Add-VSTeamAccount.md b/docs/Add-VSTeamAccount.md
@@ -87,9 +87,9 @@ Will add the account and use the OAuth Token provided by VSTS when you check the
 The Visual Studio Team Services (VSTS) account name to use.
 DO NOT enter the entire URL.
 
-Just the portion before visualstudio.com. For example in the
+Just the portion after dev.azure.com. For example in the
 following url mydemos is the account name.
-<https://mydemos.visualstudio.com>
+<https://dev.azure.com/mydemos>
 or
 The full Team Foundation Server (TFS) url including the collection.
 <http://localhost:8080/tfs/DefaultCollection>

diff --git a/docs/Add-VSTeamProfile.md b/docs/Add-VSTeamProfile.md
@@ -45,9 +45,9 @@ On Windows, allows you use to use Windows authentication against a local TFS ser
 The Visual Studio Team Services (VSTS) account name to use.
 DO NOT enter the entire URL.
 
-Just the portion before visualstudio.com. For example in the
+Just the portion after dev.azure.com. For example in the
 following url mydemos is the account name.
-<https://mydemos.visualstudio.com>
+<https://dev.azure.com/mydemos>
 or
 The full Team Foundation Server (TFS) url including the collection.
 <http://localhost:8080/tfs/DefaultCollection>

diff --git a/docs/Invoke-VSTeamRequest.md b/docs/Invoke-VSTeamRequest.md
@@ -145,7 +145,7 @@ Type: String
 
 ### -SubDomain
 
-The SubDomain between your account and visualstudio.com. For example, to target Release Management you must use the SubDomain vsrm.
+The SubDomain before .dev.azure.com. For example, to target Release Management you must use the SubDomain vsrm.
 
 ```yaml
 Type: String

diff --git a/en-US/VSTeam-Help.xml b/en-US/VSTeam-Help.xml
@@ -143,7 +143,7 @@
           <maml:name>Account</maml:name>
           <maml:Description>
             <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-            <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+            <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
           </maml:Description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
@@ -226,7 +226,7 @@
           <maml:name>Account</maml:name>
           <maml:Description>
             <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-            <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+            <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
           </maml:Description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
@@ -307,7 +307,7 @@
           <maml:name>Account</maml:name>
           <maml:Description>
             <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-            <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+            <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
           </maml:Description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
@@ -403,7 +403,7 @@
         <maml:name>Account</maml:name>
         <maml:Description>
           <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-          <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+          <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
         </maml:Description>
         <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>
@@ -2517,7 +2517,7 @@ PS C:\&gt; Add-NuGetEndpoint -EndpointName 'PowerShell Gallery' -NuGetUrl 'https
           <maml:name>Account</maml:name>
           <maml:Description>
             <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-            <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+            <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
           </maml:Description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
@@ -2587,7 +2587,7 @@ PS C:\&gt; Add-NuGetEndpoint -EndpointName 'PowerShell Gallery' -NuGetUrl 'https
           <maml:name>Account</maml:name>
           <maml:Description>
             <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-            <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+            <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
           </maml:Description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
@@ -2655,7 +2655,7 @@ PS C:\&gt; Add-NuGetEndpoint -EndpointName 'PowerShell Gallery' -NuGetUrl 'https
           <maml:name>Account</maml:name>
           <maml:Description>
             <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-            <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+            <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
           </maml:Description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
@@ -2711,7 +2711,7 @@ PS C:\&gt; Add-NuGetEndpoint -EndpointName 'PowerShell Gallery' -NuGetUrl 'https
         <maml:name>Account</maml:name>
         <maml:Description>
           <maml:para>The Visual Studio Team Services (VSTS) account name to use. DO NOT enter the entire URL.</maml:para>
-          <maml:para>Just the portion before visualstudio.com. For example in the following url mydemos is the account name. &lt;https://mydemos.visualstudio.com&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
+          <maml:para>Just the portion after dev.azure.com. For example in the following url mydemos is the account name. &lt;https://dev.azure.com/mydemos&gt; or The full Team Foundation Server (TFS) url including the collection. &lt;http://localhost:8080/tfs/DefaultCollection&gt;</maml:para>
         </maml:Description>
         <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>
@@ -9200,7 +9200,7 @@ Demo-CI           Demo-CI-45   notStarted</dev:code>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="false" position="named" aliases="none">
           <maml:name>SubDomain</maml:name>
           <maml:Description>
-            <maml:para>The SubDomain between your account and visualstudio.com. For example, to target Release Management you must use the SubDomain vsrm.</maml:para>
+            <maml:para>The SubDomain before .dev.azure.com. For example, to target Release Management you must use the SubDomain vsrm.</maml:para>
           </maml:Description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
           <dev:type>
@@ -9362,7 +9362,7 @@ Demo-CI           Demo-CI-45   notStarted</dev:code>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="false" position="named" aliases="none">
         <maml:name>SubDomain</maml:name>
         <maml:Description>
-          <maml:para>The SubDomain between your account and visualstudio.com. For example, to target Release Management you must use the SubDomain vsrm.</maml:para>
+          <maml:para>The SubDomain before .dev.azure.com. For example, to target Release Management you must use the SubDomain vsrm.</maml:para>
         </maml:Description>
         <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         <dev:type>

diff --git a/en-US/about_vsteam.help.txt b/en-US/about_vsteam.help.txt
@@ -20,7 +20,7 @@ LONG DESCRIPTION
 
     Name                         Value
     ----                         -----
-    Account                      https://test.visualstudio.com
+    Account                      https://dev.azure.com/test
     DefaultProject            
     Version                      TFS2017
     Build                        3.0

diff --git a/en-US/about_vsteam_profiles.help.txt b/en-US/about_vsteam_profiles.help.txt
@@ -29,7 +29,7 @@ EXAMPLES
 
     Add-VSTeamAccount -Profile demonstrations
 
-    This will add the account https://demonstrations.visualstudio.com/
+    This will add the account https://dev.azure.com/demonstrations/
 
 KEYWORDS
     Team Services, VSTS, TFS, VSO, TFS, DevOps

diff --git a/integration/test/000_team.Tests.ps1 b/integration/test/000_team.Tests.ps1
@@ -59,7 +59,7 @@ Describe 'Team' -Tag 'integration' {
             $info.Account | Should Be $acct
          }
          else {
-            $info.Account | Should Be "https://$acct.visualstudio.com"
+            $info.Account | Should Be "https://dev.azure.com/$acct"
          }
       }
    }

diff --git a/integration/test/010_projects.Tests.ps1 b/integration/test/010_projects.Tests.ps1
@@ -203,6 +203,17 @@ Describe 'VSTeam Integration Tests' -Tag 'integration' {
          $buildDefs.Count | Should Be 2
       }
 
+      It 'Get-VSTeamBuildDefinition by Type "build" should return 2 build definitions' {
+         $buildDefs = Get-VSTeamBuildDefinition -ProjectName $newProjectName -Type build
+         $buildDefs.Count | Should Be 2
+      }
+
+      ### issue #87 validity of this test needs to be checked first
+      # It 'Get-VSTeamBuildDefinition by Type "xaml" should return no build definitions' {
+      #    $buildDefs = Get-VSTeamBuildDefinition -ProjectName $newProjectName -Type xaml
+      #    $buildDefs.Count | Should Be 0
+      # }
+
       # Only run for VSTS
       if ($api -eq 'VSTS') {
          It 'Get-VSTeamBuildDefinition by Id should return intended attribute values for 1st build definition' {

diff --git a/src/common.ps1 b/src/common.ps1
@@ -111,7 +111,7 @@ function _isVSTS {
       [parameter(Mandatory = $true)]
       [string] $instance
    )
-   return $instance -like "*.visualstudio.com*"
+   return $instance -like "*.visualstudio.com*" -or $instance -like "https://dev.azure.com/*"
 }
 
 function _getVSTeamAPIVersion {
@@ -147,8 +147,8 @@ function _addSubDomain {
    $instance = [VSTeamVersions]::Account
 
    # For VSTS Entitlements is under .vsaex
-   if ($subDomain -and [VSTeamVersions]::Account.ToLower().Contains('visualstudio.com')) {
-      $instance = [VSTeamVersions]::Account.ToLower().Replace('visualstudio.com', "$subDomain.visualstudio.com")
+   if ($subDomain -and [VSTeamVersions]::Account.ToLower().Contains('dev.azure.com')) {
+      $instance = [VSTeamVersions]::Account.ToLower().Replace('dev.azure.com', "$subDomain.dev.azure.com")
    }
 
    return $instance
@@ -190,7 +190,7 @@ function _getUserAgent {
 }
 
 function _useWindowsAuthenticationOnPremise {
-   return (_isOnWindows) -and (!$env:TEAM_PAT) -and -not ([VSTeamVersions]::Account -like "*visualstudio.com")
+   return (_isOnWindows) -and (!$env:TEAM_PAT) -and -not ([VSTeamVersions]::Account -like "*visualstudio.com") -and -not ([VSTeamVersions]::Account -like "https://dev.azure.com/*")
 }
 
 function _useBearerToken {

diff --git a/src/profile.psm1 b/src/profile.psm1
@@ -21,6 +21,15 @@ function Get-VSTeamProfile {
             # We needed to add ForEach-Object to unroll and show the inner type
             $result = Get-Content $profilesPath | ConvertFrom-Json
 
+            # convert old URL in profile to new URL
+            if ($result) {
+               $result | ForEach-Object {
+                  if ($_.URL -match "(?<protocol>https?\://)?(?<account>[A-Z0-9][-A-Z0-9]*[A-Z0-9])(?<domain>\.visualstudio\.com)") {
+                     $_.URL = "https://dev.azure.com/$($matches.account)"
+                  }
+               }
+            }
+
             if ($Name) {
                $result = $result | Where-Object Name -eq $Name
             }
@@ -155,11 +164,26 @@ function Add-VSTeamProfile {
          }
       }
 
-      # If they only gave an account name add visualstudio.com
+      # If they only gave an account name add https://dev.azure.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"
+         if (-not $Name) {
+            $Name = $Account
+         }
+         $Account = "https://dev.azure.com/$($Account)"
+      }
+      # If they gave https://dev.azure.com extract Account and Profile name
+      if ($Account -match "(?<protocol>https\://)?(?<domain>dev\.azure\.com/)(?<account>[A-Z0-9][-A-Z0-9]*[A-Z0-9])") {
+         if (-not $Name) {
+            $Name = $matches.account
+         }
+         $Account = "https://dev.azure.com/$($matches.account)"
+      }
+      # If they gave https://xxx.visualstudio.com extract Account and Profile name, convert to new URL
+      if ($Account -match "(?<protocol>https?\://)?(?<account>[A-Z0-9][-A-Z0-9]*[A-Z0-9])(?<domain>\.visualstudio\.com)") {
+         if (-not $Name) {
+            $Name = $matches.account
          }
+         $Account = "https://dev.azure.com/$($matches.account)"
       }
 
       if ($UseBearerToken.IsPresent) {

diff --git a/src/team.psm1 b/src/team.psm1
@@ -235,13 +235,15 @@ function Add-VSTeamAccount {
             $_pat = $PersonalAccessToken
          }
 
-         # If they only gave an account name add visualstudio.com
+         # If they only gave an account name add https://dev.azure.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"
-            }
+            $Account = "https://dev.azure.com/$($Account)"
          }
-
+         # If they gave https://xxx.visualstudio.com convert to new URL
+         if ($Account -match "(?<protocol>https?\://)?(?<account>[A-Z0-9][-A-Z0-9]*[A-Z0-9])(?<domain>\.visualstudio\.com)") {
+            $Account = "https://dev.azure.com/$($matches.account)"
+         }
+
          if ($UseBearerToken.IsPresent) {
             $token = $_pat
             $encodedPat = ''
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ Describe 'Team' -Tag 'integration' { @@
                 $info.Account | Should Be $acct
              }
              else {
-                $info.Account | Should Be "https://$acct.visualstudio.com"
+                $info.Account | Should Be "https://dev.azure.com/$acct"
              }
           }
        }
@@ Expand Down @@