Skip to content

Commit 809779b

Browse files
Copilotdanroth27
andcommitted
Address feedback: revert specified files and apply targeted corrections
- Reverted 11 files to original state as requested - Fixed .NET distribution packaging link in servers/index.md - Updated choose-aspnet-framework.md table text - Fixed owin.md compatible replacements text - Updated target-aspnetcore.md support policy reference Co-authored-by: danroth27 <1874516+danroth27@users.noreply.github.com>
1 parent 43b7ae2 commit 809779b

12 files changed

Lines changed: 34 additions & 34 deletions

File tree

aspnetcore/data/ef-mvc/intro.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Users can view and update student, course, and instructor information. Here are
6767
1. In the **Configure your new project** dialog, enter `ContosoUniversity` for **Project name**. It's important to use this exact name including capitalization, so each `namespace` matches when code is copied.
6868
1. Select **Create**.
6969
1. In the **Create a new ASP.NET Core web application** dialog, select:
70-
1. **.NET** and **ASP.NET Core 5.0** in the dropdowns.
70+
1. **.NET Core** and **ASP.NET Core 5.0** in the dropdowns.
7171
1. **ASP.NET Core Web App (Model-View-Controller)**.
7272
1. **Create**
7373
![New ASP.NET Core Project dialog](~/data/ef-mvc/intro/_static/new-aspnet5.png)
@@ -396,10 +396,10 @@ The sample application is a web site for a fictional Contoso University. It incl
396396

397397
## Prerequisites
398398

