Skip to content

Commit 6bf1c19

Browse files
guardrexguardrex
authored
Merge pull request #35677 from dotnet/main
2 parents 13fe5af + d44c4e8 commit 6bf1c19

File tree

241 files changed

+1039
-1553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+1039
-1553
lines changed

‎.openpublishing.redirection.json‎

Lines changed: 121 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,107 @@
962962
},
963963
{
964964
"source_path": "aspnetcore/migration/index.md",
965-
"redirect_url": "/aspnet/core/migration/proper-to-2x/",
965+
"redirect_url": "/aspnet/core/migration/fx-to-core/",
966+
"redirect_document_id": false
967+
},
968+
{
969+
"source_path": "aspnetcore/migration/proper-to-2x/index.md",
970+
"redirect_url": "/aspnet/core/migration/fx-to-core/",
971+
"redirect_document_id": false
972+
},
973+
{
974+
"source_path": "aspnetcore/migration/http-modules.md",
975+
"redirect_url": "/aspnet/core/migration/fx-to-core/areas/http-modules",
976+
"redirect_document_id": false
977+
},
978+
{
979+
"source_path": "aspnetcore/migration/fx-to-core/inc/http-modules.md",
980+
"redirect_url": "/aspnet/core/migration/fx-to-core/areas/http-modules",
981+
"redirect_document_id": false
982+
},
983+
{
984+
"source_path": "aspnetcore/migration/proper-to-2x/membership-to-core-identity.md",
985+
"redirect_url": "migration/fx-to-core/areas/membership/",
986+
"redirect_document_id": false
987+
},
988+
{
989+
"source_path": "aspnetcore/migration/proper-to-2x/mvc2.md",
990+
"redirect_url": "migration/fx-to-core/areas/mvc/",
991+
"redirect_document_id": false
992+
},
993+
{
994+
"source_path": "aspnetcore/migration/mvc.md",
995+
"redirect_url": "migration/fx-to-core/tooling",
996+
"redirect_document_id": false
997+
},
998+
{
999+
"source_path": "aspnetcore/migration/web_forms.md",
1000+
"redirect_url": "migration/fx-to-core/tooling",
1001+
"redirect_document_id": false
1002+
},
1003+
{
1004+
"source_path": "aspnetcore/migration/inc/abtesting.md",
1005+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/ab-testing",
1006+
"redirect_document_id": false
1007+
},
1008+
{
1009+
"source_path": "aspnetcore/migration/inc/adapters.md",
1010+
"redirect_url": "/aspnet/core/migration/fx-to-core/systemweb-adapters",
1011+
"redirect_document_id": false
1012+
},
1013+
{
1014+
"source_path": "aspnetcore/migration/inc/blazor.md",
1015+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/blazor",
1016+
"redirect_document_id": false
1017+
},
1018+
{
1019+
"source_path": "aspnetcore/migration/inc/http-modules.md",
1020+
"redirect_url": "/aspnet/core/migration/fx-to-core/areas/http-modules",
1021+
"redirect_document_id": false
1022+
},
1023+
{
1024+
"source_path": "aspnetcore/migration/inc/overview.md",
1025+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/overview",
1026+
"redirect_document_id": false
1027+
},
1028+
{
1029+
"source_path": "aspnetcore/migration/inc/remote-app-setup.md",
1030+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/remote-app-setup",
1031+
"redirect_document_id": false
1032+
},
1033+
{
1034+
"source_path": "aspnetcore/migration/inc/remote-authentication.md",
1035+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/remote-authentication",
1036+
"redirect_document_id": false
1037+
},
1038+
{
1039+
"source_path": "aspnetcore/migration/inc/remote-session.md",
1040+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/remote-session",
1041+
"redirect_document_id": false
1042+
},
1043+
{
1044+
"source_path": "aspnetcore/migration/inc/session.md",
1045+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/session",
1046+
"redirect_document_id": false
1047+
},
1048+
{
1049+
"source_path": "aspnetcore/migration/inc/start.md",
1050+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/start",
1051+
"redirect_document_id": false
1052+
},
1053+
{
1054+
"source_path": "aspnetcore/migration/inc/unit-testing.md",
1055+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/unit-testing",
1056+
"redirect_document_id": false
1057+
},
1058+
{
1059+
"source_path": "aspnetcore/migration/inc/usage_guidance.md",
1060+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/usage_guidance",
1061+
"redirect_document_id": false
1062+
},
1063+
{
1064+
"source_path": "aspnetcore/migration/inc/wrapped.md",
1065+
"redirect_url": "/aspnet/core/migration/fx-to-core/inc/wrapped",
9661066
"redirect_document_id": false
9671067
},
9681068
{
@@ -1402,6 +1502,26 @@
14021502
"source_path": "aspnetcore/blazor/performance.md",
14031503
"redirect_url": "/aspnet/core/blazor/performance/",
14041504
"redirect_document_id": false
1505+
},
1506+
{
1507+
"source_path": "aspnetcore/migration/claimsprincipal-current.md",
1508+
"redirect_url": "/aspnet/core/migration/fx-to-core/areas/claimsprincipal-current",
1509+
"redirect_document_id": false
1510+
},
1511+
{
1512+
"source_path": "aspnetcore/migration/webapi.md",
1513+
"redirect_url": "/aspnet/core/migration/fx-to-core/areas/webapi",
1514+
"redirect_document_id": false
1515+
},
1516+
{
1517+
"source_path": "aspnetcore/migration/configuration.md",
1518+
"redirect_url": "/aspnet/core/migration/fx-to-core/examples/configuration",
1519+
"redirect_document_id": false
1520+
},
1521+
{
1522+
"source_path": "aspnetcore/migration/identity.md",
1523+
"redirect_url": "/aspnet/core/migration/fx-to-core/examples/identity",
1524+
"redirect_document_id": false
14051525
}
14061526
]
14071527
}

