Skip to content

Commit f4c8590

Browse files
committed
Merge branch 'main' of github.adegeo:dotnet/docs into adegeo-27135-arm
2 parents f3a8d61 + ae0a683 commit f4c8590

File tree

96 files changed

+16297
-16516
lines changed

Some content is hidden

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

96 files changed

+16297
-16516
lines changed

.github/ISSUE_TEMPLATE/breaking-change.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ body:
1818
label: Version
1919
description: What version of .NET introduced the breaking change?
2020
options:
21-
- .NET 6 RC 1
22-
- .NET 6 RC 2
23-
- .NET 6 GA
2421
- .NET 7 Preview 1
2522
- .NET 7 Preview 2
2623
- .NET 7 Preview 3

.github/workflows/whats-new.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ on:
1616

1717
env:
1818
DOTNET_VERSION: '5.0.301' # set this to the dot net version to use
19-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2019

2120
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2221
jobs:
2322
# This workflow contains a single job called "create-what-is-new"
2423
create-what-is-new:
2524
# The type of runner that the job will run on
2625
runs-on: ubuntu-latest
26+
permissions:
27+
contents: write
28+
pull-requests: write
2729

2830
# Steps represent a sequence of tasks that will be executed as part of the job
2931
steps:
@@ -38,7 +40,7 @@ jobs:
3840
- name: 'Print manual run reason'
3941
if: ${{ github.event_name == 'workflow_dispatch' }}
4042
run: |
41-
echo 'Reason: ${{ github.event.inputs.reason }}'
43+
echo "Reason: ${{ github.event.inputs.reason }}"
4244
4345
# Print dotnet info
4446
- name: Display .NET info
@@ -60,7 +62,7 @@ jobs:
6062
6163
# Create the PR for the new article
6264
- name: create-pull-request
63-
uses: peter-evans/create-pull-request@v3.10.0
65+
uses: peter-evans/create-pull-request@v3.11.0
6466
with:
6567
title: 'What''s new article'
6668
commit-message: 'Bot 🤖 generated "What''s new article"'

.openpublishing.redirection.json

Lines changed: 15554 additions & 15547 deletions
Large diffs are not rendered by default.

docs/architecture/blazor-for-web-forms-developers/app-startup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ The final statement in this method defines the endpoints that ASP.NET Core is li
8989

9090
Technologies for bundling assets like CSS stylesheets and JavaScript files have evolved significantly, with other technologies providing quickly evolving tools and techniques for managing these resources. To this end, we recommend using a Node command-line tool such as Grunt / Gulp / WebPack to package your static assets.
9191

92-
The Grunt, Gulp, and WebPack command-line tools and their associated configurations can be added to your application and ASP.NET Core will quietly ignore those files during the application build process. You can add a call to run their tasks by adding a `Target` inside your project file with syntax similar to the following that would trigger a gulp script and the `min` target inside that script
92+
The Grunt, Gulp, and WebPack command-line tools and their associated configurations can be added to your application and ASP.NET Core will quietly ignore those files during the application build process. You can add a call to run their tasks by adding a `Target` inside your project file with syntax similar to the following that would trigger a gulp script and the `min` target inside that script:
9393

