Merge master into live

.openpublishing.redirection.json

@@ -446,6 +446,10 @@
       "source_path": "docs/core/tutorials/cli-console-app-tutorial-advanced.md",
       "redirect_url": "/dotnet/core/tutorials"
     },
+    {
+      "source_path": "docs/core/tutorials/cli-create-console-app.md",
+      "redirect_url": "/dotnet/core/tutorials/with-visual-studio-code"
+    },
     {
       "source_path": "docs/core/tutorials/consuming-library-with-visual-studio.md",
       "redirect_url": "/nuget/quickstart/install-and-use-a-package-in-visual-studio"

docs/azure/migration/sql.md

@@ -2,19 +2,17 @@
 title: Migrate a SQL Server database to Azure
 description: Learn how to migrate a SQL Server database from on-premises SQL Server to Azure.
 ms.topic: how-to
-ms.date: 11/15/2017
+ms.date: 05/27/2020
 ---
 
 # Migrate a SQL Server database to Azure
 
-This short article provides a brief outline of two options for migrating a SQL Server database to Azure.
-
-Azure has two primary options for migrating a production SQL Server database:
+This article provides a brief outline of two options for migrating a SQL Server database to Azure. Azure has three primary options for migrating a production SQL Server database. This article focuses on the following two options:
 
 1. [SQL Server on Azure VMs](https://docs.microsoft.com/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-server-iaas-overview): A SQL Server instance installed and hosted on a Windows Virtual Machine running in Azure, also known as Infrastructure as a Service (IaaS).
 2. [Azure SQL Database](https://docs.microsoft.com/azure/sql-database/sql-database-technical-overview): A fully managed SQL database Azure service, also known as Platform as a Service (PaaS).
 
-Both come with pros and cons that you will need to evaluate before migrating.
+Both come with pros and cons that you will need to evaluate before migrating. The third option is [Azure SQL Database managed instances](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance).
 
 ## Get started
 
@@ -58,16 +56,16 @@ The following table describes differences between each service based on a set of
 | Migration | Requires minimal changes to your database. | May require changes to your database if you use features unavailable in Azure SQL, as determined by the [Data Migration Assistant](https://www.microsoft.com/download/details.aspx?id=53595), or if you have other dependencies such as locally installed executables.|
 | Managing availability, recovery, and upgrades | Availability and recovery are configured manually. Upgrades can be automated with [VM Scale Sets](https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-automatic-upgrade). | Automatically managed for you. |
 | Underlying OS configuration | Manual configuration. | Automatically managed for you. |
-| Managing database size | Supports up to 64 TB of storage per SQL Server instance. | Supports 4 TB of storage before needing a horizontal partition. |
+| Managing database size | Supports up to 256 TB of storage per SQL Server instance. | Supports 8 TB of storage before needing a horizontal partition. |
 | Managing costs | You must manage SQL Server license costs, Windows Server license costs, and VM costs (based on cores, RAM, and storage). | You must manage service costs (based on [eDTUs or DTUs](https://docs.microsoft.com/azure/sql-database/sql-database-what-is-a-dtu), storage, and number of databases if using an elastic pool). You must also manage the cost of any SLA. |
 
-To learn more about the differences between the two, read Choose a cloud SQL Server option: [Azure SQL Database or SQL Server on Azure VMs](https://docs.microsoft.com/azure/sql-database/sql-database-paas-vs-sql-server-iaas).
+To learn more about the differences between the two, see [Choose the right deployment option in Azure SQL](https://docs.microsoft.com/azure/sql-database/sql-database-paas-vs-sql-server-iaas).
 
 ## FAQ
 
 * **Can I still use tools such as SQL Server Management Studio and SQL Server Reporting Services (SSRS) with SQL Server in Azure VMs or Azure SQL Database?**
 
-    Yes! All Microsoft SQL tooling works with both services. SSRS is not part of Azure SQL Database, though, and it's recommended that you run it in an Azure VM and then point it to your database instance.
+    Yes. All Microsoft SQL tooling works with both services. SSRS is not part of Azure SQL Database, though, and it's recommended that you run it in an Azure VM and then point it to your database instance.
 
 * **I want to go PaaS but I'm not sure if my database is compatible. Are there tools to help?**
 

docs/core/toc.yml

@@ -112,9 +112,9 @@
     - name: Debug an app
       href: tutorials/debugging-with-visual-studio-code.md
       displayName: tutorials, visual studio code, vs code
-    - name: Create a console app and publish it
-      href: tutorials/cli-create-console-app.md
-      displayName: tutorials, cli
+    - name: Publish an app
+      href: tutorials/publishing-with-visual-studio-code.md
+      displayName: tutorials, visual studio, vs
     - name: Create a library and unit test it - macOS
       href: tutorials/using-on-macos.md
       displayName: tutorials, visual studio code, vs code, cli

docs/core/tutorials/debugging-with-visual-studio-code.md

@@ -13,7 +13,7 @@ This tutorial introduces the debugging tools available in Visual Studio Code for
 
 ## Use Debug build configuration
 
-*Debug* and *release* are two of .NET Core's build configurations. You use the Debug build configuration for debugging and the Release configuration for the final release distribution.
+*Debug* and *Release* are two of .NET Core's build configurations. You use the Debug build configuration for debugging and the Release configuration for the final release distribution.
 
 In the Debug configuration, a program compiles with full symbolic debug information and no optimization. Optimization complicates debugging, because the relationship between source code and generated instructions is more complex. The release configuration of a program has no symbolic debug information and is fully optimized.
 
@@ -23,7 +23,13 @@ In the Debug configuration, a program compiles with full symbolic debug informat
 
 A breakpoint temporarily interrupts the execution of the application *before* the line with the breakpoint is executed.
 
-1. In *Program.cs*, set a *breakpoint* on the line that displays the name, date, and time, by clicking in the left margin of the code window. The left margin is to the left of the line numbers. Another way to set a breakpoint is by placing the cursor in the line of code and then pressing <kbd>F9</kbd>.
+1. Open Visual Studio Code.
+
+1. Open the *HelloWorld* project folder that you created in [Create a .NET Core console application in Visual Studio Code](with-visual-studio-code.md).
+
+1. Open the *Program.cs* file.
+
+1. Set a *breakpoint* on the line that displays the name, date, and time, by clicking in the left margin of the code window. The left margin is to the left of the line numbers. Another way to set a breakpoint is by placing the cursor in the line of code and then pressing <kbd>F9</kbd>.
 
    As the following image shows, Visual Studio Code indicates the line on which the breakpoint is set by displaying a red dot in the left margin.
 
@@ -209,10 +215,7 @@ dotnet run --configuration Release
 
 ## Next steps
 
-In this tutorial, you used Visual Studio Code debugging tools. To learn how to publish a deployable version of the app, see [Publish your app](cli-create-console-app.md#publish-your-app).
-
-<!--In the next tutorial, you publish a deployable version of the app.
+In this tutorial, you used Visual Studio Code debugging tools. In the next tutorial, you publish a deployable version of the app.
 
 > [!div class="nextstepaction"]
 > [Publish a .NET Core console application with Visual Studio Code](publishing-with-visual-studio-code.md)
--->

docs/core/tutorials/index.md

@@ -12,7 +12,6 @@ The following tutorials are available for learning about .NET Core.
 ## Use Visual Studio
 
 - [Create a console app](with-visual-studio.md)
-- [Create an F# console app](../../fsharp/get-started/get-started-visual-studio.md)
 - [Debug an app](debugging-with-visual-studio.md)
 - [Publish an app](publishing-with-visual-studio.md)
 - [Create a class library](library-with-visual-studio.md)
@@ -21,18 +20,21 @@ The following tutorials are available for learning about .NET Core.
 - [Install and use a package](/nuget/quickstart/install-and-use-a-package-in-visual-studio)
 - [Create and publish a package](/nuget/quickstart/create-and-publish-a-package-using-visual-studio)
 
+- [Create an F# console app](../../fsharp/get-started/get-started-visual-studio.md)
+
 ## Use Visual Studio Code
 
 Choose these tutorials if you want to use Visual Studio Code or some other code editor. All use the CLI for .NET Core development tasks, so all except the debugging tutorial can be used with any code editor.
 
 - [Create a console app](with-visual-studio-code.md)
 - [Debug an app](debugging-with-visual-studio-code.md)
-- [Create a console app and publish it](cli-create-console-app.md)
-- [Create an F# console app](../../fsharp/get-started/get-started-vscode.md)
+- [Publish an app](publishing-with-visual-studio-code.md)
 - [Create a library and unit test it - macOS](using-on-macos.md)
 - [Install and use a package](/nuget/quickstart/install-and-use-a-package-using-the-dotnet-cli)
 - [Create and publish a package](/nuget/quickstart/create-and-publish-a-package-using-the-dotnet-cli)
 
+- [Create an F# console app](../../fsharp/get-started/get-started-vscode.md)
+
 ## Use Visual Studio for Mac
 
 - [Create a console app](using-on-mac-vs.md)