Skip to content

Commit 578f59b

Browse files
committed
Merge branch 'master' into publish-32384
2 parents 927b7ea + d3cc3ec commit 578f59b

File tree

48 files changed

+145
-134
lines changed

Some content is hidden

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

48 files changed

+145
-134
lines changed

docs/architecture/blazor-for-web-forms-developers/hosting-models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The Blazor Server hosting model may sound familiar if you've used ASP.NET AJAX a
4040

4141
## How to choose the right Blazor hosting model
4242

43-
As described in the [Blazor hosting model docs](https://docs.microsoft.com/aspnet/core/blazor/hosting-models#server-side), the different Blazor hosting models have different tradeoffs.
43+
As described in the [Blazor hosting model docs](/aspnet/core/blazor/hosting-models), the different Blazor hosting models have different tradeoffs.
4444

4545
The Blazor WebAssembly hosting model has the following benefits:
4646

-102 KB
Binary file not shown.
-54.3 KB
Binary file not shown.
-130 KB
Binary file not shown.
-10.7 KB
Binary file not shown.
-321 KB
Binary file not shown.
-63.6 KB
Binary file not shown.
-24.9 KB
Binary file not shown.

docs/architecture/modern-web-apps-azure/development-process-for-azure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ Create an Azure App Service where you'll deploy your application. Create a Web A
5252

5353
Your CI build process will perform an automated build whenever new code is committed to the project's source control repository. This gives you immediate feedback that the code builds (and, ideally, passes automated tests) and can potentially be deployed. This CI build will produce a web deploy package artifact and publish it for consumption by your CD process.
5454

55-
[Define your CI build process](https://docs.microsoft.com/azure/devops/build-release/apps/aspnet/build-aspnet-core#ci)
55+
[Define your CI build process](https://docs.microsoft.com/azure/devops/pipelines/ecosystems/dotnet-core)
5656

5757
Be sure to enable continuous integration so the system will queue a build whenever someone on your team commits new code. Test the build and verify that it is producing a web deploy package as one of its artifacts.
5858

5959
When a build succeeds, your CD process will deploy the results of your CI build to your Azure web app. To configure this, you create and configure a *Release*, which will deploy to your Azure App Service.
6060

61-
[Define your CD release process](https://docs.microsoft.com/azure/devops/build-release/apps/aspnet/build-aspnet-core#cd)
61+
[Deploy an Azure web app](https://docs.microsoft.com/azure/devops/pipelines/targets/webapp)
6262

6363
Once your CI/CD pipeline is configured, you can simply make updates to your web app and commit them to source control to have them deployed.
6464

-128 KB
Binary file not shown.

0 commit comments

Comments
 (0)