Skip to content

Commit

Permalink
Merge pull request #124854 from msangapu-msft/AppServiceTOC-08-04-2020
Browse files Browse the repository at this point in the history
App Service Merge 08-04-2020
  • Loading branch information
American-Dipper authored Aug 6, 2020
2 parents 0669b96 + 9b3f54f commit 5c321cc
Show file tree
Hide file tree
Showing 170 changed files with 389 additions and 974 deletions.
156 changes: 113 additions & 43 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -7799,11 +7799,6 @@
"redirect_url": "/azure/app-service/configure-language-java",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-docker-go.md",
"redirect_url": "/azure/app-service/containers/quickstart-docker",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/tutorial-ruby-mysql-app.md",
"redirect_url": "/azure/app-service/tutorial-ruby-postgres-app",
Expand All @@ -7819,6 +7814,11 @@
"redirect_url": "/azure/app-service/tutorial-multi-container-app",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-get-started-windows-containers",
"redirect_url": "/azure/app-service/quickstart-custom-container",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-move-resources.md",
"redirect_url": "/azure/azure-resource-manager/management/move-limitations/app-service-move-limitations",
Expand Down Expand Up @@ -9443,16 +9443,6 @@
"redirect_url": "/azure/app-service/quickstart-ruby",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-ruby.md",
"redirect_url": "/azure/app-service/quickstart-ruby",
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-linux-using-dotnetcore.md",
"redirect_url": "/azure/app-service/containers/quickstart-dotnetcore",
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-web-tutorial-docker-python-postgresql-app.md",
"redirect_url": "/azure/app-service/tutorial-python-postgresql-app",
Expand Down Expand Up @@ -9968,21 +9958,6 @@
"redirect_url": "/azure/app-service/app-service-web-get-started-php",
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-web-get-started-python.md",
"redirect_url": "/azure/app-service/quickstart-python",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-python.md",
"redirect_url": "/azure/app-service/quickstart-python",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-python.md",
"redirect_url": "/azure/app-service/quickstart-python",
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-web-how-to-create-a-web-app-in-an-ase.md",
"redirect_url": "/azure/app-service/environment/app-service-web-how-to-create-a-web-app-in-an-ase",
Expand Down Expand Up @@ -28019,8 +27994,13 @@
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-linux-using-nodejs-pm2.md",
"redirect_url": "/azure/app-service/containers/quickstart-nodejs",
"source_path": "articles/app-service-web/app-service-web-get-started-python.md",
"redirect_url": "/azure/app-service/quickstart-python",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-python.md",
"redirect_url": "/azure/app-service/quickstart-python",
"redirect_document_id": false
},
{
Expand All @@ -28038,11 +28018,111 @@
"redirect_url": "/azure/app-service/containers/tutorial-custom-docker-image",
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-linux-using-dotnetcore.md",
"redirect_url": "/azure/app-service/quickstart-dotnetcore",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-dotnet",
"redirect_url": "/azure/app-service/quickstart-dotnetcore",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-dotnetcore.md",
"redirect_url": "/azure/app-service/quickstart-dotnetcore",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-dotnet-framework.md",
"redirect_url": "/azure/app-service/quickstart-dotnet-framework",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-nodejs.md",
"redirect_url": "/azure/app-service/quickstart-nodejs",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-nodejs.md",
"redirect_url": "/azure/app-service/quickstart-nodejs",
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-linux-using-nodejs-pm2.md",
"redirect_url": "/azure/app-service/quickstart-nodejs",
"redirect_document_id": false
},
{
"source_path": "articles/app-service-web/app-service-linux-get-started-node.md",
"redirect_url": "/azure/app-service/containers/quickstart-nodejs",
"redirect_url": "/azure/app-service/quickstart-nodejs",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-php.md",
"redirect_url": "/azure/app-service/quickstart-php",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-php.md",
"redirect_url": "/azure/app-service/quickstart-php",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-java.md",
"redirect_url": "/azure/app-service/quickstart-java",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-java.md",
"redirect_url": "/azure/app-service/quickstart-java",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-html.md",
"redirect_url": "/azure/app-service/quickstart-html",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-custom-docker-image.md",
"redirect_url": "/azure/app-service/quickstart-custom-container",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-go.md",
"redirect_url": "/azure/app-service/quickstart-custom-container",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-docker-go.md",
"redirect_url": "/azure/app-service/quickstart-custom-container",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-docker.md",
"redirect_url": "/azure/app-service/quickstart-custom-container",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/app-service-web-get-started-windows-container.md",
"redirect_url": "/azure/app-service/quickstart-custom-container",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-multi-container.md",
"redirect_url": "/azure/app-service/quickstart-multi-container",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-ruby.md",
"redirect_url": "/azure/app-service/quickstart-ruby",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-python.md",
"redirect_url": "/azure/app-service/quickstart-python",
"redirect_document_id": false
},
{
"source_path": "articles/active-directory-domain-services/active-directory-ds-getting-started-create-group.md",
"redirect_url": "/azure/active-directory-domain-services/active-directory-ds-getting-started",
Expand Down Expand Up @@ -31973,16 +32053,6 @@
"redirect_url": "/azure/application-insights/",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-custom-docker-image.md",
"redirect_url": "/azure/app-service/containers/quickstart-docker-go",
"redirect_document_id": false
},
{
"source_path": "articles/app-service/containers/quickstart-go.md",
"redirect_url": "/azure/app-service/containers/quickstart-docker-go",
"redirect_document_id": false
},
{
"source_path": "articles/active-directory/active-directory-conditional-access-unlicensed-usage-report.md",
"redirect_url": "/azure/active-directory/active-directory-reporting-azure-portal",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ms.custom: seodec18
---
# Best practices and troubleshooting guide for node applications on Azure App Service Windows

In this article, you learn best practices and troubleshooting steps for [node applications](app-service-web-get-started-nodejs.md) running on Azure App Service (with [iisnode](https://github.com/azure/iisnode)).
In this article, you learn best practices and troubleshooting steps for [node applications](quickstart-nodejs.md) running on Azure App Service (with [iisnode](https://github.com/azure/iisnode)).

> [!WARNING]
> Use caution when using troubleshooting steps on your production site. Recommendation is to troubleshoot your app on a non-production setup for example your staging slot and when the issue is fixed, swap your staging slot with your production slot.
Expand Down Expand Up @@ -268,7 +268,7 @@ NODE.exe has a setting called `NODE_PENDING_PIPE_INSTANCES`. On Azure App Servic

Follow these links to learn more about node.js applications on Azure App Service.

* [Get started with Node.js web apps in Azure App Service](app-service-web-get-started-nodejs.md)
* [Get started with Node.js web apps in Azure App Service](quickstart-nodejs.md)
* [How to debug a Node.js web app in Azure App Service](https://blogs.msdn.microsoft.com/azureossds/2018/08/03/debugging-node-js-apps-on-azure-app-services/)
* [Using Node.js Modules with Azure applications](../nodejs-use-node-modules-azure-apps.md)
* [Azure App Service Web Apps: Node.js](https://blogs.msdn.microsoft.com/silverlining/2012/06/14/windows-azure-websites-node-js/)
Expand Down
2 changes: 1 addition & 1 deletion articles/app-service/configure-connect-to-azure-storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This guide shows how to attach Azure Storage to a Linux container App Service. B

::: zone pivot="container-windows"

- [An existing Windows Container app in Azure App Service](app-service-web-get-started-windows-container.md)
- [An existing Windows Container app in Azure App Service](quickstart-custom-container.md)
- [Create Azure file share](../storage/files/storage-how-to-use-files-cli.md)
- [Upload files to Azure File share](../storage/files/storage-files-deployment-guide.md)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ms.date: 06/02/2020
ASP.NET apps must be deployed to Azure App Service as compiled binaries. The Visual Studio publishing tool builds the solution and then deploys the compiled binaries directly, whereas the App Service deployment engine deploys the code repository first and then compiles the binaries.

This guide provides key concepts and instructions for ASP.NET developers. If you've never used Azure App Service, follow the [ASP.NET quickstart](app-service-web-get-started-dotnet-framework.md) and [ASP.NET with SQL Database tutorial](app-service-web-tutorial-dotnet-sqldatabase.md) first.
This guide provides key concepts and instructions for ASP.NET developers. If you've never used Azure App Service, follow the [ASP.NET quickstart](quickstart-dotnet-framework.md) and [ASP.NET with SQL Database tutorial](app-service-web-tutorial-dotnet-sqldatabase.md) first.

## Show supported .NET Framework runtime versions

Expand Down
2 changes: 1 addition & 1 deletion articles/app-service/configure-language-dotnetcore.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ zone_pivot_groups: app-service-platform-windows-linux
ASP.NET Core apps must be deployed to Azure App Service as compiled binaries. The Visual Studio publishing tool builds the solution and then deploys the compiled binaries directly, whereas the App Service deployment engine deploys the code repository first and then compiles the binaries.

This guide provides key concepts and instructions for ASP.NET Core developers. If you've never used Azure App Service, follow the [ASP.NET Core quickstart](app-service-web-get-started-dotnet.md) and [ASP.NET Core with SQL Database tutorial](tutorial-dotnetcore-sqldb-app.md) first.
This guide provides key concepts and instructions for ASP.NET Core developers. If you've never used Azure App Service, follow the [ASP.NET Core quickstart](quickstart-dotnetcore.md) and [ASP.NET Core with SQL Database tutorial](tutorial-dotnetcore-sqldb-app.md) first.

::: zone pivot="platform-windows"

Expand Down
4 changes: 2 additions & 2 deletions articles/app-service/configure-language-java.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ zone_pivot_groups: app-service-platform-windows-linux

Azure App Service lets Java developers to quickly build, deploy, and scale their Tomcat web applications on a fully managed Windows-based service. Deploy applications with Maven plugins from the command line or in editors like IntelliJ, Eclipse, or Visual Studio Code.

This guide provides key concepts and instructions for Java developers using in App Service. If you've never used Azure App Service, you should read through the [Java quickstart](app-service-web-get-started-java.md) first. General questions about using App Service that aren't specific to the Java development are answered in the [App Service Windows FAQ](faq-configuration-and-management.md).
This guide provides key concepts and instructions for Java developers using in App Service. If you've never used Azure App Service, you should read through the [Java quickstart](quickstart-java.md) first. General questions about using App Service that aren't specific to the Java development are answered in the [App Service Windows FAQ](faq-configuration-and-management.md).

## Deploying your app

Expand Down Expand Up @@ -353,7 +353,7 @@ This topic provides the Java Runtime statement of support for Azure App Service
Azure App Service on Linux lets Java developers quickly build, deploy, and scale their Tomcat, or Java Standard Edition (SE) packaged web applications on a fully managed Linux-based service. Deploy applications with Maven plugins from the command line or in editors like IntelliJ, Eclipse, or Visual Studio Code.
This guide provides key concepts and instructions for Java developers who use a built-in Linux container in App Service. If you've never used Azure App Service, follow the [Java quickstart](app-service-web-get-started-java.md).
This guide provides key concepts and instructions for Java developers who use a built-in Linux container in App Service. If you've never used Azure App Service, follow the [Java quickstart](quickstart-java.md).

## Deploying your app

Expand Down
2 changes: 1 addition & 1 deletion articles/app-service/configure-language-nodejs.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zone_pivot_groups: app-service-platform-windows-linux

Node.js apps must be deployed with all the required NPM dependencies. The App Service deployment engine automatically runs `npm install --production` for you when you deploy a [Git repository](deploy-local-git.md), or a [Zip package](deploy-zip.md) with build automation enabled. If you deploy your files using [FTP/S](deploy-ftp.md), however, you need to upload the required packages manually.

This guide provides key concepts and instructions for Node.js developers who deploy to App Service. If you've never used Azure App Service, follow the [Node.js quickstart](app-service-web-get-started-nodejs.md) and [Node.js with MongoDB tutorial](tutorial-nodejs-mongodb-app.md) first.
This guide provides key concepts and instructions for Node.js developers who deploy to App Service. If you've never used Azure App Service, follow the [Node.js quickstart](quickstart-nodejs.md) and [Node.js with MongoDB tutorial](tutorial-nodejs-mongodb-app.md) first.

## Show Node.js version

Expand Down
2 changes: 1 addition & 1 deletion articles/app-service/configure-language-php.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zone_pivot_groups: app-service-platform-windows-linux

This guide shows you how to configure your PHP web apps, mobile back ends, and API apps in Azure App Service.

This guide provides key concepts and instructions for PHP developers who deploy apps to App Service. If you've never used Azure App Service, follow the [PHP quickstart](app-service-web-get-started-php.md) and [PHP with MySQL tutorial](tutorial-php-mysql-app.md) first.
This guide provides key concepts and instructions for PHP developers who deploy apps to App Service. If you've never used Azure App Service, follow the [PHP quickstart](quickstart-php.md) and [PHP with MySQL tutorial](tutorial-php-mysql-app.md) first.

## Show PHP version

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 5c321cc

Please sign in to comment.