You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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>
Copy file name to clipboardExpand all lines: aspnetcore/data/ef-mvc/intro.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -67,7 +67,7 @@ Users can view and update student, course, and instructor information. Here are
67
67
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.
68
68
1. Select **Create**.
69
69
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.
71
71
1.**ASP.NET Core Web App (Model-View-Controller)**.
72
72
1.**Create**
73
73

@@ -396,10 +396,10 @@ The sample application is a web site for a fictional Contoso University. It incl
*[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:
Copy file name to clipboardExpand all lines: aspnetcore/data/ef-rp/intro.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -642,7 +642,7 @@ Run the project to seed the database.
642
642
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.
643
643
1. Select **Create**.
644
644
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.
646
646
1.**ASP.NET Core Web App**.
647
647
1.**Create**
648
648

@@ -1153,7 +1153,7 @@ To run the app after downloading the completed project:
1153
1153
* From the Visual Studio **File** menu, select **New** > **Project**.
1154
1154
* Select **ASP.NET Core Web Application**.
1155
1155
* 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**.
Copy file name to clipboardExpand all lines: aspnetcore/data/entity-framework-6.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -33,11 +33,11 @@ This article shows how to use Entity Framework 6 in an ASP.NET Core application.
33
33
34
34
## Overview
35
35
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/).
37
37
38
38
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/).
39
39
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.
41
41
42
42
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).
Copy file name to clipboardExpand all lines: aspnetcore/fundamentals/choose-aspnet-framework.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -32,7 +32,7 @@ The following table compares ASP.NET Core to ASP.NET 4.x.
32
32
|Multiple versions per machine|One version per machine|
33
33
|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#|
34
34
|Higher performance than ASP.NET 4.x|Good performance|
Copy file name to clipboardExpand all lines: aspnetcore/fundamentals/http-requests.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1246,7 +1246,7 @@ An <xref:System.Net.Http.IHttpClientFactory> can be registered and used to confi
1246
1246
1247
1247
## Prerequisites
1248
1248
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.
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/).
17
17
18
18
* Projects that target the `Microsoft.NET.Sdk.Web` SDK implicitly reference the `Microsoft.AspNetCore.App` framework.
19
19
@@ -37,7 +37,7 @@ The ASP.NET Core shared framework:
37
37
38
38
:::moniker range="< aspnetcore-3.0"
39
39
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.
41
41
42
42
The [Microsoft.AspNetCore.App](https://www.nuget.org/packages/Microsoft.AspNetCore.App)[metapackage](/dotnet/core/packages#metapackages) for ASP.NET Core:
43
43
@@ -89,7 +89,7 @@ Specifying a version number on the `Microsoft.AspNetCore.App` reference does **n
89
89
90
90
*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.*
91
91
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.
93
93
94
94
:::moniker-end
95
95
@@ -103,8 +103,8 @@ The `Microsoft.AspNetCore.App` [metapackage](/dotnet/core/packages#metapackages)
103
103
104
104
To update ASP.NET Core:
105
105
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).
108
108
109
109
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).
Copy file name to clipboardExpand all lines: aspnetcore/fundamentals/metapackage.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -22,7 +22,7 @@ uid: fundamentals/metapackage
22
22
> [!NOTE]
23
23
> 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.
24
24
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.
26
26
27
27
[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/).
28
28
@@ -54,7 +54,7 @@ The project's SDK must be set to `Microsoft.NET.Sdk.Web` in the project file to
54
54
55
55
*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.*
56
56
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.
58
58
59
59
:::moniker-end
60
60
@@ -91,6 +91,6 @@ Any dependencies of the preceding packages that otherwise aren't dependencies of
91
91
92
92
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:
93
93
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).
96
96
Your app will roll forward to the latest installed version on an application restart.
Copy file name to clipboardExpand all lines: aspnetcore/fundamentals/owin.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -14,7 +14,7 @@ By [Steve Smith](https://ardalis.com/) and [Rick Anderson](https://twitter.com/R
14
14
ASP.NET Core:
15
15
16
16
* 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.
18
18
19
19
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.
‡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.
29
29
30
30
If an HTTP/2 connection is established, [HttpRequest.Protocol](xref:Microsoft.AspNetCore.Http.HttpRequest.Protocol%2A) reports `HTTP/2`.
31
31
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.
33
33
34
34
## Advanced HTTP/2 features
35
35
@@ -52,7 +52,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
52
52
* Operating system†
53
53
* Windows Server 2016/Windows 10 or later‡
54
54
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
@@ -61,7 +61,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
61
61
62
62
If an HTTP/2 connection is established, [HttpRequest.Protocol](xref:Microsoft.AspNetCore.Http.HttpRequest.Protocol%2A) reports `HTTP/2`.
63
63
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.
65
65
66
66
## Advanced HTTP/2 features
67
67
@@ -84,7 +84,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
84
84
* Operating system†
85
85
* Windows Server 2016/Windows 10 or later‡
86
86
* Linux with OpenSSL 1.0.2 or later (for example, Ubuntu 16.04 or later)
@@ -93,7 +93,7 @@ Additional HTTP/2 features in Kestrel support gRPC, including support for respon
93
93
94
94
If an HTTP/2 connection is established, [HttpRequest.Protocol](xref:Microsoft.AspNetCore.Http.HttpRequest.Protocol%2A) reports `HTTP/2`.
95
95
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.
0 commit comments