9494
```xml
9595
<Target Name="MyPreCompileTarget" BeforeTargets="Build">

docs/architecture/microservices/docker-application-development-process/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Whether you prefer a full and powerful IDE or a lightweight and agile editor, Mi
1919

2020
**Visual Studio Code and Docker CLI**. If you prefer a lightweight and cross-platform editor that supports any development language, you can use Visual Studio Code and the Docker CLI. This IDE is a cross-platform development approach for macOS, Linux, and Windows. Additionally, Visual Studio Code supports extensions for Docker such as IntelliSense for Dockerfiles and shortcut tasks to run Docker commands from the editor.
2121

22-
By installing [Docker Desktop Community Edition (CE)](https://hub.docker.com/search/?type=edition&offering=community), you can use a single Docker CLI to build apps for both Windows and Linux.
22+
By installing [Docker Desktop](https://hub.docker.com/search/?type=edition&offering=community), you can use a single Docker CLI to build apps for both Windows and Linux.
2323

2424
### Additional resources
2525

@@ -29,10 +29,10 @@ By installing [Docker Desktop Community Edition (CE)](https://hub.docker.com/sea
2929
- **Visual Studio Code**. Official site. \
3030
<https://code.visualstudio.com/download>
3131

32-
- **Docker Desktop for Windows Community Edition (CE)** \
32+
- **Docker Desktop for Windows** \
3333
[https://hub.docker.com/editions/community/docker-ce-desktop-windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows)
3434

35-
- **Docker Desktop for Mac Community Edition (CE)** \
35+
- **Docker Desktop for Mac** \
3636
[https://hub.docker.com/editions/community/docker-ce-desktop-mac](https://hub.docker.com/editions/community/docker-ce-desktop-mac)
3737

3838
## .NET languages and frameworks for Docker containers

docs/architecture/porting-existing-aspnet-apps/architectural-differences.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ ms.date: 11/13/2020
77

88
# Architectural differences between ASP.NET MVC and ASP.NET Core
99

10-
[!INCLUDE [book-preview](../../../includes/book-preview.md)]
11-
1210
There are many architectural differences between ASP.NET MVC on .NET Framework and ASP.NET Core. It's important to have a broad understanding of these differences as teams evaluate the work involved in porting their ASP.NET MVC apps to ASP.NET Core. This chapter looks at each of the ways in which ASP.NET Core differs substantially from ASP.NET MVC.
1311

1412
## Breaking changes

docs/architecture/porting-existing-aspnet-apps/choose-net-core-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The largest consideration for most organizations when choosing which version of
1111

1212
Most customers looking to migrate a large .NET Framework app to .NET Core today are probably looking for a stable destination, given that they haven't already made the move to an earlier version of .NET Core. In this case, the best .NET Core version to target for the migration is .NET Core 3.1, which is an LTS version. Support for .NET Core 3.1 ends in December 2022. The latest available LTS release is .NET 6.
1313

14-
Updating from .NET Core 3.1 to .NET 5+ requires much less effort than porting from .NET Framework to .NET Core. For this reason, the recommendation for most customers is to upgrade to .NET Core 3.1 first.
14+
Updating from .NET Core 3.1 to .NET 6+ requires much less effort than porting from .NET Framework to .NET Core. For this reason, the recommendation for most customers is to upgrade to .NET Core 3.1 first.
1515

1616
This book assumes .NET Framework apps will be upgraded to .NET Core 3.1.
1717

docs/architecture/porting-existing-aspnet-apps/deployment-scenarios.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ ms.date: 11/13/2020
77

88
# Deployment scenarios when migrating to ASP.NET Core
99

10-
[!INCLUDE [book-preview](../../../includes/book-preview.md)]
11-
1210
Existing ASP.NET MVC and Web API apps run on IIS and Windows. Large apps may require a phased or side-by-side approach when porting to ASP.NET Core. In previous chapters, you learned a number of strategies for migrating large .NET Framework apps to ASP.NET Core in phases. In this chapter, you will see how different deployment scenarios can be achieved when there is a need to maintain the original app in production while migrating portions of it.
1311

1412
## Split a large web app

docs/architecture/porting-existing-aspnet-apps/example-migration-eshop.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ ms.date: 11/13/2020
77

88
# Example migration of eShop to ASP.NET Core
99

10-
[!INCLUDE [book-preview](../../../includes/book-preview.md)]
11-
12-
In this chapter, you'll see how to migrate a .NET Framework app to .NET Core. The chapter examines a sample online store app written for ASP.NET 5. The app will use many of the concepts and tools described earlier in this book. You'll find the starting point app in the [*eShopModernizing* GitHub repository](https://github.com/dotnet-architecture/eShopModernizing). There are several different starting point apps. This chapter focuses on the *eShopLegacyMVCSolution*.
10+
In this chapter, you'll see how to migrate a .NET Framework app to .NET Core. The chapter examines a sample online store app written for ASP.NET MVC 5. The app will use many of the concepts and tools described earlier in this book. You'll find the starting point app in the [*eShopModernizing* GitHub repository](https://github.com/dotnet-architecture/eShopModernizing). There are several different starting point apps. This chapter focuses on the *eShopLegacyMVCSolution*.
1311

1412
The initial version of the project is shown in Figure 4-1. It's a fairly standard ASP.NET MVC 5 app.
1513

0 commit comments

Comments
 (0)