Merge branch 'dotnet:main' into main

Author: bigboybamo

.openpublishing.publish.config.json

@@ -125,9 +125,10 @@
     ".openpublishing.redirection.fsharp.json",
     ".openpublishing.redirection.fundamentals.json",
     ".openpublishing.redirection.machine-learning.json",
+    ".openpublishing.redirection.navigate.json",
     ".openpublishing.redirection.orleans.json",
     ".openpublishing.redirection.standard.json",
     ".openpublishing.redirection.visual-basic.json"
   ],
   "need_generate_intellisense": false
-}
+}

.openpublishing.redirection.core.json

@@ -877,6 +877,18 @@
             "source_path_from_root": "/docs/core/packages.md",
             "redirect_url": "/dotnet/core/deploying"
         },
+        {
+            "source_path_from_root": "/docs/core/porting/github-copilot-app-modernization-faq.yml",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/faq"
+        },
+        {
+            "source_path_from_root": "/docs/core/porting/github-copilot-app-modernization-overview.md",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/overview"
+        },
+        {
+            "source_path_from_root": "/docs/core/porting/how-to-upgrade-with-github-copilot.md",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/how-to-upgrade-with-github-copilot"
+        },
         {
             "source_path_from_root": "/docs/core/porting/libraries.md",
             "redirect_url": "/dotnet/core/porting/"

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+    {
+      "source_path": "docs/core/tools/dotnet-migrate.md",
+      "redirect_url": "/previous-versions/dotnet/fundamentals/tools/dotnet-migrate",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/core/install/localized-intellisense.md",
       "redirect_url": "/previous-versions/dotnet/core/install/localized-intellisense",

.openpublishing.redirection.navigate.json

@@ -0,0 +1,8 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/docs/navigate/github-copilot-modernize/index.yml",
+            "redirect_url": "/dotnet/core/porting/github-copilot-app-modernization/index"
+        }
+    ]
+}

docs/azure/includes/dotnet-all.md

