Merge branch 'main' into release-2019-cu20

Author: v-alje

azure-sql/managed-instance/private-endpoint-overview.md

@@ -54,7 +54,7 @@ The benefits of using private endpoints over a VNet-local or public endpoint inc
 - Automatic registration of DNS names is disabled while in preview. Follow the steps in [Set up domain name resolution for private endpoint](#set-up-domain-name-resolution-for-private-endpoint) instead.
 - Private endpoints to SQL Managed Instance can only be used to connect to port 1433, the standard TDS port for SQL traffic. More complex connectivity scenarios requiring communication on other ports must be established via the instance's VNet-local endpoint.
 - Private endpoints to Azure SQL Managed Instance require a special setup to configure the required DNS resolution, as described in [Set up domain name resolution for private endpoint](#set-up-domain-name-resolution-for-private-endpoint).
-- Connections to private endpoint only support Proxy as the [connection type](connection-types-overview.md).
+- Private endpoints always operate with the [proxy connection type](connection-types-overview.md#connection-types). 
 
 ## Create a private endpoint in a virtual network
 

azure-sql/migration-guides/database/sql-server-to-sql-database-assessment-rules.md

@@ -3,7 +3,7 @@ title: "Assessment rules for SQL Server to Azure SQL Database migration"
 description: Assessment rules to identify issues with the source SQL Server instance that must be addressed before migrating to Azure SQL Database.
 author: rajeshsetlem
 ms.author: rsetlem
-ms.reviewer: mathoma, kendralittle
+ms.reviewer: mathoma
 ms.date: 12/15/2020
 ms.service: sql-database
 ms.subservice: migration-guide

azure-sql/migration-guides/database/sql-server-to-sql-database-overview.md

@@ -3,8 +3,8 @@ title: "SQL Server to Azure SQL Database: Migration overview"
 description: Learn about the tools and options available to migrate your SQL Server databases to Azure SQL Database.
 author: croblesm
 ms.author: roblescarlos
-ms.reviewer: mathoma, kendralittle
-ms.date: 01/06/2023
+ms.reviewer: mathoma
+ms.date: 03/20/2023
 ms.service: sql-database
 ms.subservice: migration-guide
 ms.topic: how-to
@@ -114,7 +114,7 @@ The following table compares the migration options that we recommend:
 |Migration option  |When to use  |Considerations  |
 |---------|---------|---------|
 | [Azure Migrate](/azure/migrate/how-to-create-azure-sql-assessment) | - Discovery and assess single databases or at scale from different environments. | - All pre-migration steps such as discovery, assessments, and right-sizing of on-premises resources are included for infrastructure, data, and applications. |
-| [Azure SQL Migration extension for Azure Data Studio](/azure/dms/migration-using-azure-data-studio) | - Migrate single databases or at scale. </br> - Can run in both online and offline modes. </br> </br> Supported sources: </br> - SQL Server (2008 onwards) on-premises, or on Azure Virtual Machines </br> - SQL Server on Amazon EC2 </br> - Amazon RDS for SQL Server </br> - SQL Server on Google Compute Engine | - Migrations at scale can be automated via [PowerShell or Azure CLI](/azure/dms/migration-dms-powershell-cli). </br> </br> - Time to complete migration depends on database size and the number of objects in the database. </br> </br> - Azure Data Studio is required when you are not using PowerShell or Azure CLI. |
+| [Azure SQL Migration extension for Azure Data Studio](/azure/dms/migration-using-azure-data-studio) | - Migrate single databases or at scale. </br> - Offline mode only. </br> </br> Supported sources: </br> - SQL Server (2008 onwards) on-premises, or on Azure Virtual Machines </br> - SQL Server on Amazon EC2 </br> - Amazon RDS for SQL Server </br> - SQL Server on Google Compute Engine | - Migrations at scale can be automated via [PowerShell or Azure CLI](/azure/dms/migration-dms-powershell-cli). </br> </br> - Time to complete migration depends on database size and the number of objects in the database. </br> </br> - Azure Data Studio is required when you are not using PowerShell or Azure CLI. |
 
 The following table compares the alternative migration options: 
 

azure-sql/toc.yml

@@ -160,6 +160,8 @@
     items:
     - name: Connect and query from apps
       items:
+      - name: Connect and query
+        href: database/connect-query-content-reference-guide.md
       - name: .NET with Visual Studio
         href: database/connect-query-dotnet-visual-studio.md
       - name: .NET with Windows, Linux, and macOS
@@ -578,7 +580,6 @@
     - name: Plan and manage costs 
       href: database/cost-management.md      
     - name: Connect and query
-      href: database/connect-query-content-reference-guide.md
       items:
       - name: Connect and run ad-hoc queries
         items:

docs/azure-data-studio/download-azure-data-studio.md

@@ -225,7 +225,7 @@ sudo zypper install libxss1 libgconf-2-4 libunwind8
 
 #### Install with a .deb file
 
-1. Download Azure Data Studio for Ubuntu or Debian by using the [.deb](https://go.microsoft.com/fwlink/?linkid=2215528) file.
+1. Download Azure Data Studio for Ubuntu or Debian by using the [.deb](https://go.microsoft.com/fwlink/?linkid=2222875) file.
 
 1. To extract the .deb file, open a new terminal window, and then run the following commands:
 

docs/connect/ado-net/microsoft-ado-net-sql-server.md

@@ -1,6 +1,8 @@
 ---
 title: "Microsoft ADO.NET"
-description: "Microsoft ADO.NET for SQL Server is the core data access technology for .NET languages. Use the Microsoft.Data.SqlClient namespace to access SQL Server."
+description: "Microsoft ADO.NET, for SQL Server and Azure SQL, is the core data access technology for .NET languages. Use the Microsoft.Data.SqlClient library to access SQL Server."
+
+
 author: David-Engel
 ms.author: v-davidengel
 ms.reviewer: v-kaywon
@@ -9,19 +11,42 @@ ms.service: sql
 ms.subservice: connectivity
 ms.topic: conceptual
 ---
-# Microsoft ADO.NET for SQL Server
+# Microsoft ADO.NET for SQL Server and Azure SQL Database
 
 [!INCLUDE[Driver_ADONET_Download](../../includes/driver_adonet_download.md)]
 
-ADO.NET is the core data access technology for .NET languages. Use the Microsoft.Data.SqlClient namespace to access SQL Server, or providers from other suppliers to access their stores. Use System.Data.Odbc or System.Data.Oledb to access data from .NET languages using other data access technologies. Use System.Data.Dataset when you need an offline data cache in client applications. It also provides local persistence and XML capabilities that can be useful in web services.
+ADO.NET is the core data access technology for .NET languages. Use the Microsoft.Data.SqlClient library or Entity Framework to access SQL Server, or providers from other suppliers to access their stores. Use System.Data.Odbc or System.Data.OleDb to access data from .NET languages using other data access technologies. Use System.Data.DataSet when you need an offline data cache in client applications. It also provides local persistence and XML capabilities that can be useful in web services.
+
+
+
+::: moniker range=">=sql-server-2016||>=sql-server-linux-2017"
+
+## Getting started (SQL Server)
 
-## Getting started
 * [Step 1: Configure development environment for ADO.NET development](step-1-configure-development-environment-ado-net-development.md)
 * [Step 2: Create a SQL database for ADO.NET development](step-2-create-sql-database-ado-net-development.md)
 * [Step 3: Proof of concept connecting to SQL using ADO.NET](step-3-connect-sql-ado-net.md)
 * [Step 4: Connect resiliently to SQL with ADO.NET](step-4-connect-resiliently-sql-ado-net.md)
 
+::: moniker-end
+
+::: moniker range="=azuresqldb-current"
+
+## Getting started (Azure SQL Database)
+
+* [Step 1: Configure development environment for ADO.NET development](step-1-configure-development-environment-ado-net-development.md)
+* [Step 2: Create a SQL database for ADO.NET development](/azure/azure-sql/database/single-database-create-quickstart)
+* [Step 3: Proof of concept connecting to SQL using ADO.NET](step-3-connect-sql-ado-net.md)
+* Step 4: Connect resiliently to SQL with ADO.NET
+   * [Entity Framework Core with a passwordless connection](/azure/azure-sql/database/azure-sql-dotnet-entity-framework-core-quickstart)
+   * [Microsoft.Data.SqlClient with a passwordless connection](/azure/azure-sql/database/azure-sql-dotnet-quickstart)
+   * [Microsoft.Data.SqlClient with a password](step-4-connect-resiliently-sql-ado-net.md)
+
+
+::: moniker-end
+
 ## Documentation
+
 * [ADO.NET Overview](/dotnet/framework/data/adonet/)
 * [Getting started with the SqlClient driver](get-started-sqlclient-driver.md)
 * [Overview of the SqlClient driver](overview-sqlclient-driver.md)
@@ -30,10 +55,12 @@ ADO.NET is the core data access technology for .NET languages. Use the Microsoft
 * [SQL Server and ADO.NET](./sql/index.md)
 
 ## Community
+
 * [ADO.NET Managed Providers Forum](https://social.msdn.microsoft.com/Forums/home?forum=adodotnetdataproviders)
 * [ADO.NET DataSet Forum](https://social.msdn.microsoft.com/Forums/home?forum=adodotnetdataset)
 
 ## More samples
+
 * [ADO.NET Code Examples](/dotnet/framework/data/adonet/ado-net-code-examples)
 * [Getting Started with .NET Framework on Windows](https://www.microsoft.com/sql-server/developer-get-started/csharp/win/)
 * [Getting Started with .NET Core on macOS](https://www.microsoft.com/sql-server/developer-get-started/csharp/macos/)

docs/connect/ado-net/step-3-connect-sql-ado-net.md

@@ -19,7 +19,7 @@ ms.topic: conceptual
 
 This C# code example should be considered a proof of concept only. The sample code is simplified for clarity, and does not necessarily represent best practices recommended by Microsoft.  
 
-## Step 1: Connect
+## 1: Connect
 
 The method **SqlConnection.Open** is used to connect to your SQL database.  
 
@@ -57,7 +57,7 @@ Press any key to finish...
 ```  
 
 
-## Step 2: Execute a query  
+## 2: Execute a query  
 
 The method SqlCommand.ExecuteReader:  
 
@@ -143,7 +143,7 @@ Press any key to finish...
 
 
 
-## Step 3: Insert a row  
+## 3: Insert a row  
 
 
 This example demonstrates how to:  

docs/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server.md

@@ -4,7 +4,7 @@ description: Learn how to install the Microsoft ODBC Driver for SQL Server on Li
 author: David-Engel
 ms.author: v-davidengel
 ms.reviewer: randolphwest
-ms.date: 01/31/2023
+ms.date: 03/20/2023
 ms.service: sql
 ms.subservice: connectivity
 ms.topic: conceptual
@@ -449,7 +449,7 @@ ln -sfn /opt/mssql-tools/bin/bcp-13.0.1.0 /usr/bin/bcp
 
 ### Offline installation
 
-If you need the [!INCLUDE[msCoName](../../../includes/msconame-md.md)] ODBC Driver 13 to be installed on a computer with no Internet connection, you'll need to resolve package dependencies manually. The [!INCLUDE[msCoName](../../../includes/msconame-md.md)] ODBC Driver 13 has the following direct dependencies:
+If you need the [!INCLUDE[msCoName](../../../includes/msconame-md.md)] ODBC Driver 13 to be installed on a computer with no Internet connection, you must resolve package dependencies manually. The [!INCLUDE[msCoName](../../../includes/msconame-md.md)] ODBC Driver 13 has the following direct dependencies:
 
 - Ubuntu: libc6 (>= 2.21), libstdc++6 (>= 4.9), libkrb5-3, libcurl3, openssl, debconf (>= 0.5), unixodbc (>= 2.3.1-1)
 - Red Hat: ```glibc, e2fsprogs, krb5-libs, openssl, unixODBC```
@@ -554,10 +554,12 @@ The ODBC driver on Linux consists of the following components:
 
 ## Resource file loading
 
-The driver needs to load the resource file to function. This file is called `msodbcsqlr17.rll` or `msodbcsqlr13.rll` depending on the driver version. The location of the `.rll` file is relative to the location of the driver itself (`so` or `dylib`), as noted in the table above. As of version 17.1 the driver will also attempt to load the `.rll` from the default directory if loading from the relative path fails. The default resource file path on Linux is `/opt/microsoft/msodbcsql17/share/resources/en_US/`.
+The driver needs to load the resource file to function. This file is called `msodbcsqlr17.rll` or `msodbcsqlr13.rll` depending on the driver version. The location of the `.rll` file is relative to the location of the driver itself (`so` or `dylib`), as noted in the table above. As of version 17.1 the driver also attempts to load the `.rll` from the default directory if loading from the relative path fails. The default resource file path on Linux is `/opt/microsoft/msodbcsql17/share/resources/en_US/`.
 
 ## Troubleshoot
 
+If a version of the driver has been previously installed and registered with unixODBC, installation may fail with an error like `Installation failed, ODBC Driver $1 for SQL Server detected!`. To resolve the problem, unregister that version of the driver. You can unregister drivers via the `odbcinst` command: `odbcinst -u -d -n "ODBC Driver $1 for SQL Server`. (Replace `$1` with the version of the driver reported in the installation error.) If uninstall via the `odbcinst` command fails, you can manually remove driver sections from the `odbcinst.ini` file. You can find the location of the `odbcinst.ini` file via the command `odbcinst -j`.
+
 If you're unable to make a connection to SQL Server using the ODBC driver, see the known issues article on [troubleshooting connection problems](known-issues-in-this-version-of-the-driver.md#connectivity).
 
 ## Next steps