Merge pull request #35677 from dotnet/main

Author: guardrex

.openpublishing.redirection.json

@@ -962,7 +962,107 @@
         },
         {
             "source_path": "aspnetcore/migration/index.md",
-            "redirect_url": "/aspnet/core/migration/proper-to-2x/",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/proper-to-2x/index.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/http-modules.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/http-modules",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/fx-to-core/inc/http-modules.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/http-modules",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/proper-to-2x/membership-to-core-identity.md",
+            "redirect_url": "migration/fx-to-core/areas/membership/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/proper-to-2x/mvc2.md",
+            "redirect_url": "migration/fx-to-core/areas/mvc/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/mvc.md",
+            "redirect_url": "migration/fx-to-core/tooling",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/web_forms.md",
+            "redirect_url": "migration/fx-to-core/tooling",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/abtesting.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/ab-testing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/adapters.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/systemweb-adapters",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/blazor.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/blazor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/http-modules.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/http-modules",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/overview.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/remote-app-setup.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/remote-app-setup",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/remote-authentication.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/remote-authentication",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/remote-session.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/remote-session",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/session.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/session",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/start.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/start",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/unit-testing.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/unit-testing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/usage_guidance.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/usage_guidance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/inc/wrapped.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/inc/wrapped",
             "redirect_document_id": false
         },
         {
@@ -1402,6 +1502,26 @@
             "source_path": "aspnetcore/blazor/performance.md",
             "redirect_url": "/aspnet/core/blazor/performance/",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/claimsprincipal-current.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/claimsprincipal-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/webapi.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/areas/webapi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/configuration.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/examples/configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/migration/identity.md",
+            "redirect_url": "/aspnet/core/migration/fx-to-core/examples/identity",
+            "redirect_document_id": false
         }
     ]
 }

aspnetcore/fundamentals/configuration/index.md

@@ -958,7 +958,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
 
 Environment variables set in `launchSettings.json` override those set in the system environment.
 
-For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
+For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
 
 ## Add configuration from an external assembly
 

aspnetcore/fundamentals/configuration/index/includes/index3-5.md

@@ -273,7 +273,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
 
 Environment variables set in `launchSettings.json` override those set in the system environment.
 
-For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
+For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
 
 ## Add configuration from an external assembly
 

aspnetcore/fundamentals/configuration/index/includes/index6.md

@@ -923,7 +923,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
 
 Environment variables set in `launchSettings.json` override those set in the system environment.
 
-For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
+For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
 
 ## Add configuration from an external assembly
 

aspnetcore/fundamentals/configuration/index/includes/index7.md

@@ -928,7 +928,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
 
 Environment variables set in `launchSettings.json` override those set in the system environment.
 
-For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
+For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
 
 ## Add configuration from an external assembly
 

aspnetcore/fundamentals/middleware/index.md

@@ -26,7 +26,7 @@ Request delegates are used to build the request pipeline. The request delegates
 
 Request delegates are configured using <xref:Microsoft.AspNetCore.Builder.RunExtensions.Run%2A>, <xref:Microsoft.AspNetCore.Builder.MapExtensions.Map%2A>, and <xref:Microsoft.AspNetCore.Builder.UseExtensions.Use%2A> extension methods. An individual request delegate can be specified in-line as an anonymous method (called in-line middleware), or it can be defined in a reusable class. These reusable classes and in-line anonymous methods are *middleware*, also called *middleware components*. Each middleware component in the request pipeline is responsible for invoking the next component in the pipeline or short-circuiting the pipeline. When a middleware short-circuits, it's called a *terminal middleware* because it prevents further middleware from processing the request.
 
-<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
+<xref:migration/fx-to-core/areas/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
 
 ## The role of middleware by app type
 
