Merge pull request #5054 from laujan/resolve-merge-conflict

[DIRTY PR] Resolve merge conflict

Author: rmca14

.gitignore

@@ -11,6 +11,8 @@ _repo.*/
 
 .openpublishing.buildcore.ps1
 
+*sec.endpointdlp
+
 # CoPilot instructions and prompts
 .github/copilot-instructions.md
-.github/prompts/*.md
+.github/prompts/*.md

.openpublishing.publish.config.json

@@ -117,9 +117,9 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "azureai-samples-csharp",
-      "url": "https://github.com/Azure-Samples/azureai-samples",
-      "branch": "dantaylo/csharp",
+      "path_to_root": "foundry-samples-main",
+      "url": "https://github.com/azure-ai-foundry/foundry-samples",
+      "branch": "main",
       "branch_mapping": {}
     },
     {

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
-{
+{ 
   "redirections": [
+    {
+      "source_path": "articles/ai-foundry/concepts/connections.md",
+      "redirect_url": "/azure/ai-foundry/how-to/connections-add",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/azure-openai-in-azure-ai-foundry.md",
+      "redirect_url": "/azure/ai-foundry/what-is-azure-ai-foundry",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/search/performance-benchmarks.md",
       "redirect_url": "/previous-versions/azure/search/performance-benchmarks",
@@ -91,8 +101,8 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/ai-services/agents/how-to/tools/overview.md",
-      "redirect_url": "/azure/ai-services/agents/overview",
+      "source_path_from_root": "/articles/ai-services/agents/how-to/tools/licensed-data.md",
+      "redirect_url": "/azure/ai-services/agents/how-to/tools/overview",
       "redirect_document_id": false
     },
     {
@@ -269,6 +279,11 @@
       "source_path_from_root": "/articles/ai-services/custom-vision-service/logo-detector-mobile.md",
       "redirect_url": "/azure/ai-services/custom-vision-service",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-services/index.yml",
+      "redirect_url": "/azure/ai-foundry",
+      "redirect_document_id": false
     }
   ]
 }

articles/ai-foundry/.openpublishing.redirection.ai-studio.json

@@ -215,6 +215,11 @@
             "redirect_url": "/azure/ai-foundry/concepts/models-featured#mistral-ai",
             "redirect_document_id": false
           },
+          {
+            "source_path_from_root": "/articles/ai-foundry/how-to/model-catalog-overview.md",
+            "redirect_url": "/azure/ai-foundry/concepts/foundry-models-overview",
+            "redirect_document_id": false
+          },
           {
             "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-mistral-open.md",
             "redirect_url": "/azure/ai-foundry/how-to/deploy-models-mistral-open",
@@ -614,8 +619,8 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/concepts/connections.md",
-            "redirect_url": "/azure/ai-foundry/concepts/connections",
-            "redirect_document_id": true
+            "redirect_url": "/azure/ai-foundry/how-to/connections-add",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/ai-studio/concepts/content-filtering.md",
@@ -707,10 +712,15 @@
             "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/ai-foundry/ai-services/how-to/connect-azure-openai.md",
+            "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/ai-studio/ai-services/how-to/connect-azure-openai.md",
-            "redirect_url": "/azure/ai-foundry/ai-services/how-to/connect-azure-openai",
-            "redirect_document_id": true
+            "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/ai-studio/tutorials/copilot-sdk-build-rag.md",
@@ -1137,6 +1147,36 @@
           "source_path_from_root": "/articles/ai-foundry/ai-services/how-to/connect-ai-services.md",
           "redirect_url": "/azure/ai-services/connect-services-ai-foundry-portal",
           "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/concepts/evaluation-approach-gen-ai.md",
+          "redirect_url": "/azure/ai-foundry/concepts/observability",
+          "redirect_document_id": true
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/concepts/evaluation-metrics-built-in.md",
+          "redirect_url": "/azure/ai-foundry/concepts/observability",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/concepts/trace.md",
+          "redirect_url": "/azure/ai-foundry/how-to/develop/trace-application",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/how-to/develop/trace-local-sdk.md",
+          "redirect_url": "/azure/ai-foundry/how-to/develop/trace-application",
+          "redirect_document_id": true
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/how-to/develop/visualize-traces.md",
+          "redirect_url": "/azure/ai-foundry/how-to/develop/trace-application#visualize-your-traces",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/ai-foundry/how-to/online-evaluation.md",
+          "redirect_url": "/azure/ai-foundry/how-to/monitor-applications",
+          "redirect_document_id": false
         }
     ]
 }