1867274, fixing merge conflicts.

Author: john-par

docs/artifacts/concepts/upstream-sources.md

@@ -77,6 +77,9 @@ When you add a remote feed as an upstream source, you must select its feed's vie
 
 ## Best practices: feed owners/package publishers
 
+> [!NOTE]
+> Upstream sources are not supported in public feeds.
+
 To make sure your feed is easily configured as an upstream source, consider applying the following best practices:
 
 <a name="local"></a>

docs/artifacts/get-started-npm.md

@@ -1,28 +1,28 @@
 ---
-title: Use npm to store JavaScript packages
-description: Use npm to store your JavaScript packages. Create a feed, set up .npmrc files, build your project, and publish your npm package to your feed.
+title: publish and download npm packages
+description: How to set up your .npmrc config file to publish and download npm packages
 ms.technology: devops-artifacts
 ms.topic: quickstart
 ms.assetid: 5BFBA0C3-85ED-40C9-AC5F-F686923160D6
 ms.custom: contperf-fy20q4, conterperfq3, contperf-fy21q3
-ms.date: 06/19/2020
+ms.date: 10/22/2021
 monikerRange: '>= tfs-2017'
 "recommendations": "true"
 ---
 
 # Get started with npm packages in Azure Artifacts
 
-Azure Artifacts supports publishing and consuming npm packages to and from Azure Artifacts feeds and public registries. Use this quickstart to create your feed, set up your .npmrc file, build your project, and publish your npm packages to your feed.
+With Azure Artifacts, you can publish and download npm packages from feeds and public registries such as npmjs.com. This quickstart will guide you through creating your own feed, setting up your project, and publishing and downloading npm packages to and from your Azure Artifacts feed.
 
 ::: moniker range=">=tfs-2017 <= tfs-2018"
 
 ## License the Azure Artifacts extension
 
-To use Azure Artifacts, you must upgrade to Visual Studio Team Foundation Server 2017. If the Azure Artifacts extension has been removed, you can install it from [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ms.feed).
+To use Azure Artifacts in TFS, you must upgrade to Visual Studio Team Foundation Server 2017. If the Azure Artifacts extension has been removed, you can install it from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ms.feed).
 
 ### Assign licenses in Team Foundation Server
 
-Each organization gets five free licenses. If you need more than five licenses, go to [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ms.feed), and select **Get it free**.
+Each organization gets five free licenses. If you need more than five licenses, go to the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ms.feed), and select **Get it free**.
 
 If you aren't sure, you can select **Start 30-day free trial**. Every user in your organization is then granted access to Azure Artifacts for 30 days. After the 30-day trial period, your organization reverts back to five entitled users, and you must assign licenses to individual users. If you need additional licenses at this point, you can purchase them from Visual Studio Marketplace. If you have a license for Visual Studio Enterprise, you already have access to Azure Artifacts and don't need to be assigned a license. Just ensure that you've been assigned the "Visual Studio Enterprise" access level.
 
@@ -31,8 +31,7 @@ If you aren't sure, you can select **Start 30-day free trial**. Every user in yo
 
 1. From any collection in Team Foundation Server, hover over the settings menu and select **Users**. Then select **Package Management**.
 
-   > [!div class="mx-imgBorder"]
-   > ![Screenshot of the Users page in Team Foundation Server.](media/users-hub-tfs.png)
+    :::image type="content" source="media/users-hub-tfs.png" alt-text="Screenshot showing the user page in TFS":::
 
 1. Select **Assign**, enter the users you want to assign licenses, and then select **OK**.
 
@@ -44,124 +43,130 @@ If you aren't sure, you can select **Start 30-day free trial**. Every user in yo
 
 ## Create a feed
 
-A feed is an organizational construct that allows users to store packages and control who can access them by modifying the feed permissions.
+A feed is an organizational construct that allows users to store their packages and control who can access them. Azure Artifacts support storing several package types in a single feed such as NuGet, npm, Maven, Python, and Universal packages.
 
-Feeds aren't dependent on the type of package. Azure Artifacts currently supports storing NuGet, npm, Maven, Python, and Universal packages in a single feed.
+[!INCLUDE [](includes/create-feed.md)]
 
-To create a new feed, select **Create feed** from within your feed, and fill out the form.
-
-* **Name**: The feed name.
-* **Visibility**: Choose who can upload or download packages to or from your feed.
-* **Upstream sources**: If you want to add upstream sources to your feed such as *npmjs.org* or *NuGet.org*, select **Include packages from common public sources**. When upstream sources are enabled, your client can fetch packages from the public registry through your private feed, and your private feed will cache those packages for you. If you want to create your feed without connectivity to public registries, clear the **Upstream sources** check box. You can add them later if you choose to.
-
-When you're done, select **Create**.
-
-::: moniker range=">= azure-devops-2019"
-
-> [!div class="mx-imgBorder"] 
-> ![Screenshot of the new feed dialog box in Azure DevOps 2019.](media/new-feed-dialog.png)
-
-::: moniker-end
-
-::: moniker range="<= tfs-2018"
-
-> [!div class="mx-imgBorder"]
-> ![Screenshot of the new feed dialog box in Team Foundation Server.](media/new-feed-dialog-azure-tfs.png)
-
-::: moniker-end
-
-You can change these settings later by editing the feed.
+You can change these settings later by editing your feed's settings.
 
 [!INCLUDE [edit-feed](includes/edit-feed.md)]
 
 ::: moniker range=">= azure-devops-2019"
 
 ## Set up your .npmrc files
 
-All Azure Artifacts feeds require authentication. You store credentials for the feed before you can install or publish packages. npm uses [.npmrc configuration files](https://docs.npmjs.com/files/npmrc) to store feed URLs and credentials.
-
 > [!NOTE]
-> `vsts-npm-auth` isn't supported on on-premises Team Foundation Server and Azure DevOps Server.
+> `vsts-npm-auth` is not supported in TFS and Azure DevOps Server.
 
-### Find your .npmrc files
+We recommend having two .npmrc files. The first one should be placed in the same directory as your package.json file. The second one should be placed in the **$home** directory (Linux/MacOS) or **$env.HOME** (Windows) to store your credentials. The npm client then will be able to look up this file and fetch your credentials for authentication. This enables you to share your config file while keeping your credentials secure.
 
-We recommend that you use two .npmrc files:
+1. Select **Artifacts**, and then select **Connect to feed**.
 
-1. One .npmrc should live at the root of your Git repo where your project's package.json file is located.
+    :::image type="content" source="media/connect-to-feed-azure-devops-newnav.png" alt-text="Screenshot showing how to connect to a feed":::
 
-   1. From **Artifacts**, select **Connect to feed**.
+1. Select **npm**. If this is your first time using Azure Artifacts, select **Get the tools** and then follow the steps to download Node.js and set up the credential provider. 
 
-      > [!div class="mx-imgBorder"] 
-      > ![Screenshot that shows how to connect to your feed.](media/connect-to-feed-azure-devops-newnav.png)
+1. Follow the instructions in the **Project setup** to set up your project.
 
-   1. Select **npm** > **Get the tools**.
-
-   1. Follow steps 1 and 2 to download the Node.js file, npm, and the artifacts credential provider.
-
-   1. Select **Windows** if you're on a Windows Machine, or **Other** if you're on macOS or Linux.
-   
-   1. Follow the instructions in the **Project setup**, **Restore packages**, and **Publish packages** sections.
-
-      > [!div class="mx-imgBorder"] 
-      > ![Screenshot that shows the setup, restore, and publish sections to connect your feed.](media/npm-azure-devops-newnav.png)
+    :::image type="content" source="media/npm-azure-devops-newnav.png" alt-text="Screenshot showing how to set up your project":::
 
-2. On your development machine, you also have a .npmrc file in the **$home** folder for Linux or Mac systems, or in **$env.HOME** for Windows. This .npmrc file should contain credentials for all of the registries that you need to connect to. The NPM client looks at your project's .npmrc file, discovers the registry, and fetches matching credentials from **$home/.npmrc** or **$env.HOME/.npmrc**.
-
-This enables you to share the project's .npmrc file with the whole team, while keeping your credentials secure.
-
 ### Set up authentication on your development machine
 
-At this point, you should have a project-specific .npmrc file. This file contains only your feed's registry information that you discovered from the **Connect to feed** dialog box. There should be no credentials in this file. The file is usually stored in the same location as your project's package.json file.
-
 > [!IMPORTANT]
-> There can be only a single `registry=` line in your .npmrc file. Multiple registries are possible with [scopes](npm/scopes.md) and [upstream sources](npm/upstream-sources.md).
+> npm supports a single `registry` in your .npmrc file. Multiple registries are possible with [scopes](npm/scopes.md) and [upstream sources](npm/upstream-sources.md).
 
-#### Windows
+#### [Windows](#tab/Windows/)
 
-If you're developing on Windows, we recommend that you use `vsts-npm-auth` to fetch credentials and inject them into your ~/.npmrc file on a periodic basis. The easiest way to set this up is to install `vsts-npm-auth` globally (that is, `npm install -g vsts-npm-auth`), and then add a run script in your project's package.json file.
+If you're developing on Windows, we recommend using `vsts-npm-auth` to authenticate with Azure Artifacts. Run `npm install -g vsts-npm-auth` to install the package globally and then add a run script to your package.json.
 
-```json
+```JSON
 "scripts": {
     "refreshVSToken": "vsts-npm-auth -config .npmrc"
 }
 ```
 
-#### Linux/Mac
+#### [Linux/MacOS](#tab/Linux/)
+
+`vsts-npm-auth` is not supported in Linux/MacOS. In order to authenticate with Azure Artifacts, we have to create a personal access token and add it to our .npmrc file.
+
+1. Copy the following code snippet to your .npmrc file.
+
+    - **Organization-scoped feed**:
 
-If you're developing on Linux or Mac, `vsts-npm-auth` isn't supported. Instead, generate a token in the following manner for your $HOME/.npmrc file.
+        ```Command
+        ; begin auth token
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/npm/registry/:username=[ENTER_ANY_VALUE_BUT_NOT_AN_EMPTY_STRING]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/npm/registry/:_password=[BASE64_ENCODED_PERSONAL_ACCESS_TOKEN]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/npm/registry/:email=npm requires email to be set but doesn't use the value
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/npm/:username=[ANY_VALUE_BUT_NOT_AN_EMPTY_STRING]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/npm/:_password=[BASE64_ENCODED_PERSONAL_ACCESS_TOKEN]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/npm/:email=npm requires email to be set but doesn't use the value
+        ; end auth token
+        ```
+    
+    - **Project-scoped feed**:
 
-[!INCLUDE [](./includes/npm/npmrc.md)]
+        ```Command
+        ; begin auth token
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/npm/registry/:username=[ENTER_ANY_VALUE_BUT_NOT_AN_EMPTY_STRING]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/npm/registry/:_password=[BASE64_ENCODED_PERSONAL_ACCESS_TOKEN]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/npm/registry/:email=npm requires email to be set but doesn't use the value
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/npm/:username=[ENTER_ANY_VALUE_BUT_NOT_AN_EMPTY_STRING]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/npm/:_password=[BASE64_ENCODED_PERSONAL_ACCESS_TOKEN]
+        //pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/npm/:email=npm requires email to be set but doesn't use the value
+        ; end auth token
+        ```
+
+1. Generate a [personal access token](../organizations/accounts/use-personal-access-tokens-to-authenticate.md) with **packaging read and write** scopes.
+
+1. Encode your newly generated personal access token as follows:
+
+    1. Run the following command in an elevated command prompt window.
+        
+        ```Command
+        node -e "require('readline') .createInterface({input:process.stdin,output:process.stdout,historySize:0}) .question('PAT> ',p => { b64=Buffer.from(p.trim()).toString('base64');console.log(b64);process.exit(); })"
+        ```
+
+    1. Paste your personal access token, and then press **Enter**.
+ 
+    1. Copy the Base64 encoded value.
+
+1. Replace the `[BASE64_ENCODED_PERSONAL_ACCESS_TOKEN]` placeholder in your .npmrc file with your Base64 personal access token. 
 
 ::: moniker-end
 
-## Build your project
+::: moniker range=">=tfs-2017 <= tfs-2018"
 
-At this point, your project should have a package.json file and a .npmrc file in the same folder. Run `npm install` from the directory that contains both of these files. npm discovers your feed in the .npmrc file in the current working directory. It then fetches the credentials from your home directory's .npmrc file that you configured in the "Create a feed" section.
+1. Select **Packages**, and then select **Connect to feed**.
 
-> [!NOTE]
-> If you are using Yarn, run the following command to set the yarn registry: 
->
-> `yarn config set registry "https://pkgs.dev.azure.com/<yourOrganization>/_packaging/<yourFeed>/npm/registry/"`
+2. Select **npm**.
 
+3. Select **Generate npm credentials**. Copy the credentials and add them to your .npmrc file.
 
-## Publish npm packages
+    :::image type="content" source="./media/tfs2018-connect-to-npm-feed.png" alt-text="Screenshot showing how generate credentials":::
 
-You can now publish the npm package:
+::: moniker-end
 
-1. Browse to the directory that contains your package's package.json file.
+* * * 
 
-1. Run `npm publish`.
+## Publish packages
 
-This command authenticates to the feed by using the .npmrc configuration files that you had to set up earlier. For more information, see the [npm CLI docs](https://docs.npmjs.com/cli/publish).
+To publish your npm package, run the following command in your project directory
 
-Your npm package should now be available in your feed.
+```Command
+npm publish
+```
 
 > [!IMPORTANT]
-> Ensure that your working folder has an `.npmrc` file with a `registry=` line, as described in the **Connect to feed** screen in your feed. The build doesn't support using the `publishConfig` property to specify the registry to which you're publishing. If you include the `publishConfig` property in your package.json file, the build might fail with an unrelated authentication error.
+> Using the `publishConfig` property to override the registry config param at publish-time is not supported. 
 
-## Download npm packages
+## Restore packages
 
-[!INCLUDE [](includes/npm/install.md)]
+To restore an npm package, run the following command in your project directory
+
+```Command
+npm install --save <package>
+```
 
 ## Next steps
 

docs/artifacts/get-started-nuget.md

@@ -37,6 +37,8 @@ This quickstart assumes you've already set up Azure Artifacts. You can check out
 
 ## Create a feed
 
+With Azure Artifacts, you can create two types of feeds: project-scoped and organization-scoped feeds. All public feeds are project-scoped and they inherit the hosting project's visibility settings. By default, any feed that's created by using the web UI is a project-scoped feed.
+
 [!INCLUDE [](includes/create-feed.md)]
 
 <a name="publish-a-package"></a>

docs/artifacts/how-to/set-up-upstream-sources.md

@@ -24,6 +24,9 @@ Selecting this option will allow your feed to use packages from public packages
 
 ## Add public upstream sources to an existing feed
 
+> [!NOTE]
+> Upstream sources are not supported in public feeds.
+
 1. With your feed selected, select the gear icon ![gear icon](../../media/icons/gear-icon.png) to access your **Feed settings**.
 2. Select **Upstream sources**. If you don't have any upstream sources, you'll see a dialog where you can _Add upstream source_. If you already have it, you can select _Add upstream source_ in the top menu.
 3. In the **Add a new upstream source** dialog, Select **Public source**. Note that public sources may be greyed out if you chose to include public upstream sources when creating the feed and they already exist in your upstream sources.

docs/artifacts/includes/create-feed.md

@@ -7,8 +7,6 @@ author: ramiMSFT
 ms.date: 03/10/2021
 ---
 
-With Azure Artifacts, you can create two types of feeds: project-scoped and organization-scoped feeds. All public feeds are project-scoped and they inherit the hosting project's visibility settings. By default, any feed that's created by using the web UI is a project-scoped feed, as follows.
-
 ::: moniker range=">= azure-devops-2019"
 
 1. From within your project, navigate to **Azure Artifacts**.

docs/artifacts/includes/edit-feed.md

@@ -4,21 +4,17 @@ ms.technology: devops-cicd
 ms.manager: mijacobs
 ms.author: rabououn
 author: ramiMSFT
-ms.date: 06/19/2020
+ms.date: 10/22/2021
 ---
 
 ::: moniker range=">= azure-devops-2019"
 
-1. With your feed selected, select the gear icon :::image type="icon" source="../../media/icons/gear-icon.png"::: on the right side of the page.
-
-    :::image type="content" source="../media/editfeed-azure-devops-newnav.png" alt-text="Screenshot of the Edit feed button.":::
+:::image type="content" source="../media/editfeed-azure-devops-newnav.png" alt-text="Screenshot of the Edit feed button.":::
 
 ::: moniker-end
 
-::: moniker range="<= tfs-2018"
-
-1. With your feed selected, select the gear icon :::image type="icon" source="../../media/icons/gear-icon.png"::: on the right side of the page.
+::: moniker range=">=tfs-2017 <= tfs-2018"
 
-    :::image type="content" source="../media/editfeed.png" alt-text="Screenshot of the Edit feed button TFS.":::
+:::image type="content" source="../media/editfeed.png" alt-text="Screenshot of the Edit feed button TFS.":::
 
 ::: moniker-end

docs/artifacts/includes/npm/npmrc.md

@@ -3,7 +3,7 @@ ms.topic: include
 ms.technology: devops-cicd
 ms.author: rabououn
 author: ramiMSFT
-ms.date: 09/01/2020
+ms.date: 10/22/2021
 ---
 
 #### Project setup

docs/artifacts/includes/nuget/nuget-recommended-version.md

@@ -3,8 +3,8 @@ ms.topic: include
 ms.technology: devops-cicd
 ms.author: rabououn
 author: ramiMSFT
-ms.date: 02/19/2020
+ms.date: 10/18/2021
 ---
 
 > [!NOTE]
-> Azure Artifacts recommends NuGet 4.8.2 or later. However, legacy NuGet 2.x are also supported. For a complete list of distribution versions, see the [NuGet distribution page](https://dist.nuget.org/index.html).
+> We recommend NuGet version 4.8.2 or later. Legacy NuGet versions 2.x are also supported.