@@ -311,7 +311,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
 * <xref:fundamentals/middleware/write>
 * <xref:test/middleware>
 * [Configure gRPC-Web in ASP.NET Core](xref:grpc/browser#configure-grpc-web-in-aspnet-core)
-* <xref:migration/http-modules>
+* <xref:migration/fx-to-core/areas/http-modules>
 * <xref:fundamentals/startup>
 * <xref:fundamentals/request-features>
 * <xref:fundamentals/middleware/extensibility>

aspnetcore/fundamentals/middleware/index/includes/index3-7.md

@@ -11,7 +11,7 @@ Request delegates are used to build the request pipeline. The request delegates
 
 Request delegates are configured using <xref:Microsoft.AspNetCore.Builder.RunExtensions.Run%2A>, <xref:Microsoft.AspNetCore.Builder.MapExtensions.Map%2A>, and <xref:Microsoft.AspNetCore.Builder.UseExtensions.Use%2A> extension methods. An individual request delegate can be specified in-line as an anonymous method (called in-line middleware), or it can be defined in a reusable class. These reusable classes and in-line anonymous methods are *middleware*, also called *middleware components*. Each middleware component in the request pipeline is responsible for invoking the next component in the pipeline or short-circuiting the pipeline. When a middleware short-circuits, it's called a *terminal middleware* because it prevents further middleware from processing the request.
 
-<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
+<xref:migration/fx-to-core/areas/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
 
 ## The role of middleware by app type
 
@@ -274,7 +274,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
 * <xref:fundamentals/middleware/write>
 * <xref:test/middleware>
 * [Configure gRPC-Web in ASP.NET Core](xref:grpc/browser#configure-grpc-web-in-aspnet-core)
-* <xref:migration/http-modules>
+* <xref:migration/fx-to-core/areas/http-modules>
 * <xref:fundamentals/startup>
 * <xref:fundamentals/request-features>
 * <xref:fundamentals/middleware/extensibility>
@@ -295,7 +295,7 @@ Request delegates are used to build the request pipeline. The request delegates
 
 Request delegates are configured using <xref:Microsoft.AspNetCore.Builder.RunExtensions.Run%2A>, <xref:Microsoft.AspNetCore.Builder.MapExtensions.Map%2A>, and <xref:Microsoft.AspNetCore.Builder.UseExtensions.Use%2A> extension methods. An individual request delegate can be specified in-line as an anonymous method (called in-line middleware), or it can be defined in a reusable class. These reusable classes and in-line anonymous methods are *middleware*, also called *middleware components*. Each middleware component in the request pipeline is responsible for invoking the next component in the pipeline or short-circuiting the pipeline. When a middleware short-circuits, it's called a *terminal middleware* because it prevents further middleware from processing the request.
 
-<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
+<xref:migration/fx-to-core/areas/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
 
 ## Middleware code analysis
 
@@ -550,7 +550,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
 * <xref:fundamentals/middleware/write>
 * <xref:test/middleware>
 * [Configure gRPC-Web in ASP.NET Core](xref:grpc/browser#configure-grpc-web-in-aspnet-core)
-* <xref:migration/http-modules>
+* <xref:migration/fx-to-core/areas/http-modules>
 * <xref:fundamentals/startup>
 * <xref:fundamentals/request-features>
 * <xref:fundamentals/middleware/extensibility>
@@ -571,7 +571,7 @@ Request delegates are used to build the request pipeline. The request delegates
 
 Request delegates are configured using <xref:Microsoft.AspNetCore.Builder.RunExtensions.Run%2A>, <xref:Microsoft.AspNetCore.Builder.MapExtensions.Map%2A>, and <xref:Microsoft.AspNetCore.Builder.UseExtensions.Use%2A> extension methods. An individual request delegate can be specified in-line as an anonymous method (called in-line middleware), or it can be defined in a reusable class. These reusable classes and in-line anonymous methods are *middleware*, also called *middleware components*. Each middleware component in the request pipeline is responsible for invoking the next component in the pipeline or short-circuiting the pipeline. When a middleware short-circuits, it's called a *terminal middleware* because it prevents further middleware from processing the request.
 
-<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
+<xref:migration/fx-to-core/areas/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
 
 ## Create a middleware pipeline with IApplicationBuilder
 
@@ -820,7 +820,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
 * [Lifetime and registration options](xref:fundamentals/dependency-injection#lifetime-and-registration-options) contains a complete sample of middleware with *scoped*, *transient*, and *singleton* lifetime services.
 * <xref:fundamentals/middleware/write>
 * <xref:test/middleware>
-* <xref:migration/http-modules>
+* <xref:migration/fx-to-core/areas/http-modules>
 * <xref:fundamentals/startup>
 * <xref:fundamentals/request-features>
 * <xref:fundamentals/middleware/extensibility>

aspnetcore/fundamentals/middleware/write.md

@@ -93,7 +93,7 @@ The `IMessageWriter` interface and implementation:
 * [DEEP DIVE: HOW IS THE ASP.NET CORE MIDDLEWARE PIPELINE BUILT](https://www.stevejgordon.co.uk/how-is-the-asp-net-core-middleware-pipeline-built)
 * <xref:fundamentals/middleware/index>
 * <xref:test/middleware>
-* <xref:migration/http-modules>
+* <xref:migration/fx-to-core/areas/http-modules>
 * <xref:fundamentals/startup>
 * <xref:fundamentals/request-features>
 * <xref:fundamentals/middleware/extensibility>
@@ -179,7 +179,7 @@ The following code calls the middleware from `Startup.Configure`:
 * [Lifetime and registration options](xref:fundamentals/dependency-injection#lifetime-and-registration-options) contains a complete sample of middleware with *scoped*, *transient*, and *singleton* lifetime services.
 * <xref:fundamentals/middleware/index>
 * <xref:test/middleware>
-* <xref:migration/http-modules>
+* <xref:migration/fx-to-core/areas/http-modules>
 * <xref:fundamentals/startup>
 * <xref:fundamentals/request-features>
 * <xref:fundamentals/middleware/extensibility>

aspnetcore/index.yml

@@ -357,7 +357,7 @@ additionalContent:
             text: "ASP.NET Core 2.0 to 2.1"
           - url: migration/1x-to-2x/index.md
             text: "ASP.NET Core 1.x to 2.0"
-          - url: migration/proper-to-2x/index.md
+          - url: migration/fx-to-core/index.md
             text: "ASP.NET to ASP.NET Core"
       # Card
       - title: Architecture

aspnetcore/introduction-to-aspnet-core.md

@@ -92,7 +92,7 @@ We recommend the following sequence of tutorials for an introduction to developi
 
 ## Migrate from .NET Framework
 
-For a reference guide to migrating ASP.NET 4.x apps to ASP.NET Core, see <xref:migration/proper-to-2x/index>.
+For a reference guide to migrating ASP.NET 4.x apps to ASP.NET Core, see <xref:migration/fx-to-core/index>.
 
 :::moniker-end
 
@@ -178,7 +178,7 @@ We recommend the following sequence of tutorials and articles for an introductio
 
 ## Migrate from .NET Framework
 
-For a reference guide to migrating ASP.NET apps to ASP.NET Core, see <xref:migration/proper-to-2x/index>.
+For a reference guide to migrating ASP.NET apps to ASP.NET Core, see <xref:migration/fx-to-core/index>.
 
 :::moniker-end