@@ -426,7 +426,7 @@
 | Unknown Display Name | NuGet [0.8.4](https://www.nuget.org/packages/Azure.Mcp.osx-x64/0.8.4) |  |  |
 | Unknown Display Name | NuGet [0.8.4](https://www.nuget.org/packages/Azure.Mcp.win-arm64/0.8.4) |  |  |
 | Unknown Display Name | NuGet [0.8.4](https://www.nuget.org/packages/Azure.Mcp.win-x64/0.8.4) |  |  |
-| Unknown Display Name | NuGet [0.1.3-preview.2](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Aot/0.1.3-preview.2) |  |  |
+| Unknown Display Name | NuGet [0.1.4-preview.2](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Aot/0.1.4-preview.2) |  |  |
 | Unknown Display Name | NuGet [0.2.802](https://www.nuget.org/packages/Microsoft.Azure.Mcp.AzTypes.Internal.Compact/0.2.802) |  |  |
 | Unknown Display Name | NuGet [1.1.2-preview](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.AzureCosmosDb.Mongo/1.1.2-preview) |  |  |
 | Unknown Display Name | NuGet [1.46.0](https://www.nuget.org/packages/Microsoft.CognitiveServices.Speech.Extension.MAS/1.46.0) |  |  |
@@ -465,7 +465,7 @@
 | Common | NuGet [2.2.1](https://www.nuget.org/packages/Microsoft.Azure.Common/2.2.1) |  |  |
 | Common - Dependencies | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Common.Dependencies/1.0.0) |  |  |
 | Computer Vision | NuGet [7.0.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.ComputerVision/7.0.1) |  | GitHub [7.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.ComputerVision_6.0.0-preview.1/sdk/cognitiveservices/Vision.ComputerVision) |
-| Cosmos DB | NuGet [3.47.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.47.0)<br>NuGet [3.54.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.54.0-preview.1) | [docs](/dotnet/api/overview/azure/cosmosdb) | GitHub [3.47.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
+| Cosmos DB | NuGet [3.47.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.47.0)<br>NuGet [3.55.0-preview.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.55.0-preview.0) | [docs](/dotnet/api/overview/azure/cosmosdb) | GitHub [3.47.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
 | Custom Vision Prediction | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Prediction/2.0.0) |  | GitHub [2.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Prediction_2.0.0/sdk/cognitiveservices/Vision.CustomVision.Prediction) |
 | Custom Vision Training | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training/2.0.0)<br>NuGet [2.1.0-preview](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training/2.1.0-preview) |  | GitHub [2.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training_2.0.0/sdk/cognitiveservices/Vision.CustomVision.Training) |
 | Data Lake Analytics | NuGet [1.4.211011](https://www.nuget.org/packages/Microsoft.Azure.DataLake.USQL.SDK/1.4.211011) |  |  |

docs/azure/migration/appmod/containerization.md

@@ -22,7 +22,7 @@ In this quickstart, you learn how to containerize your project using GitHub Copi
 
 Before you begin, make sure you have:
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](../../../core/porting/github-copilot-app-modernization/includes/prereqs.md)]
 
 ## Containerize your project
 

docs/azure/migration/appmod/deploy.md

@@ -14,7 +14,7 @@ In this quickstart, you learn how to deploy your project to Azure with GitHub Co
 
 ## Prerequisites
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](../../../core/porting/github-copilot-app-modernization/includes/prereqs.md)]
 
 ## Deploy your project
 

docs/azure/migration/appmod/quickstart.md

@@ -19,7 +19,7 @@ In this quickstart, you assess and migrate a .NET project by using GitHub Copilo
 
 ## Prerequisites
 
-[!INCLUDE[github-copilot-app-mod-prereqs](../../../includes/github-copilot-app-mod-prereqs.md)]
+[!INCLUDE[github-copilot-app-mod-prereqs](../../../core/porting/github-copilot-app-modernization/includes/prereqs.md)]
 
 ## Assess app readiness
 
@@ -108,4 +108,4 @@ You can choose one of the predefined options and send it in the chat:
 ## Next Steps
 
 - [Predefined Tasks](predefined-tasks.md)
-- [Frequently Asked Questions](../../../core/porting/github-copilot-app-modernization-faq.yml)
+- [Frequently Asked Questions](../../../core/porting/github-copilot-app-modernization/faq.yml)

docs/azure/toc.yml

@@ -27,9 +27,9 @@ items:
     - name: GitHub Copilot app modernization for .NET
       items:
         - name: Overview
-          href: ../core/porting/github-copilot-app-modernization-overview.md?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
+          href: ../core/porting/github-copilot-app-modernization/overview.md?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
         - name: FAQ
-          href: ../core/porting/github-copilot-app-modernization-faq.yml?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
+          href: ../core/porting/github-copilot-app-modernization/faq.yml?toc=/dotnet/azure/toc.json&bc=/dotnet/breadcrumb/toc.json
         - name: Predefined Tasks
           href: ./migration/appmod/predefined-tasks.md
         - name: Quickstart - Assess and migrate a .NET project

docs/core/compatibility/sdk/10.0/dotnet-restore-project-json-unsupported.md

@@ -30,15 +30,15 @@ This change can affect [source compatibility](../../categories.md#source-compati
 
 The `project.json` format was originally available only in .NET Core previews (through Preview 2 of .NET Core 1.0) and was completely replaced by PackageReference in 2017. The format has been marked as deprecated since 2017.
 
-When the `project.json` format was replaced, users migrated these projects using the [`dotnet migrate`](../../../tools/dotnet-migrate.md) command, but that command was removed from the CLI in the .NET Core 3.0 SDK.
+When the `project.json` format was replaced, users migrated these projects using the [`dotnet migrate`](/previous-versions/dotnet/fundamentals/tools/dotnet-migrate) command, but that command was removed from the CLI in the .NET Core 3.0 SDK.
 
 The removal of `project.json` support completes this transition and allows the .NET team to focus on delivering a better experience for PackageReference-based projects.
 
 ## Recommended action
 
 Migrate your `project.json` projects to use PackageReference format instead.
 
-If you have .NET Core based `project.json` projects, you can use older versions of the .NET SDK that still include the [`dotnet migrate` command](../../../tools/dotnet-migrate.md) to convert them to the modern project format.
+If you have .NET Core based `project.json` projects, you can use older versions of the .NET SDK that still include the [`dotnet migrate` command](/previous-versions/dotnet/fundamentals/tools/dotnet-migrate) to convert them to the modern project format.
 
 For more information about migrating from `project.json`, see [Migrating from project.json to .csproj](/nuget/archive/project-json#migrate-projectjson-to-packagereference).