‎aspnetcore/fundamentals/configuration/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
958958

959959
Environment variables set in `launchSettings.json` override those set in the system environment.
960960

961-
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
961+
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
962962

963963
## Add configuration from an external assembly
964964

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
273273

274274
Environment variables set in `launchSettings.json` override those set in the system environment.
275275

276-
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
276+
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
277277

278278
## Add configuration from an external assembly
279279

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
923923

924924
Environment variables set in `launchSettings.json` override those set in the system environment.
925925

926-
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
926+
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
927927

928928
## Add configuration from an external assembly
929929

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ This topic only pertains to *app configuration*. Other aspects of running and ho
928928

929929
Environment variables set in `launchSettings.json` override those set in the system environment.
930930

931-
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/proper-to-2x/index#store-configurations>.
931+
For more information on migrating app configuration from earlier versions of ASP.NET, see <xref:migration/fx-to-core/examples/configuration>.
932932

933933
## Add configuration from an external assembly
934934

‎aspnetcore/fundamentals/middleware/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Request delegates are used to build the request pipeline. The request delegates
2626

2727
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.
2828

29-
<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
29+
<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.
3030

3131
## The role of middleware by app type
3232

@@ -311,7 +311,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
311311
* <xref:fundamentals/middleware/write>
312312
* <xref:test/middleware>
313313
* [Configure gRPC-Web in ASP.NET Core](xref:grpc/browser#configure-grpc-web-in-aspnet-core)
314-
* <xref:migration/http-modules>
314+
* <xref:migration/fx-to-core/areas/http-modules>
315315
* <xref:fundamentals/startup>
316316
* <xref:fundamentals/request-features>
317317
* <xref:fundamentals/middleware/extensibility>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Request delegates are used to build the request pipeline. The request delegates
1111

1212
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.
1313

14-
<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
14+
<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.
1515

1616
## The role of middleware by app type
1717

@@ -274,7 +274,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
274274
* <xref:fundamentals/middleware/write>
275275
* <xref:test/middleware>
276276
* [Configure gRPC-Web in ASP.NET Core](xref:grpc/browser#configure-grpc-web-in-aspnet-core)
277-
* <xref:migration/http-modules>
277+
* <xref:migration/fx-to-core/areas/http-modules>
278278
* <xref:fundamentals/startup>
279279
* <xref:fundamentals/request-features>
280280
* <xref:fundamentals/middleware/extensibility>
@@ -295,7 +295,7 @@ Request delegates are used to build the request pipeline. The request delegates
295295

296296
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.
297297

298-
<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
298+
<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.
299299

300300
## Middleware code analysis
301301

@@ -550,7 +550,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
550550
* <xref:fundamentals/middleware/write>
551551
* <xref:test/middleware>
552552
* [Configure gRPC-Web in ASP.NET Core](xref:grpc/browser#configure-grpc-web-in-aspnet-core)
553-
* <xref:migration/http-modules>
553+
* <xref:migration/fx-to-core/areas/http-modules>
554554
* <xref:fundamentals/startup>
555555
* <xref:fundamentals/request-features>
556556
* <xref:fundamentals/middleware/extensibility>
@@ -571,7 +571,7 @@ Request delegates are used to build the request pipeline. The request delegates
571571

572572
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.
573573

574-
<xref:migration/http-modules> explains the difference between request pipelines in ASP.NET Core and ASP.NET 4.x and provides additional middleware samples.
574+
<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.
575575

576576
## Create a middleware pipeline with IApplicationBuilder
577577

@@ -820,7 +820,7 @@ ASP.NET Core ships with the following middleware components. The *Order* column
820820
* [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.
821821
* <xref:fundamentals/middleware/write>
822822
* <xref:test/middleware>
823-
* <xref:migration/http-modules>
823+
* <xref:migration/fx-to-core/areas/http-modules>
824824
* <xref:fundamentals/startup>
825825
* <xref:fundamentals/request-features>
826826
* <xref:fundamentals/middleware/extensibility>

‎aspnetcore/fundamentals/middleware/write.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ The `IMessageWriter` interface and implementation:
9393
* [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)
9494
* <xref:fundamentals/middleware/index>
9595
* <xref:test/middleware>
96-
* <xref:migration/http-modules>
96+
* <xref:migration/fx-to-core/areas/http-modules>
9797
* <xref:fundamentals/startup>
9898
* <xref:fundamentals/request-features>
9999
* <xref:fundamentals/middleware/extensibility>
@@ -179,7 +179,7 @@ The following code calls the middleware from `Startup.Configure`:
179179
* [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.
180180
* <xref:fundamentals/middleware/index>
181181
* <xref:test/middleware>
182-
* <xref:migration/http-modules>
182+
* <xref:migration/fx-to-core/areas/http-modules>
183183
* <xref:fundamentals/startup>
184184
* <xref:fundamentals/request-features>
185185
* <xref:fundamentals/middleware/extensibility>

‎aspnetcore/index.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ additionalContent:
357357
text: "ASP.NET Core 2.0 to 2.1"
358358
- url: migration/1x-to-2x/index.md
359359
text: "ASP.NET Core 1.x to 2.0"
360-
- url: migration/proper-to-2x/index.md
360+
- url: migration/fx-to-core/index.md
361361
text: "ASP.NET to ASP.NET Core"
362362
# Card
363363
- title: Architecture

‎aspnetcore/introduction-to-aspnet-core.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ We recommend the following sequence of tutorials for an introduction to developi
9292

9393
## Migrate from .NET Framework
9494

95-
For a reference guide to migrating ASP.NET 4.x apps to ASP.NET Core, see <xref:migration/proper-to-2x/index>.
95+
For a reference guide to migrating ASP.NET 4.x apps to ASP.NET Core, see <xref:migration/fx-to-core/index>.
9696

9797
:::moniker-end
9898

@@ -178,7 +178,7 @@ We recommend the following sequence of tutorials and articles for an introductio
178178

179179
## Migrate from .NET Framework
180180

181-
For a reference guide to migrating ASP.NET apps to ASP.NET Core, see <xref:migration/proper-to-2x/index>.
181+
For a reference guide to migrating ASP.NET apps to ASP.NET Core, see <xref:migration/fx-to-core/index>.
182182

183183
:::moniker-end
184184

0 commit comments

Comments
 (0)