Merge pull request #4916 from sdgilley/sdg-fdp-updates

[DIRTY PR] Re-fix merge conflicts in release-build-ai-foundry

Bringing this fix in - reviewed with author

Author: thomps23

articles/ai-foundry/how-to/develop/sdk-overview.md

@@ -39,6 +39,8 @@ The Azure AI Foundry SDK is a set of client libraries and services designed to w
     az login
     ```
 
+[!INCLUDE [feature-preview](../../includes/feature-preview.md)]
+
 ## Unified Projects client library
 
 The Azure AI Foundry Projects client library is a unified library that enables you to use multiple client libraries together by connecting to a single project endpoint.
@@ -67,7 +69,7 @@ The Azure AI Foundry Projects client library is a unified library that enables y
 ::: zone pivot="programming-language-java"
 
 
-* Add these packages to your installation:
+* Add these packages to your installation (preview):
     * `com.azure.ai.projects`
     * `com.azure.core`
 
@@ -92,7 +94,7 @@ The Azure AI Foundry Projects client library is a unified library that enables y
 
 ::: zone pivot="programming-language-javascript"
 
-* Install dependencies:
+* Install dependencies (preview):
 
     ```bash
     npm install @azure/ai-projects @azure/identity

articles/ai-foundry/includes/create-project-fdp.md

@@ -145,7 +145,7 @@ To create a [!INCLUDE [fdp](../includes/fdp-project-name.md)]:
 
 # [Azure CLI](#tab/azurecli)
 
-To create a [!INCLUDE [fdp](../includes/fdp-project-name.md)]:
+<!-- To create a [!INCLUDE [fdp](../includes/fdp-project-name.md)]:
 
 1. Authenticate to your Azure subscription from the Azure CLI with the following command:
 
@@ -164,9 +164,12 @@ To create a [!INCLUDE [fdp](../includes/fdp-project-name.md)]:
 1. Now use the following commands to create a new [!INCLUDE [fdp](../includes/fdp-project-name.md)]:
 
     [!INCLUDE [cli-create-project](cli-create-project.md)]
+ -->
 
 ---
 
+CLI comannds not currently available for creating a [!INCLUDE [fdp-project-name](fdp-project-name.md)].
+
 ## Create multiple projects on the same resource
 
 [!INCLUDE [create-second-fdp-project](create-second-fdp-project.md)]

articles/ai-foundry/includes/deploy-model.md

