merge from master

Author: Justin Marks

ClientLibraryConsoleAppSample/Program.cs

@@ -11,15 +11,15 @@ namespace ClientLibraryConsoleAppSample
     class Program
     {
         //============= Config [Edit these with your settings] =====================
-        internal const string vstsCollectionUrl = "https://myaccount.visualstudio.com"; //change to the URL of your VSTS account; NOTE: This must use HTTPS
+        internal const string azureDevOpsOrganizationUrl = "https://dev.azure.com/organization"; //change to the URL of your Azure DevOps account; NOTE: This must use HTTPS
         // internal const string vstsCollectioUrl = "http://myserver:8080/tfs/DefaultCollection" alternate URL for a TFS collection
         //==========================================================================
 
         //Console application to execute a user defined work item query
         static void Main(string[] args)
         {
             //Prompt user for credential
-            VssConnection connection = new VssConnection(new Uri(vstsCollectionUrl), new VssClientCredentials());
+            VssConnection connection = new VssConnection(new Uri(azureDevOpsOrganizationUrl), new VssClientCredentials());
 
             //create http client and query for resutls
             WorkItemTrackingHttpClient witClient = connection.GetClient<WorkItemTrackingHttpClient>();

ClientLibraryConsoleAppSample/README.md

@@ -1,10 +1,10 @@
 # Client Libraries Sample
 
-For native applications the best way to authenticate and access VSTS resources is using the [Client Libraries](https://www.visualstudio.com/en-us/docs/integrate/get-started/client-libraries/dotnet). They are .NET libraries made to simplify integration with Visual Studio Team Services and Team Foundation Server (2015 and later). They allow access to both the Traditional Client Object Model and [new REST APIs](https://www.visualstudio.com/en-us/docs/integrate/api/overview).
+For native applications the best way to authenticate and access Azure DevOps resources is using the [Client Libraries](https://docs.microsoft.com/en-us/azure/devops/integrate/concepts/dotnet-client-libraries?view=vsts). They are .NET libraries made to simplify integration with Azure DevOps and Team Foundation Server (2015 and later). They allow access to both the Traditional Client Object Model and [new REST APIs](https://docs.microsoft.com/en-us/rest/api/vsts/?view=vsts-rest-4.1).
 
 ## Sample Application
 
- This buildable sample will walk you through the steps to create an application which uses the [Client Libraries](https://www.visualstudio.com/en-us/docs/integrate/get-started/client-libraries/dotnet) to open an interactive login prompt and use that authentication state to execute a user pre-defined query written in [Work Item Query Language](https://msdn.microsoft.com/en-us/library/bb130198(v=vs.90).aspx). Query results are output into the console.
+ This buildable sample will walk you through the steps to create an application which uses the [Client Libraries](https://docs.microsoft.com/en-us/azure/devops/integrate/concepts/dotnet-client-libraries?view=vsts) to open an interactive login prompt and use that authentication state to execute a user pre-defined query written in [Work Item Query Language](https://msdn.microsoft.com/en-us/library/bb130198(v=vs.90).aspx). Query results are output into the console.
 
  ## Step 1: Clone or download vsts-auth-samples repository
 
@@ -19,5 +19,5 @@ git clone https://github.com/Microsoft/vsts-auth-samples.git
 2. Use [Nuget package restore](https://docs.microsoft.com/en-us/nuget/consume-packages/package-restore) to ensure you have all dependencies installed
 3. Open the solution file `ClientLibraryConsoleAppSample.csproj` in [Visual Studio 2017](https://www.visualstudio.com/downloads/)
 4. Open CS file `Program.cs` and there is a section with input values to change at the top of the class:
-    * `vstsCollectionUrl` - Mutable value. This is the url to your VSTS/TFS collection, e.g. http://myaccount.visualstudio.com for VSTS or http://myserver:8080/tfs/DefaultCollection for TFS.
-5. Build and run solution. After running you should see a list of the IDs all work items which match your query restrictions.
+    * `azureDevOpsOrganizationUrl` - Mutable value. This is the url to your Azure DevOps/TFS collection, e.g. http://dev.azure.com/organization for Azure DevOps or http://myserver:8080/tfs/DefaultCollection for TFS.
+5. Build and run solution. After running you should see a list of the IDs all work items which match your query restrictions.

ClientLibraryPatAppSample/README.md

@@ -1,10 +1,10 @@
 # Client Libraries Sample
 
-For native applications the best way to authenticate and access VSTS resources is using the [Client Libraries](https://www.visualstudio.com/en-us/docs/integrate/get-started/client-libraries/dotnet). They are .NET libraries made to simplify integration with Visual Studio Team Services and Team Foundation Server (2015 and later). They allow access to both the Traditional Client Object Model and [new REST APIs](https://www.visualstudio.com/en-us/docs/integrate/api/overview).
+For native applications the best way to authenticate and access Azure DevOps resources is using the [Client Libraries](https://docs.microsoft.com/en-us/azure/devops/integrate/concepts/dotnet-client-libraries?view=vsts). They are .NET libraries made to simplify integration with Azure DevOps and Team Foundation Server (2015 and later). They allow access to both the Traditional Client Object Model and [new REST APIs](https://docs.microsoft.com/en-us/rest/api/vsts/?view=vsts-rest-4.1).
 
 ## Sample Application
 
- This buildable sample will walk you through the steps to create an application which uses the [Client Libraries](https://www.visualstudio.com/en-us/docs/integrate/get-started/client-libraries/dotnet) and a personal access token to execute a user pre-defined query written in [Work Item Query Language](https://msdn.microsoft.com/en-us/library/bb130198(v=vs.90).aspx). Query results are output into the console.
+ This buildable sample will walk you through the steps to create an application which uses the [Client Libraries](https://docs.microsoft.com/en-us/azure/devops/integrate/concepts/dotnet-client-libraries?view=vsts) and a personal access token to execute a user pre-defined query written in [Work Item Query Language](https://msdn.microsoft.com/en-us/library/bb130198(v=vs.90).aspx). Query results are output into the console.
 
  ## Step 1: Clone or download vsts-auth-samples repository
 
@@ -15,11 +15,11 @@ git clone https://github.com/Microsoft/vsts-auth-samples.git
 
 ## Step 2: Run the sample
 
-1. Generate a [PAT token](https://docs.microsoft.com/en-us/vsts/organizations/accounts/use-personal-access-tokens-to-authenticate?view=vsts) and grant it "Work items (read)" permission and make a copy of the generated value
+1. Generate a [PAT token](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=vsts) and grant it "Work items (read)" permission and make a copy of the generated value
 2. Navigate to the sample in cloned repo `vsts-auth-samples/ClientLibraryPatAppSample/`
 3. Use [Nuget package restore](https://docs.microsoft.com/en-us/nuget/consume-packages/package-restore) to ensure you have all dependencies installed
 4. Open the solution file `ClientLibraryPatAppSample.csproj` in [Visual Studio 2017](https://www.visualstudio.com/downloads/)
 5. Open CS file `Program.cs` and there is a section with input values to change at the top of the class:
-    * `vstsCollectionUrl` - Mutable value. This is the url to your VSTS/TFS collection, e.g. http://myaccount.visualstudio.com for VSTS or http://myserver:8080/tfs/DefaultCollection for TFS.
+    * `azureDevOpsOrganizationUrl` - Mutable value. This is the url to your Azure DevOps/TFS organization/collection, e.g. http://dev.azure.com/organization for Azure DevOps or http://myserver:8080/tfs/DefaultCollection for TFS.
     * `pat` - Mutable value. This is the value you generated in step 1.
 6. Build and run solution. After running you should see a list of the IDs all work items which match your query restrictions.

DeviceProfileSample/README.md

@@ -6,15 +6,15 @@ For a headless text output client application, it is not possible authenticate t
 
 This buildable sample will walk you through the steps to create a client-side console application which uses ADAL to authenticate a user via the [Device Profile flow](https://azure.microsoft.com/en-us/resources/samples/active-directory-dotnet-deviceprofile/?v=17.23h) and returns a JSON string containing all account team project data viewable by the authenticated user.
 
-To run this sample for an [Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/active-directory-whatis) backed VSTS account you will need:
+To run this sample for an [Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/active-directory-whatis) backed Azure DevOps account you will need:
 * [Visual Studio IDE](https://www.visualstudio.com/vs/)
 * An Azure Active Directory (AAD) tenant. If you do not have one, follow these [steps to set up an AAD](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-howto-tenant)
 * A user account in your AAD tenant
-* A VSTS account backed by your AAD tenant where your user account has access. If you have an existing VSTS account not connected to your AAD tenant follow these [steps to connect your AAD tenant to your VSTS account](https://www.visualstudio.com/en-us/docs/setup-admin/team-services/manage-organization-access-for-your-account-vs)
+* A Azure DevOps account backed by your AAD tenant where your user account has access. If you have an existing Azure DevOps account not connected to your AAD tenant follow these [steps to connect your AAD tenant to your Azure DevOps account](https://www.visualstudio.com/en-us/docs/setup-admin/team-services/manage-organization-access-for-your-account-vs)
 
-To run this sample for a [Microsoft Account](https://account.microsoft.com/account) backed VSTS account you will need:
+To run this sample for a [Microsoft Account](https://account.microsoft.com/account) backed Azure DevOps account you will need:
 * [Visual Studio IDE](https://www.visualstudio.com/vs/)
-* A VSTS account not connected to AAD
+* A Azure DevOps account not connected to AAD
 
 ## Step 1: Clone or download vsts-auth-samples repository
 
@@ -23,10 +23,10 @@ From a shell or command line:
 git clone https://github.com/Microsoft/vsts-auth-samples.git
 ```
 
-## Step 2: Register the sample application with you Azure Active Directory tenant (AAD backed VSTS account)
+## Step 2: Register the sample application with you Azure Active Directory tenant (AAD backed Azure DevOps account)
 
 ```no-highlight
-If you are a Microsoft Account backed VSTS account please skip this step.
+If you are a Microsoft Account backed Azure DevOps account please skip this step.
 ```
 
 1. Sign in to the [Azure Portal](https://portal.azure.com).
@@ -35,27 +35,27 @@ If you are a Microsoft Account backed VSTS account please skip this step.
 4. Click on `App registrations` and select `New application registration` from the top bar.
 5. Enter a `name` for you application, ex. "Adal native app sample", choose `Native` for `application type`, and enter `http://adalsample` for the `Redirect URI`. Finally click `create` at the bottom of the screen.
 6. Save the `Application ID` from your new application registration. You will need it later in this sample.
-7. Grant permissions for VSTS. Click `Required permissions` -> `add` -> `1 Select an API` -> type in and select `Microsoft Visual Studio Team Services` -> check the box for `Delegated Permissions` -> click `Select` -> click `Done` -> click `Grant Permissions` -> click `Yes`.
+7. Grant permissions for Azure DevOps. Click `Required permissions` -> `add` -> `1 Select an API` -> type in and select `Azure DevOps` -> check the box for `Delegated Permissions` -> click `Select` -> click `Done` -> click `Grant Permissions` -> click `Yes`.
 
 ## Step 3: Install and configure ADAL (optional)
 
 Package: `Microsoft.Identity.Model.Clients.ActiveDirectory` has already been installed and configured in the sample, but if you are adding to your own project you will need to [install and configure it yourself](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory). 
 
-## Step 4a: Run the sample (AAD backed VSTS account)
+## Step 4a: Run the sample (AAD backed Azure DevOps account)
 
 1. Navigate to the sample in cloned repo `vsts-auth-samples/DeviceProfileSample/`
 2. Open the solution file `DeviceProfileSample.sln` in [Visual Studio 2017](https://www.visualstudio.com/downloads/)
 3. Use [Nuget package restore](https://docs.microsoft.com/en-us/nuget/consume-packages/package-restore) to ensure you have all dependencies installed
 4. Open CS file `Program.cs` and there is a section with input values to change at the top of the class:
-    * `vstsCollectionUrl` - Update this value to your VSTS collection URL, e.g. http://myaccount.visualstudio.com.
+    * `azureDevOpsOrganizationUrl` - Update this value to your VSTS collection URL, e.g. http://dev.azure.com/organization.
     * `clientId` - Update this value with the `Application ID` you saved in step 2.6.
 5. Build and run solution. You should see a console window with instructions on how to authenticate via the Device Profile flow. After authenticating you should see all team project information viewable by the authenticated identity displayed in the console window.
 
-## Step 4b: Run the sample (Microsoft Account backed VSTS account)
+## Step 4b: Run the sample (Microsoft Account backed Azure DevOps account)
 
 1. Navigate to the sample in cloned repo `vsts-auth-samples/DeviceProfileSample/`
 2. Open the solution file `DeviceProfileSample.sln` in [Visual Studio 2017](https://www.visualstudio.com/downloads/)
 3. Use [Nuget package restore](https://docs.microsoft.com/en-us/nuget/consume-packages/package-restore) to ensure you have all dependencies installed
 4. Open CS file `Program.cs` and there is a section with input values to change at the top of the class:
-    * `vstsCollectionUrl` - Update this value to your VSTS collection URL, e.g. http://myaccount.visualstudio.com.
-5. Build and run solution. You should see a console window with instructions on how to authenticate via the Device Profile flow. After authenticating you should see all team project information viewable by the authenticated identity displayed in the console window.
+    * `azureDevOpsOrganizationUrl` - Update this value to your VSTS collection URL, e.g. http://dev.azure.com/organization.
+5. Build and run solution. You should see a console window with instructions on how to authenticate via the Device Profile flow. After authenticating you should see all team project information viewable by the authenticated identity displayed in the console window.