Python: [Python/.NET] Normalize Foundry sample configuration (#9070)

* Normalize Foundry sample configuration

* Fix hosted sample workflow environment

* Address Foundry configuration review feedback

* Normalize hosted sample env templates

* Remove stale model fallback comment

Author: eavanvalkenburg

.github/workflows/dotnet-verify-samples.yml

@@ -106,12 +106,9 @@ jobs:
           AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZURE_OPENAI_DEPLOYMENT_NAME }}
           AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
           # Microsoft Foundry
-          AZURE_AI_PROJECT_ENDPOINT: ${{ vars.AZURE_AI_PROJECT_ENDPOINT }}
-          AZURE_AI_MODEL_DEPLOYMENT_NAME: ${{ vars.AZURE_AI_MODEL_DEPLOYMENT_NAME }}
-          AZURE_AI_BING_CONNECTION_ID: ${{ vars.AZURE_AI_BING_CONNECTION_ID }}
-          # Foundry
           FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
           FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
+          AZURE_AI_BING_CONNECTION_ID: ${{ vars.AZURE_AI_BING_CONNECTION_ID }}
 
       - name: Write Job Summary
         if: always()

.github/workflows/python-sample-validation.yml

@@ -628,7 +628,6 @@ jobs:
       FOUNDRY_PROJECT_ENDPOINT: ${{ vars.FOUNDRY_PROJECT_ENDPOINT }}
       FOUNDRY_MODEL: ${{ vars.FOUNDRY_MODEL }}
       # Foundry hosted agent configuration
-      AZURE_AI_MODEL_DEPLOYMENT_NAME: ${{ vars.FOUNDRY_MODEL }}
       FOUNDRY_PROJECT_ID: ${{ vars.FOUNDRY_PROJECT_ID }}
       AZURE_CONTAINER_REGISTRY_ENDPOINT: ${{ vars.AZURE_CONTAINER_REGISTRY_ENDPOINT }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -150,8 +150,8 @@ using Azure.AI.Projects;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 
-string endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4-mini";
+string endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
+string deploymentName = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4-mini";
 
 AIAgent agent =
     new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential())

dotnet/.github/skills/verify-samples-tool/SKILL.md

@@ -45,7 +45,7 @@ The tool itself needs:
 - `AZURE_OPENAI_ENDPOINT` — for the AI verification agent
 - `AZURE_OPENAI_DEPLOYMENT_NAME` (optional, defaults to `gpt-5-mini`)
 
-Individual samples require their own env vars (e.g., `AZURE_AI_PROJECT_ENDPOINT`). The tool automatically checks and skips samples with missing env vars.
+Individual samples require their own env vars (for example, `FOUNDRY_PROJECT_ENDPOINT`). The tool automatically checks and skips samples with missing env vars.
 
 ### Output Files
 
@@ -188,8 +188,8 @@ new SampleDefinition
 {
     Name = "FoundryAgent_Hosted_MCP",
     ProjectPath = "samples/02-agents/ModelContextProtocol/FoundryAgent_Hosted_MCP",
-    RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
-    OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
+    RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
+    OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
     Inputs = ["Y", "Y", "Y", "Y", "Y"],
     InputDelayMs = 5000,
     ExpectedOutputDescription = ["The output should show an agent using the Microsoft Learn MCP tool with approval prompts."],
@@ -203,8 +203,8 @@ new SampleDefinition
 {
     Name = "Workflow_Declarative_FunctionTools",
     ProjectPath = "samples/03-workflows/Declarative/FunctionTools",
-    RequiredEnvironmentVariables = ["AZURE_AI_PROJECT_ENDPOINT"],
-    OptionalEnvironmentVariables = ["AZURE_AI_MODEL_DEPLOYMENT_NAME"],
+    RequiredEnvironmentVariables = ["FOUNDRY_PROJECT_ENDPOINT"],
+    OptionalEnvironmentVariables = ["FOUNDRY_MODEL"],
     Inputs = ["What are today's specials?", "EXIT"],
     InputDelayMs = 8000,
     ExpectedOutputDescription = ["The output should show a workflow calling function tools to answer a question about restaurant specials."],
@@ -224,4 +224,3 @@ new SampleDefinition
 },
 ```
 
-

dotnet/eng/verify-samples/AgentsSamples.cs

@@ -37,7 +37,7 @@ Set the following environment variables:
 
 ```powershell
 # Replace with your Microsoft Foundry project endpoint
-$env:FOUNDRY_PROJECT_ENDPOINT="https://your-project.services.ai.azure.com/"
+$env:FOUNDRY_PROJECT_ENDPOINT="https://your-account.services.ai.azure.com/api/projects/your-project"
 
 # Replace with your Bing Grounding connection ID (full ARM resource URI)
 $env:AZURE_AI_BING_CONNECTION_ID="/subscriptions/<sub-id>/resourceGroups/<rg>/providers/Microsoft.CognitiveServices/accounts/<account>/projects/<project>/connections/<connection-name>"

dotnet/samples/02-agents/Agents/Agent_Step15_DeepResearch/README.md

@@ -26,8 +26,8 @@
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 
-var endpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
-var deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-5.4";
+var endpoint = Environment.GetEnvironmentVariable("FOUNDRY_PROJECT_ENDPOINT") ?? throw new InvalidOperationException("FOUNDRY_PROJECT_ENDPOINT is not set.");
+var deploymentName = Environment.GetEnvironmentVariable("FOUNDRY_MODEL") ?? "gpt-5.4";
 
 // The HarnessAgent pre-configures function invocation, per-service-call chat history persistence, and
 // context-window compaction. These bounds size the in-loop compaction window.

dotnet/samples/02-agents/Harness/Harness_Step05_Loop/Program.cs

@@ -41,10 +41,10 @@ Set the following environment variables:
 
 ```bash
 # Required: Your Microsoft Foundry project endpoint
-export AZURE_AI_PROJECT_ENDPOINT="https://your-project.services.ai.azure.com/api/projects/your-project"
+export FOUNDRY_PROJECT_ENDPOINT="https://your-account.services.ai.azure.com/api/projects/your-project"
 
 # Optional: Model deployment name (defaults to gpt-5.4)
-export AZURE_AI_MODEL_DEPLOYMENT_NAME="gpt-5.4"
+export FOUNDRY_MODEL="gpt-5.4"
 ```
 
 ## Running the Sample

dotnet/samples/02-agents/Harness/Harness_Step05_Loop/README.md

@@ -91,8 +91,8 @@ Prerequisites:
 
   | Setting | Description |
   | --- | --- |
-  | `AZURE_AI_PROJECT_ENDPOINT` | Foundry project endpoint URL. |
-  | `AZURE_AI_MODEL_DEPLOYMENT_NAME` | Model deployment name. |
+  | `FOUNDRY_PROJECT_ENDPOINT` | Foundry project endpoint URL. |
+  | `FOUNDRY_MODEL` | Model deployment name. |
 
   See the [parent README](../README.md) for the full walkthrough.
 

dotnet/samples/03-workflows/Declarative/AotCheckpointing/README.md

@@ -2,7 +2,7 @@
 FOUNDRY_PROJECT_ENDPOINT=<your-azure-ai-project-endpoint>
 
 # Model deployment name in your Foundry project.
-AZURE_AI_MODEL_DEPLOYMENT_NAME=gpt-4o
+FOUNDRY_MODEL=gpt-4o
 
 # Local development only. Bind the app to the port Foundry probes for readiness, which is the
 # port the Using-Samples REPLs expect. Recent Microsoft.Agents.AI.Foundry.Hosting versions bind