Revert "latest (#8323)" (#8324)

This reverts commit 8524fcc.

Author: panagiotisliaros

docs/artifacts/artifact-storage.md

@@ -65,39 +65,6 @@ The project-level view provides an overview of your total storage usage as well
 
 [!INCLUDE [](includes/increase-storage-limit.md)]
 
-## FAQs
-
-#### Q: What counts toward my total billed storage?
-
-A: All package types: npm, NuGet, Python, Maven, Cargo, and Universal Packages are included in your billed storage. Packages saved from upstream sources also count toward your billed storage. However, Pipeline Artifacts and Pipeline Caching do not contribute to storage charges.
-
-#### Q: Do packages in the recycle bin affect my storage usage?
-
-A: Yes, packages in the recycle bin still count toward your total storage. They are automatically deleted after 30 days, but you can manually remove them earlier by deleting them from the recycle bin.
-
-#### Q: What happens if I remove my Azure Subscription from my Azure DevOps organization?
-
-A: Removing your Azure Subscription from your Azure DevOps organization limits your access to the free tier. If your storage usage exceeds 2 GiB, you will have read-only access to packages. To publish new packages, you must reduce your storage usage below 2 GiB, or reconnect your Azure subscription and set up billing to [upgrade your storage tier](#increase-artifacts-storage-limit).
-
-#### Q: Why does my storage usage show as 0 GiB even though I have artifacts stored?
-
-A: The smallest unit of storage measurement is 1 GiB. If your usage is below that threshold, it will display as 0 GiB.
-
-#### Q: How long does it take for deleted artifacts to reflect in billed storage?
-
-A: Storage metrics typically update within 24 hours, but it may take up to 48 hours. If you're unable to upload artifacts, a temporary workaround is to increase your usage level and reduce it again once metrics refresh.
-
-> [!NOTE]
-> The **Used** column in your **Organization settings** > **Billing** page is updated once a day, so changes may not be reflected right away. However, the **Artifacts** > **Storage** page in your **Organization settings** is updated more frequently, which could result in a slight discrepancy between the two pages.
-
-#### Q: How can I manage retention for outdated packages?
-
-A: You can configure retention policies to automatically delete outdated packages. However, packages promoted to a view are exempt from these policies. See [How to use retention policies to delete old packages](how-to/delete-and-recover-packages.md#delete-packages-automatically-with-retention-policies) for more details.
-
-#### Q: How do I manually delete specific packages?
-
-A: See [Delete and recover packages](how-to/delete-and-recover-packages.md) for step-by-step instructions.
-
 ## Related articles
 
 - [Get started with NuGet packages in Azure Artifacts](get-started-nuget.md)

docs/artifacts/concepts/best-practices.md

@@ -63,7 +63,7 @@ This section outlines best practices for consuming packages with Azure Artifacts
 
 - **Ensure the order of sources reflects your desired package resolution strategy**:
 
-    The feed checks upstream sources sequentially and will return the package from the first source that contains it. Be mindful of the order to ensure your feed resolves packages from the correct source. See [Order your upstream sources intentionally](upstream-sources.md#order-your-upstream-sources-intentionally) and [Search order](upstream-sources.md#search-order) for more details.
+    The feed checks upstream sources sequentially and will return the package from the first source that contains it. Be mindful of the order to ensure your feed resolves packages from the correct source. See [Order your upstream sources intentionally](upstream-sources.md#2-order-your-upstream-sources-intentionally) and [Search order](upstream-sources.md#search-order) for more details.
 
 - **Add external sources using the feed locator**:
 

docs/artifacts/concepts/upstream-sources.md

@@ -1,64 +1,86 @@
 ---
-title: Consume packages from the NuGet Gallery
-description: Learn how to consume packages from nuget.org with Azure Artifacts upstream sources.
+title: Consume packages from nuget.org
+description: How to consume packages from nuget.org with Azure Artifacts upstream sources
 ms.assetid: 301f954f-a35a-4fe2-b7fd-c78e534d9b16
 ms.service: azure-devops-artifacts
 ms.topic: how-to
-ms.date: 09/5/2025
+ms.date: 04/16/2024
 monikerRange: '>= azure-devops-2020'
 "recommendations": "true"
 ---
 
-# Use packages from the NuGet Gallery
+# Use packages from NuGet Gallery
 
 [!INCLUDE [version-gt-eq-2020](../../includes/version-gt-eq-2020.md)]
 
-Azure Artifacts upstream sources make it easy for developers to pull packages from public registries like *nuget.org* and *npmjs.com*. In this article, you learn how to set up your project and use the command line to consume NuGet packages from the NuGet Gallery.
+With Azure Artifacts upstream sources, developers are able to consume packages from public registries such as nuget.org and npmjs.com. This article will walk you through the process of setting up your project and using the command line to effectively consume NuGet packages from the NuGet Gallery. In this article, you'll learn how to:
 
-## Prerequisites
-
-| **Product**        | **Requirements**                       |
-|--------------------|----------------------------------------|
-| **Azure DevOps**   | - An Azure DevOps [organization](../../organizations/accounts/create-organization.md).<br>- An Azure DevOps [project](../../organizations/projects/create-project.md).<br> - An Azure Artifacts [feed](../get-started-nuget.md#create-a-feed).<br> - Download and install the [Azure Artifacts Credential Provider](https://github.com/microsoft/artifacts-credprovider).<br> - Install the latest [NuGet version](https://www.nuget.org/downloads). |
+> [!div class="checklist"]    
+> * Enable upstream sources for your feed 
+> * Add NuGet Gallery as an upstream source 
+> * Connect to your feed
+> * Install packages from nuget.org
 
-## Create a feed and enable upstream sources
+## Prerequisites
 
-If you haven't created a feed yet, follow the steps below to create a new feed and enable upstream sources. If you already have a feed, proceed to the [next step](#add-nuget-gallery-upstream-source) to add the NuGet Gallery as an upstream source.
+- An Azure DevOps organization and a project. Create an [organization](../../organizations/accounts/create-organization.md) or a [project](../../organizations/projects/create-project.md#create-a-project) if you haven't already.
 
-1. Sign in to your Azure DevOps organization and navigate to your project.
+- An Azure Artifacts feed.
 
-1. Select **Artifacts**, and then select **Create Feed**.
+- Download [NuGet](https://www.nuget.org/downloads).
 
-1. Provide a **Name** for your feed, select the **Visibility** option to define who can view your packages, and choose your **Scope**. Azure Artifacts recommends scoping feeds to a project rather than the entire organization. 
+- Download and install [Azure Artifacts Credential Provider](https://github.com/microsoft/artifacts-credprovider#azure-artifacts-credential-provider).
 
-1. Make sure to check the **Include packages from common public sources** option, as you'll need this to consume packages from public registries such as *nuget.org*, *npmjs.com* etc.
+## Enable upstream sources on your feed
 
-1. Select **Create** when you're done.
+If you haven't created a feed yet, follow the steps below to create a new one and make sure you select the upstream sources checkbox to enable them. If you already have a feed, proceed to the [next step](#add-nuget-gallery-upstream-source) to add the NuGet Gallery as an upstream source.
 
-    :::image type="content" source="../media/enable-upstream-nuget-gallery.png" alt-text="A screenshot displaying how to create a new feed and enable upstream sources in Azure Artifacts.":::
+[!INCLUDE [](../includes/create-feed.md)]
 
 ## Add NuGet Gallery upstream source
 
-If you checked the Upstream sources checkbox when creating your feed (as shown in the previous section), the NuGet Gallery should have been added automatically to your feed’s upstream sources. If you're working with a different feed or forgot to check that option, you can manually add the NuGet Gallery by following these steps:
+::: moniker range="azure-devops"
+
+If you've checked the upstream sources checkbox when making your feed, NuGet Gallery should have been added automatically. If not, add it manually by following these steps:
 
-1. Sign in to Azure DevOps, and then navigate to your project.
+1. Sign in to your Azure DevOps organization, and then navigate to your project.
 
-1. Select **Artifacts**, and then select your feed from the dropdown menu.
+1. Select **Artifacts**, and then select your feed.
 
 1. Select the gear icon button ![gear icon](../../media/icons/gear-icon.png) to navigate to your **Feed settings**.
 
-::: moniker range="azure-devops || azure-devops-2022"
+1. Select **Upstream Sources**, and then select **Add Upstream** to add a new upstream source.
+
+1. Select **Public source**, and then select **NuGet Gallery** from the dropdown menu.
+
+1. Select **Add** when you're done, and then select **Save** one more time at the top right corner to save your changes.
+
+::: moniker-end
+
+::: moniker range="azure-devops-2022"
+
+1. Sign in to your Azure DevOps server, and then navigate to your project.
+
+1. Select **Artifacts**, and then select your feed.
+
+1. Select the gear icon button ![gear icon](../../media/icons/gear-icon.png) to navigate to your **Feed settings**.
 
 1. Select **Upstream Sources**, and then select **Add Upstream**.
 
-1. Select **Public source**, select **NuGet Gallery** from the dropdown menu, and then select **Add**.
+1. Select **Public source**, and then select **NuGet Gallery** from the dropdown menu.
 
-1. Select **Save** at the top right corner, then select **Save** again to confirm and apply your changes.
+1. Select **Save** when you're done, and then select **Save** one more time at the top right corner to save your changes.
 
 ::: moniker-end
 
 ::: moniker range="=azure-devops-2020"
 
+1. Sign in to your Azure DevOps server, and then navigate to your project.
+
+1. Select **Artifacts**, and then select your feed.
+
+1. Select the gear icon button ![gear icon](../../media/icons/gear-icon.png) to navigate to your **Feed settings**.
+
 1. Select **Upstream Sources**, and then select **Add upstream source**.
 
 1. Select **Public source**, and then select **NuGet Gallery** from the dropdown menu.
@@ -67,42 +89,38 @@ If you checked the Upstream sources checkbox when creating your feed (as shown i
 
 ::: moniker-end
 
-## Connect to your feed
-
-In this section, you learn how to set up your project to authenticate with your Azure Artifacts feed and save packages from upstream sources such as the NuGet Gallery.
+## Connect to feed
 
 ::: moniker range="azure-devops"
 
 1. Sign in to your Azure DevOps organization, and then navigate to your project.
 
-1. Select **Artifacts**, and then select your feed from the dropdown menu.
+1. Select **Artifacts**, and then select your feed.
 
 1. Select **Connect to feed**, and then select **NuGet.exe**.
 
-1. Make sure you've installed the prerequisites, then add a *nuget.config* file in the same folder as your *.csproj* or *.sln* file. 
+1. Add a *nuget.config* file in the same folder as your *.csproj* or *.sln* file. Paste the provided XML snippet into your file. If you use the examples below, make sure you replace the placeholders with the appropriate values for your scenario.
 
-1. Paste the XML snippet provided in the **Project setup** section into your file. Your file should resemble the following:
-
-    - **Project-scoped feed**:
+    - **Organization-scoped feed**:
 
         ```xml
         <?xml version="1.0" encoding="utf-8"?>
         <configuration>
           <packageSources>
             <clear />
-            <add key="<SOURCE_NAME>" value="https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/nuget/v3/index.json" />
+            <add key="<SOURCE_NAME>" value="https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/nuget/v3/index.json" />
           </packageSources>
         </configuration>
         ```
-
-    - **Organization-scoped feed**:
+    
+    - **Project-scoped feed**:
 
         ```xml
         <?xml version="1.0" encoding="utf-8"?>
         <configuration>
           <packageSources>
             <clear />
-            <add key="<SOURCE_NAME>" value="https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/_packaging/<FEED_NAME>/nuget/v3/index.json" />
+            <add key="<SOURCE_NAME>" value="https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/nuget/v3/index.json" />
           </packageSources>
         </configuration>
         ```
@@ -111,9 +129,9 @@ In this section, you learn how to set up your project to authenticate with your
 
 ::: moniker range="azure-devops-2020 || azure-devops-2022"
 
-1. Sign in to your Azure DevOps collection, and then navigate to your project.
+1. Sign in to your Azure DevOps server, and then navigate to your project.
 
-1. Select **Artifacts**, and then select your feed from the dropdown menu.
+1. Select **Artifacts**, and then select your feed.
 
 1. Select **Connect to Feed**, and then select **NuGet.exe** from the left navigation pane.
 
@@ -123,40 +141,48 @@ In this section, you learn how to set up your project to authenticate with your
 
 ## Install packages from NuGet Gallery
 
-Now that your project is configured to authenticate with your Azure Artifacts feed, you can proceed to install packages from the NuGet Gallery upstream. In this example, you'll install the *MCP C# SDK* for the Model Context Protocol for .NET applications to interact with MCP clients and servers:
+With our project now configured to authenticate with our feed, we can now proceed to install packages from the NuGet Gallery upstream. In this example, we will install the *Serilog* diagnostic logging library:
 
 1. Navigate to the NuGet Gallery at `https://www.nuget.org/`.
 
-1. Search for the *ModelContextProtocol*, then select it to open the details page.
+1. Search for the *Serilog* package, and then select it to navigate to the details page.
 
-1. Select the **.NET CLI** tab, and copy the command. In this example, the command is: 
+1. Select the **Package Manager** tab, and copy the command. In our example, the command is as follows: 
 
     ```Command
-    dotnet add package ModelContextProtocol --version 0.3.0-preview.4
+    NuGet\Install-Package Serilog -Version 3.1.2-dev-02097
     ```
 
-1. Open a command prompt window, navigate to your project directory, then paste your command and press *Enter* to install the package.
+1. Open your project in Visual Studio, and then select **Tools** > **NuGet Package Manager** > **Package Manager Console** to open the console window.
 
-Once installed, a copy of the package will be automatically saved to your feed, ensuring availability if NuGet Gallery is down and protecting your workflow from other corrupted or malicious packages from the public registry.
+1. Paste your command in the Package Manager Console window, and press Enter to install your package.
 
 [!INCLUDE [save-requires-collaborator](../includes/save-requires-collaborator.md)]
 
 ## View saved packages
 
-1. Sign in to Azure DevOps, and navigate to your project.
+::: moniker range="azure-devops"
 
-1. Select **Artifacts**, then select your feed from the dropdown menu.
+1. Sign in to your Azure DevOps organization, and then navigate to your project.
 
-1. Select the **NuGet Gallery** source from the dropdown menu to filter for packages from this upstream.
+::: moniker-end
 
-1. The *ModelContextProtocol* packages, installed in the previous step, is now available in our feed. Azure Artifacts automatically saved a copy to your feed.
+::: moniker range="< azure-devops"
 
-    :::image type="content" source="../media/package-saved-from-nuget-upstream.png" alt-text="A screenshot displaying the MCP package saved to the feed." lightbox="../media/package-saved-from-nuget-upstream.png":::
+1. Sign in to your Azure DevOps server, and then navigate to your project.
 
-## Related content
+::: moniker-end
 
-- [Publish packages to NuGet.org](./publish-to-nuget-org.md)
+2. Select **Artifacts**, and then select your feed from the dropdown menu.
 
-- [Publish NuGet packages with Azure Pipelines](../../pipelines/artifacts/nuget.md)
+3. Select the **NuGet Gallery** source from the dropdown menu to filter for packages from this upstream.
 
+4. The *Serilog* package, installed in the previous step, is now available in our feed. Azure Artifacts automatically saved a copy to our feed when we executed the install command.
+
+    :::image type="content" source="media/package-saved-from-upstream.png" alt-text="A screenshot showing the package that was saved from upstream.":::
+
+## Related articles
+
+- [Publish NuGet packages with Azure Pipelines](../../pipelines/artifacts/nuget.md)
+- [Publish packages to NuGet.org](./publish-to-nuget-org.md)
 - [Manage permissions](../feeds/feed-permissions.md)

docs/artifacts/media/enable-upstream-nuget-gallery.png

@@ -108,8 +108,6 @@ You can track artifact storage consumption through the UI available in your orga
 
 - [Organization-level storage](./artifact-storage.md#organization-level-storage): Provides an overview of total storage usage including consumption details by project and artifact type.
 
-If you have questions about your artifact storage or consumption, see the [Storage FAQs](artifact-storage.md#faqs) for more details.
-
 ::: moniker-end
 
 ## Related content

docs/artifacts/media/package-saved-from-nuget-upstream.png

@@ -7,7 +7,7 @@ ms.assetid: 819EA180-2BAC-46DB-A17E-A5179E6BEADC
 ms.author: chcomley
 author: chcomley
 ms.topic: troubleshooting
-ms.date: 09/12/2025
+ms.date: 08/26/2025
 ---
 
 # Resolve Azure DevOps and Office integration issues
@@ -19,9 +19,6 @@ Azure DevOps integrates with Microsoft Office applications, primarily Excel and
 > [!div class="mx-imgBorder"]
 > ![Screenshot of Excel and Azure DevOps/Office integration Team ribbon.](media/excel-team-ribbon.png)
 
-> [!IMPORTANT]
-> The Azure DevOps Office integration add-in is no longer supported and might not function with current versions of Office or browsers. Microsoft doesn't provide updates or fixes for this add-in. For bulk work item operations, use the [CSV import/export functionality](../../queries/import-work-items-from-csv.md), which is the recommended and supported approach.
-
 Common scenarios where you might encounter integration issues include:
 
 - **Missing Team ribbon**: The Azure DevOps Team ribbon doesn't appear in Excel or other Office applications
@@ -32,6 +29,9 @@ Common scenarios where you might encounter integration issues include:
 
 This article provides step-by-step solutions for the most common Azure DevOps Office integration problems. Before troubleshooting, ensure you have the necessary prerequisites and understand the current state of Office integration support.
 
+> [!IMPORTANT]
+> The Azure DevOps Office integration is feature complete with no plans for updates or improvements. Microsoft recommends using [CSV import/export functionality](../../queries/import-work-items-from-csv.md) for bulk work item operations as the preferred modern approach.
+
 [!INCLUDE [temp](../../includes/deprecate-project.md)]
 
 ## Install Azure DevOps Integration 2019

docs/artifacts/nuget/upstream-sources.md

@@ -25,8 +25,6 @@ Boards provide an intuitive and visual way to manage your projects, track work i
 
 [!INCLUDE [temp](../includes/prerequisites-kanban.md)]
 
-[!INCLUDE [enable-mcp-server](../includes/enable-mcp-server.md)]
-
 [!INCLUDE [temp](../includes/open-kanban-board.md)] 
 
 ## Map the flow of how your team works