399-
* [.NET SDK 2.2](https://dotnet.microsoft.com/download)
399+
* [.NET Core SDK 2.2](https://dotnet.microsoft.com/download)
400400
* [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=learn.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019) with the following workloads:
401401
* **ASP.NET and web development** workload
402-
* **.NET cross-platform development** workload
402+
* **.NET Core cross-platform development** workload
403403

404404
## Troubleshooting
405405

@@ -434,7 +434,7 @@ Users can view and update student, course, and instructor information. Here are
434434

435435
* Wait for the **New ASP.NET Core Web Application** dialog to appear.
436436

437-
* Select **.NET**, **ASP.NET Core 2.2** and the **Web Application (Model-View-Controller)** template.
437+
* Select **.NET Core**, **ASP.NET Core 2.2** and the **Web Application (Model-View-Controller)** template.
438438

439439
* Make sure **Authentication** is set to **No Authentication**.
440440

aspnetcore/data/ef-rp/intro.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ Run the project to seed the database.
642642
1. In the **Configure your new project** dialog, enter `ContosoUniversity` for **Project name**. It's important to use this exact name including capitalization, so each `namespace` matches when code is copied.
643643
1. Select **Create**.
644644
1. In the **Create a new ASP.NET Core web application** dialog, select:
645-
1. **.NET** and **ASP.NET Core 5.0** in the dropdowns.
645+
1. **.NET Core** and **ASP.NET Core 5.0** in the dropdowns.
646646
1. **ASP.NET Core Web App**.
647647
1. **Create**
648648
![New ASP.NET Core Project dialog](~/data/ef-rp/intro/_static/new-aspnet5.png)
@@ -1153,7 +1153,7 @@ To run the app after downloading the completed project:
11531153
* From the Visual Studio **File** menu, select **New** > **Project**.
11541154
* Select **ASP.NET Core Web Application**.
11551155
* Name the project *ContosoUniversity*. It's important to use this exact name including capitalization, so the namespaces match when code is copied and pasted.
1156-
* Select **.NET** and **ASP.NET Core 3.0** in the dropdowns, and then select **Web Application**.
1156+
* Select **.NET Core** and **ASP.NET Core 3.0** in the dropdowns, and then select **Web Application**.
11571157

11581158
# [Visual Studio Code](#tab/visual-studio-code)
11591159

aspnetcore/data/entity-framework-6.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ This article shows how to use Entity Framework 6 in an ASP.NET Core application.
3333

3434
## Overview
3535

36-
To use Entity Framework 6, your project has to compile against .NET Framework, as Entity Framework 6 doesn't support .NET. If you need cross-platform features you will need to upgrade to [Entity Framework Core](/ef/).
36+
To use Entity Framework 6, your project has to compile against .NET Framework, as Entity Framework 6 doesn't support .NET Core. If you need cross-platform features you will need to upgrade to [Entity Framework Core](/ef/).
3737

3838
The recommended way to use Entity Framework 6 in an ASP.NET Core application is to put the EF6 context and model classes in a class library project that targets .NET Framework. Add a reference to the class library from the ASP.NET Core project. See the sample [Visual Studio solution with EF6 and ASP.NET Core projects](https://github.com/dotnet/AspNetCore.Docs/tree/main/aspnetcore/data/entity-framework-6/sample/).
3939

40-
You can't put an EF6 context in an ASP.NET Core project because .NET projects don't support all of the functionality that EF6 commands such as *Enable-Migrations* require.
40+
You can't put an EF6 context in an ASP.NET Core project because .NET Core projects don't support all of the functionality that EF6 commands such as *Enable-Migrations* require.
4141

4242
Regardless of project type in which you locate your EF6 context, only EF6 command-line tools work with an EF6 context. For example, `Scaffold-DbContext` is only available in Entity Framework Core. If you need to do reverse engineering of a database into an EF6 model, see [Code First to an Existing Database](/ef/ef6/modeling/code-first/workflows/existing-database).
4343

aspnetcore/fundamentals/choose-aspnet-framework.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The following table compares ASP.NET Core to ASP.NET 4.x.
3232
|Multiple versions per machine|One version per machine|
3333
|Develop with [Visual Studio](https://visualstudio.microsoft.com/vs/) or [Visual Studio Code](https://code.visualstudio.com/) using C# or F#|Develop with [Visual Studio](https://visualstudio.microsoft.com/vs/) using C#, VB, or F#|
3434
|Higher performance than ASP.NET 4.x|Good performance|
35-
|[Use .NET runtime](/dotnet/standard/choosing-core-framework-server)|Use .NET Framework runtime|
35+
|[Use the latest .NET runtime](/dotnet/standard/choosing-core-framework-server)|Use .NET Framework runtime|
3636

3737
See [ASP.NET Core targeting .NET Framework](xref:index#target-framework) for information on ASP.NET Core 2.x support on .NET Framework.
3838

aspnetcore/fundamentals/http-requests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ An <xref:System.Net.Http.IHttpClientFactory> can be registered and used to confi
12461246

12471247
## Prerequisites
12481248

1249-
Projects targeting .NET Framework require installation of the [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) NuGet package. Projects that target .NET and reference the [Microsoft.AspNetCore.App metapackage](xref:fundamentals/metapackage-app) already include the `Microsoft.Extensions.Http` package.
1249+
Projects targeting .NET Framework require installation of the [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) NuGet package. Projects that target .NET Core and reference the [Microsoft.AspNetCore.App metapackage](xref:fundamentals/metapackage-app) already include the `Microsoft.Extensions.Http` package.
12501250

12511251
## Consumption patterns
12521252

aspnetcore/fundamentals/metapackage-app.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ uid: fundamentals/metapackage-app
1313

1414
:::moniker range=">= aspnetcore-3.0"
1515

16-
The ASP.NET Core shared framework (`Microsoft.AspNetCore.App`) contains assemblies that are developed and supported by Microsoft. `Microsoft.AspNetCore.App` is installed when the [.NET 3.0 or later SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0) is installed. The *shared framework* is the set of assemblies (*.dll* files) that are installed on the machine and includes a runtime component and a targeting pack. For more information, see [The shared framework](https://natemcmaster.com/blog/2018/08/29/netcore-primitives-2/).
16+
The ASP.NET Core shared framework (`Microsoft.AspNetCore.App`) contains assemblies that are developed and supported by Microsoft. `Microsoft.AspNetCore.App` is installed when the [.NET Core 3.0 or later SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0) is installed. The *shared framework* is the set of assemblies (*.dll* files) that are installed on the machine and includes a runtime component and a targeting pack. For more information, see [The shared framework](https://natemcmaster.com/blog/2018/08/29/netcore-primitives-2/).
1717

1818
* Projects that target the `Microsoft.NET.Sdk.Web` SDK implicitly reference the `Microsoft.AspNetCore.App` framework.
1919

@@ -37,7 +37,7 @@ The ASP.NET Core shared framework:
3737

3838
:::moniker range="< aspnetcore-3.0"
3939

40-
This feature requires ASP.NET Core 2.x targeting .NET 2.x.
40+
This feature requires ASP.NET Core 2.x targeting .NET Core 2.x.
4141

4242
The [Microsoft.AspNetCore.App](https://www.nuget.org/packages/Microsoft.AspNetCore.App) [metapackage](/dotnet/core/packages#metapackages) for ASP.NET Core:
4343

@@ -89,7 +89,7 @@ Specifying a version number on the `Microsoft.AspNetCore.App` reference does **n
8989

9090
*Warning NU1604: Project dependency Microsoft.AspNetCore.App does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results.*
9191

92-
* This is a known issue with the .NET 2.1 SDK.
92+
* This is a known issue with the .NET Core 2.1 SDK.
9393

9494
:::moniker-end
9595

@@ -103,8 +103,8 @@ The `Microsoft.AspNetCore.App` [metapackage](/dotnet/core/packages#metapackages)
103103

104104
To update ASP.NET Core:
105105

106-
* On development machines and build servers: Download and install the [.NET SDK](https://dotnet.microsoft.com/download).
107-
* On deployment servers: Download and install the [.NET runtime](https://dotnet.microsoft.com/download).
106+
* On development machines and build servers: Download and install the [.NET Core SDK](https://dotnet.microsoft.com/download).
107+
* On deployment servers: Download and install the [.NET Core runtime](https://dotnet.microsoft.com/download).
108108

109109
Applications will roll forward to the latest installed version on application restart. It's not necessary to update the `Microsoft.AspNetCore.App` version number in the project file. For more information, see [Framework-dependent apps roll forward](/dotnet/core/versions/selection#framework-dependent-apps-roll-forward).
110110

aspnetcore/fundamentals/metapackage.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ uid: fundamentals/metapackage
2222
> [!NOTE]
2323
> We recommend applications targeting ASP.NET Core 2.1 or later use the [Microsoft.AspNetCore.App metapackage](xref:fundamentals/metapackage-app) rather than this package. See [Migrating from Microsoft.AspNetCore.All to Microsoft.AspNetCore.App](#migrate) in this article.
2424
25-
This feature requires ASP.NET Core 2.x targeting .NET 2.x.
25+
This feature requires ASP.NET Core 2.x targeting .NET Core 2.x.
2626

2727
[Microsoft.AspNetCore.All](https://www.nuget.org/packages/Microsoft.AspNetCore.All) is a metapackage that refers to a shared framework. A *shared framework* is a set of assemblies (*.dll* files) that are not in the app's folders. The shared framework must be installed on the machine to run the app. For more information, see [The shared framework](https://natemcmaster.com/blog/2018/08/29/netcore-primitives-2/).
2828

@@ -54,7 +54,7 @@ The project's SDK must be set to `Microsoft.NET.Sdk.Web` in the project file to
5454

5555
*Warning NU1604: Project dependency Microsoft.AspNetCore.All does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results.*
5656

57-
This is a known issue with the .NET 2.1 SDK and will be fixed in the .NET 2.2 SDK.
57+
This is a known issue with the .NET Core 2.1 SDK and will be fixed in the .NET Core 2.2 SDK.
5858

5959
:::moniker-end
6060

@@ -91,6 +91,6 @@ Any dependencies of the preceding packages that otherwise aren't dependencies of
9191

9292
We recommend migrating to the `Microsoft.AspNetCore.App` metapackage for 2.1 or later. To keep using the `Microsoft.AspNetCore.All` metapackage and ensure the latest patch version is deployed:
9393

94-
* On development machines and build servers: Install the latest [.NET SDK](https://dotnet.microsoft.com/download).
95-
* On deployment servers: Install the latest [.NET runtime](https://dotnet.microsoft.com/download).
94+
* On development machines and build servers: Install the latest [.NET Core SDK](https://dotnet.microsoft.com/download).
95+
* On deployment servers: Install the latest [.NET Core runtime](https://dotnet.microsoft.com/download).
9696
Your app will roll forward to the latest installed version on an application restart.

aspnetcore/fundamentals/owin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ By [Steve Smith](https://ardalis.com/) and [Rick Anderson](https://twitter.com/R
1414
ASP.NET Core:
1515

1616
* Supports the Open Web Interface for .NET (OWIN).
17-
* Has .NET compatible replacements for the `Microsoft.Owin.*` ([Katana](/aspnet/aspnet/overview/owin-and-katana/)) libraries.
17+
* Has compatible replacements for the `Microsoft.Owin.*` ([Katana](/aspnet/aspnet/overview/owin-and-katana/)) libraries.
1818

1919
OWIN allows web apps to be decoupled from web servers. It defines a standard way for middleware to be used in a pipeline to handle requests and associated responses. ASP.NET Core applications and middleware can interoperate with OWIN-based applications, servers, and middleware.
2020

aspnetcore/fundamentals/servers/index.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,13 @@ A `launchSettings.json` file provides configuration when launching an app with `
189189
* Windows Server 2016/Windows 10 or later&dagger;
190190
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
191191
* macOS 10.15 or later
192-
* Target framework: .NET 2.2 or later
192+
* Target framework: .NET Core 2.2 or later
193193
* [HTTP.sys](xref:fundamentals/servers/httpsys#http2-support)
194194
* Windows Server 2016/Windows 10 or later
195195
* Target framework: Not applicable to HTTP.sys deployments.
196196
* [IIS (in-process)](xref:host-and-deploy/iis/index#http2-support)
197197
* Windows Server 2016/Windows 10 or later; IIS 10 or later
198-
* Target framework: .NET 2.2 or later
198+
* Target framework: .NET Core 2.2 or later
199199
* [IIS (out-of-process)](xref:host-and-deploy/iis/index#http2-support)
200200
* Windows Server 2016/Windows 10 or later; IIS 10 or later
201201
* Public-facing edge server connections use HTTP/2, but the reverse proxy connection to Kestrel uses HTTP/1.1.
@@ -212,13 +212,13 @@ A `launchSettings.json` file provides configuration when launching an app with `
212212
* Windows Server 2016/Windows 10 or later&dagger;
213213
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
214214
* HTTP/2 will be supported on macOS in a future release.
215-
* Target framework: .NET 2.2 or later
215+
* Target framework: .NET Core 2.2 or later
216216
* [HTTP.sys](xref:fundamentals/servers/httpsys#http2-support)
217217
* Windows Server 2016/Windows 10 or later
218218
* Target framework: Not applicable to HTTP.sys deployments.
219219
* [IIS (in-process)](xref:host-and-deploy/iis/index#http2-support)
220220
* Windows Server 2016/Windows 10 or later; IIS 10 or later
221-
* Target framework: .NET 2.2 or later
221+
* Target framework: .NET Core 2.2 or later
222222
* [IIS (out-of-process)](xref:host-and-deploy/iis/index#http2-support)
223223
* Windows Server 2016/Windows 10 or later; IIS 10 or later
224224
* Public-facing edge server connections use HTTP/2, but the reverse proxy connection to Kestrel uses HTTP/1.1.
@@ -235,13 +235,13 @@ A `launchSettings.json` file provides configuration when launching an app with `
235235
* Windows Server 2016/Windows 10 or later&dagger;
236236
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
237237
* HTTP/2 will be supported on macOS in a future release.
238-
* Target framework: .NET 2.2 or later
238+
* Target framework: .NET Core 2.2 or later
239239
* [HTTP.sys](xref:fundamentals/servers/httpsys#http2-support)
240240
* Windows Server 2016/Windows 10 or later
241241
* Target framework: Not applicable to HTTP.sys deployments.
242242
* [IIS (in-process)](xref:host-and-deploy/iis/index#http2-support)
243243
* Windows Server 2016/Windows 10 or later; IIS 10 or later
244-
* Target framework: .NET 2.2 or later
244+
* Target framework: .NET Core 2.2 or later
245245
* [IIS (out-of-process)](xref:host-and-deploy/iis/index#http2-support)
246246
* Windows Server 2016/Windows 10 or later; IIS 10 or later
247247
* Public-facing edge server connections use HTTP/2, but the reverse proxy connection to Kestrel uses HTTP/1.1.

aspnetcore/fundamentals/servers/kestrel/http2.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ uid: fundamentals/servers/kestrel/http2
2121
* Windows Server 2016/Windows 10 or later&Dagger;
2222
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
2323
* macOS 10.15 or later
24-
* Target framework: .NET 2.2 or later
24+
* Target framework: .NET Core 2.2 or later
2525
* [Application-Layer Protocol Negotiation (ALPN)](https://tools.ietf.org/html/rfc7301#section-3) connection
2626
* TLS 1.2 or later connection
2727

2828
&Dagger;Kestrel has limited support for HTTP/2 on Windows Server 2012 R2 and Windows 8.1. Support is limited because the list of supported TLS cipher suites available on these operating systems is limited. A certificate generated using an Elliptic Curve Digital Signature Algorithm (ECDSA) may be required to secure TLS connections.
2929

3030
If an HTTP/2 connection is established, [HttpRequest.Protocol](xref:Microsoft.AspNetCore.Http.HttpRequest.Protocol%2A) reports `HTTP/2`.
3131

32-
Starting with .NET 3.0, HTTP/2 is enabled by default. For more information on configuration, see the [Kestrel HTTP/2 limits](xref:fundamentals/servers/kestrel/options#http2-limits) and [ListenOptions.Protocols](xref:fundamentals/servers/kestrel/endpoints#listenoptionsprotocols) sections.
32+
Starting with .NET Core 3.0, HTTP/2 is enabled by default. For more information on configuration, see the [Kestrel HTTP/2 limits](xref:fundamentals/servers/kestrel/options#http2-limits) and [ListenOptions.Protocols](xref:fundamentals/servers/kestrel/endpoints#listenoptionsprotocols) sections.
3333

3434
## Advanced HTTP/2 features
3535

@@ -52,7 +52,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
5252
* Operating system&dagger;
5353
* Windows Server 2016/Windows 10 or later&Dagger;
5454
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
55-
* Target framework: .NET 2.2 or later
55+
* Target framework: .NET Core 2.2 or later
5656
* [Application-Layer Protocol Negotiation (ALPN)](https://tools.ietf.org/html/rfc7301#section-3) connection
5757
* TLS 1.2 or later connection
5858

@@ -61,7 +61,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
6161

6262
If an HTTP/2 connection is established, [HttpRequest.Protocol](xref:Microsoft.AspNetCore.Http.HttpRequest.Protocol%2A) reports `HTTP/2`.
6363

64-
Starting with .NET 3.0, HTTP/2 is enabled by default. For more information on configuration, see the [Kestrel HTTP/2 limits](xref:fundamentals/servers/kestrel/options#http2-limits) and [ListenOptions.Protocols](xref:fundamentals/servers/kestrel/endpoints#listenoptionsprotocols) sections.
64+
Starting with .NET Core 3.0, HTTP/2 is enabled by default. For more information on configuration, see the [Kestrel HTTP/2 limits](xref:fundamentals/servers/kestrel/options#http2-limits) and [ListenOptions.Protocols](xref:fundamentals/servers/kestrel/endpoints#listenoptionsprotocols) sections.
6565

6666
## Advanced HTTP/2 features
6767

@@ -84,7 +84,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
8484
* Operating system&dagger;
8585
* Windows Server 2016/Windows 10 or later&Dagger;
8686
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
87-
* Target framework: .NET 2.2 or later
87+
* Target framework: .NET Core 2.2 or later
8888
* [Application-Layer Protocol Negotiation (ALPN)](https://tools.ietf.org/html/rfc7301#section-3) connection
8989
* TLS 1.2 or later connection
9090

@@ -93,7 +93,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
9393

9494
If an HTTP/2 connection is established, [HttpRequest.Protocol](xref:Microsoft.AspNetCore.Http.HttpRequest.Protocol%2A) reports `HTTP/2`.
9595

96-
Starting with .NET 3.0, HTTP/2 is enabled by default. For more information on configuration, see the [Kestrel HTTP/2 limits](xref:fundamentals/servers/kestrel/options#http2-limits) and [ListenOptions.Protocols](xref:fundamentals/servers/kestrel/endpoints#listenoptionsprotocols) sections.
96+
Starting with .NET Core 3.0, HTTP/2 is enabled by default. For more information on configuration, see the [Kestrel HTTP/2 limits](xref:fundamentals/servers/kestrel/options#http2-limits) and [ListenOptions.Protocols](xref:fundamentals/servers/kestrel/endpoints#listenoptionsprotocols) sections.
9797

9898
## Advanced HTTP/2 features
9999

0 commit comments

Comments
 (0)