@@ -17,7 +17,7 @@ To work with a model, you first deploy it into a project.
 1. Sign in to [Azure AI Foundry](https://ai.azure.com).
 1. Studio remembers where you were last, so what you do next depends on where you are:
 
-    * If you're new to Azure AI Foundry, select **Create the future**. Add a name for your project and select **Create**.
+    * If you're new to Azure AI Foundry, select **Create an agent**. Add a name for your project and select **Create**.
     * If you see a list of projects, select the one you want to use.  You can use either a [!INCLUDE [hub-project-name](hub-project-name.md)] or a [!INCLUDE [fdp-project-name](fdp-project-name.md)].
     * If you're already in a project and want to use a new one, select **Azure AI Foundry** in the top left corner, then select **Create new** to create the new project.
 

articles/ai-foundry/includes/get-started-fdp.md

@@ -5,12 +5,10 @@ author: sgilley
 ms.author: sgilley
 ms.service: azure-ai-foundry
 ms.topic: include
-ms.date: 04/30/2025
+ms.date: 05/13/2025
 ms.custom: include file
 ---
 
-[!INCLUDE [fdp-rollout](fdp-rollout.md)]
-
 In this quickstart, you use [Azure AI Foundry](https://ai.azure.com) to:
 
 > [!div class="checklist"]
@@ -30,22 +28,22 @@ The Azure AI Foundry SDK is available in multiple languages, including Python, J
 - An [Azure subscription](https://azure.microsoft.com/free/). If you don't have an Azure subscription, create a free account before you begin.
 - You must be **Owner** of the subscription to receive the appropriate access control needed to use your project.
 
-
+[!INCLUDE [feature-preview](feature-preview.md)]
 
 ## Create a [!INCLUDE [fdp-project-name](fdp-project-name.md)] 
 
 1. Sign in to the [Azure AI Foundry portal](https://ai.azure.com).
-1. On the home page, select **Create the future**. This creates a project and also include steps to start working with a basic Agent.
+1. On the home page, select **Create an agent**. This creates a project and also include steps to start working with a basic Agent.
 
-    :::image type="content" source="../media/quickstarts/start-building.png" alt-text="Screenshot shows how to start building an Agent in Azure AI Foundry portal.":::
+    <!-- :::image type="content" source="../media/quickstarts/start-building.png" alt-text="Screenshot shows how to start building an Agent in Azure AI Foundry portal."::: -->
 
 1. Fill in a name for your project and select **Create**. 
 
 ## Deploy a model
 
 [!INCLUDE [tip-left-pane](../includes/tip-left-pane.md)]
 
-1. If you just used the Azure AI Foundry portal to create the project with the **Create the future** link, you're next  prompted to deploy a model.
+1. If you just used the Azure AI Foundry portal to create the project with the **Create an agent** link, you're next  prompted to deploy a model.
 1. Or else, sign in to the [Azure AI Foundry portal](https://ai.azure.com), select your project, and select **Model catalog**.
 1. Search for the model you want to deploy. For this quickstart, select **gpt-4o**.
 1. Select **Confirm**.
@@ -71,7 +69,7 @@ No installation is necessary to use the Azure AI Foundry portal.
 > [!TIP]
 > All the code in this article is at [GitHub Quickstart](https://github.com/azure-ai-foundry/foundry-samples/tree/main/samples/microsoft/python/mslearn-resources/quickstart).
 
-# [Java](#tab/java)
+# [Java (preview)](#tab/java)
 
 1. [Install Java and Azure CLI](../how-to/develop/install-cli-sdk.md?pivots=programming-language-java).
 1. Set these environment variables to use in your scripts:
@@ -84,7 +82,7 @@ No installation is necessary to use the Azure AI Foundry portal.
 > [!TIP]
 > All the code in this article is at [GitHub Quickstart](https://github.com/azure-ai-foundry/foundry-samples/blob/main/samples/microsoft/java/mslearn-resources/quickstart).
 
-# [JavaScript](#tab/javascript)
+# [JavaScript (preview)](#tab/javascript)
 
 1. [Install JavaScript and Azure CLI](../how-to/develop/install-cli-sdk.md?pivots=programming-language-javascript)
 1. Make sure to sign in using the CLI `az login` (or `az login --use-device-code`) command to authenticate before running your JavaScript scripts.
@@ -122,7 +120,7 @@ Chat completions are the basic building block of AI applications. Using chat com
 
 # [Azure AI Foundry portal](#tab/azure-ai-foundry)
 
-1. If you used **Create the future** to create the project, you'll now find yourself in the Agents playground, ready to try it out. You'll come back here in a moment, but first let's play with the model.
+1. If you used **Create an agent** to create the project, you'll now find yourself in the Agents playground, ready to try it out. You'll come back here in a moment, but first let's play with the model.
 1. In the left pane, select **Playgrounds**. 
 1. Select **Try the chat playground**.
 1. Fill in the prompt and select the **Send** button.
@@ -135,11 +133,11 @@ Substitute your value for the endpoint in this code:
 :::code language="python" source="~/foundry-samples/samples/microsoft/python/mslearn-resources/quickstart/quickstart.py" id="chat_completion":::
 
 
-# [Java](#tab/java)
+# [Java (preview)](#tab/java)
 
 :::code language="java" source="~/foundry-samples/samples/microsoft/java/mslearn-resources/quickstart/src/main/java/com/azure/ai/foundry/samples/ChatCompletionSample.java" :::
 
-# [JavaScript](#tab/javascript)
+# [JavaScript (preview)](#tab/javascript)
 
 :::code language="javascript" source="~/foundry-samples/samples/microsoft/javascript/mslearn-resources/quickstart/src/quickstart.js" id="chat_completion":::
 
@@ -168,11 +166,11 @@ Agents allow more powerful capabilities through the use of tools. First, let's w
 
 :::code language="python" source="~/foundry-samples/samples/microsoft/python/mslearn-resources/quickstart/quickstart.py" id="create_and_run_agent":::
 
-# [Java](#tab/java)
+# [Java (preview)](#tab/java)
 
 :::code language="java" source="~/foundry-samples/samples/microsoft/java/mslearn-resources/quickstart/src/main/java/com/azure/ai/foundry/samples/AgentSample.java" :::
 
-# [JavaScript](#tab/javascript)
+# [JavaScript (preview)](#tab/javascript)
 
 :::code language="javascript" source="~/foundry-samples/samples/microsoft/javascript/mslearn-resources/quickstart/src/quickstart.js" id="create_and_run_agent" :::
 
@@ -204,12 +202,12 @@ Now let's add a file search tool that enables us to do knowledge retrieval.
 
 :::code language="python" source="~/foundry-samples/samples/microsoft/python/mslearn-resources/quickstart/quickstart.py" id="create_filesearch_agent":::
 
-# [Java](#tab/java)
+# [Java (preview)](#tab/java)
 
 :::code language="java" source="~/foundry-samples/samples/microsoft/java/mslearn-resources/quickstart/src/main/java/com/azure/ai/foundry/samples/FileSearchAgentSample.java" :::
 
 
-# [JavaScript](#tab/javascript)
+# [JavaScript (preview)](#tab/javascript)
 
 :::code language="javascript" source="~/foundry-samples/samples/microsoft/javascript/mslearn-resources/quickstart/src/quickstart.js" id="create_filesearch_agent":::
 

articles/ai-foundry/quickstarts/get-started-code.md

@@ -4,7 +4,7 @@ titleSuffix: Azure AI Foundry
 description: This article provides instructions on how to start using the Azure AI Foundry portal and the Azure AI Foundry SDK.
 manager: scottpolly
 ms.service: azure-ai-foundry
-ms.custom: build-2024, devx-track-azurecli, devx-track-python, ignite-2024, update-code
+ms.custom: build-2024, devx-track-azurecli, devx-track-python, ignite-2024, update-code2
 ms.topic: how-to
 ms.date: 05/12/2025
 ms.reviewer: dantaylo

articles/ai-foundry/what-is-azure-ai-foundry.md

@@ -16,8 +16,6 @@ ms.custom: ignite-2023, build-2024, ignite-2024
 
 # What is Azure AI Foundry?
 
-[!INCLUDE [fdp-rollout](includes/fdp-rollout.md)]
-
 [Azure AI Foundry](https://ai.azure.com) provides a unified platform for enterprise AI operations, model builders, and application development. This foundation combines production-grade infrastructure with friendly interfaces, ensuring organizations can build and operate AI applications with confidence. 
 
 [Azure AI Foundry](https://ai.azure.com) is designed for developers to: