merge conflict

Author: markingmyname

.openpublishing.redirection.json

@@ -59056,8 +59056,28 @@
       "redirect_document_id": true
     },
     {
+<<<<<<< HEAD
       "source_path": "docs/ssms/quickstarts/connect-query-sql-server.md",
       "redirect_url": "/sql/ssms/quickstarts/ssms-connect-query-sql-server",
+=======
+      "source_path": "docs/tools/sqlpackage.md",
+      "redirect_url": "/sql/tools/sqlpackage/sqlpackage",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/tools/sqlpackage-download.md",
+      "redirect_url": "/sql/tools/sqlpackage/sqlpackage-download",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/tools/sqlpackage-pipelines.md",
+      "redirect_url": "/sql/tools/sqlpackage/sqlpackage-pipelines",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/tools/release-notes-sqlpackage.md",
+      "redirect_url": "/sql/tools/sqlpackage/release-notes-sqlpackage",
+>>>>>>> b0ae5f6a469fe2a0b0a4669ac0d949513416a09b
       "redirect_document_id": true
     }
   ]

docs/azure-data-studio/extensions/sql-database-project-extension.md

@@ -8,7 +8,7 @@ author: dzsquared
 ms.author: drskwier
 ms.reviewer: maghan
 ms.custom: 
-ms.date: 10/22/2020
+ms.date: 12/15/2020
 ---
 
 # SQL Database Projects extension (Preview)
@@ -57,6 +57,31 @@ Watch this short 10-minute video for an introduction to the SQL Database Project
 - Publish targets defined by DacFx.
 - WSL environment support is limited.
 
+## Workspace
+SQL database projects in Azure Data Studio are contained within a logical workspace.  A workspace manages the folder(s) visible in the Explorer pane as well as the project(s) visible in the Project pane. Adding and removing projects from a workspace can be accomplished through the Azure Data Studio interface in the Projects pane. However, the settings for a workspace can be manually edited in the `.code-workspace` file if necessary.
+
+In the example `.code-workspace` file below, the `folders` array lists all folders included in the Explorer pane and the `dataworkspace.projects` array within `settings` lists all the SQL projects included in the Projects pane.
+
+```json
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"name": "WideWorldImportersDW",
+			"path": "..\\WideWorldImportersDW"
+		}
+	],
+	"settings": {
+		"dataworkspace.projects": [
+			"AdventureWorksLT.sqlproj",
+			"..\\WideWorldImportersDW\\WideWorldImportersDW.sqlproj"
+		]
+	}
+}
+```
+
 ## Next steps
 
 - [Getting Started with the SQL Database Projects extension](sql-database-project-extension-getting-started.md)

docs/azure-data-studio/faq.md

@@ -88,7 +88,7 @@ The SMO APIs aren't yet available on Linux or macOS in a consumable way. We port
 
 Yes.
 
-[SqlPackage.exe](../tools/sqlpackage-download.md) is now available on .NET Core for Windows, macOS, and Linux.  SQL Projects (SSDT) functionality is enabled in Azure Data Studio in the [SQL Database Projects extension](extensions/sql-database-project-extension.md).
+[SqlPackage.exe](../tools/sqlpackage/sqlpackage-download.md) is now available on .NET Core for Windows, macOS, and Linux.  SQL Projects (SSDT) functionality is enabled in Azure Data Studio in the [SQL Database Projects extension](extensions/sql-database-project-extension.md).
 
 ## Will SQL PowerShell cmdlets be available on Linux and macOS?
 

docs/connect/ado-net/distributed-transactions.md

@@ -25,7 +25,7 @@ A transaction is a set of related tasks that either succeeds (commit) or fails (
 
 In .NET, distributed transactions are managed through the API in the <xref:System.Transactions> namespace. The <xref:System.Transactions> API will delegate distributed transaction handling to a transaction monitor such as the Microsoft Distributed Transaction Coordinator (MS DTC) when multiple persistent resource managers are involved. For more information, see [Transaction Fundamentals](/dotnet/framework/data/transactions/transaction-fundamentals).
 
-ADO.NET 2.0 introduced support for enlisting in a distributed transaction using the `EnlistTransaction` method, which enlists a connection in a <xref:System.Transactions.Transaction> instance. In previous versions of ADO.NET, explicit enlistment in distributed transactions was performed using the `EnlistDistributedTransaction` method of a connection to enlist a connection in a <xref:System.EnterpriseServices.ITransaction> instance, which is supported for backwards compatibility. For more information on Enterprise Services transactions, see [Interoperability with Enterprise Services and COM+ Transactions](/dotnet/framework/data/transactions/interoperability-with-enterprise-services-and-com-transactions.md).
+ADO.NET 2.0 introduced support for enlisting in a distributed transaction using the `EnlistTransaction` method, which enlists a connection in a <xref:System.Transactions.Transaction> instance. In previous versions of ADO.NET, explicit enlistment in distributed transactions was performed using the `EnlistDistributedTransaction` method of a connection to enlist a connection in a <xref:System.EnterpriseServices.ITransaction> instance, which is supported for backwards compatibility. For more information on Enterprise Services transactions, see [Interoperability with Enterprise Services and COM+ Transactions](/dotnet/framework/data/transactions/interoperability-with-enterprise-services-and-com-transactions).
 
 When using a <xref:System.Transactions> transaction with the Microsoft SqlClient Data Provider for SQL Server against a SQL Server database, a lightweight <xref:System.Transactions.Transaction> will automatically be used. The transaction can then be promoted to a full distributed transaction on an as-needed basis. For more information, see [System.Transactions integration with SQL Server](system-transactions-integration-with-sql-server.md).
 

docs/connect/ado-net/handle-dataadapter-events.md

@@ -72,5 +72,5 @@ The following code example adds an event handler for the `FillError` event of th
 ## See also
 
 - [DataAdapters and DataReaders](dataadapters-datareaders.md)
-- [Events](/dotnet/standard/events/index.md)
+- [Events](/dotnet/standard/events/index)
 - [Microsoft ADO.NET for SQL Server](microsoft-ado-net-sql-server.md)

docs/connect/ado-net/retrieve-data-by-datareader.md

@@ -47,7 +47,7 @@ Always call the **Close** method when you have finished using the **DataReader**
 > While a **DataReader** is open, the **Connection** is in use exclusively by that **DataReader**. You cannot execute any commands for the **Connection**, including creating another **DataReader**, until the original **DataReader** is closed.  
 
 > [!NOTE]
-> Do not call **Close** or **Dispose** on a **Connection**, a **DataReader**, or any other managed object in the **Finalize** method of your class. In a finalizer, only release unmanaged resources that your class owns directly. If your class does not own any unmanaged resources, do not include a **Finalize** method in your class definition. For more information, see [Garbage Collection](/dotnet/standard/garbage-collection/index.md).
+> Do not call **Close** or **Dispose** on a **Connection**, a **DataReader**, or any other managed object in the **Finalize** method of your class. In a finalizer, only release unmanaged resources that your class owns directly. If your class does not own any unmanaged resources, do not include a **Finalize** method in your class definition. For more information, see [Garbage Collection](/dotnet/standard/garbage-collection/index).
  
 ## Retrieve multiple result-sets using NextResult
 

docs/database-engine/availability-groups/windows/active-secondaries-readable-secondary-replicas-always-on-availability-groups.md

@@ -156,7 +156,7 @@ ms.author: chadam
 
  Only [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] can create and update temporary statistics. However, you can delete temporary statistics and monitor their properties using the same tools that you use for permanent statistics:  
 
--   Delete temporary statistics using the [DROP STATISTICS](../../../t-sql/statements/drop-statistics-transact-sql.md)[!INCLUDE[tsql](../../../includes/tsql-md.md)] statement.  
+-   Delete temporary statistics using the [DROP STATISTICS](../../../t-sql/statements/drop-statistics-transact-sql.md) [!INCLUDE[tsql](../../../includes/tsql-md.md)] statement.  
 
 -   Monitor statistics using the **sys.stats** and **sys.stats_columns** catalog views. **sys_stats** includes a column, **is_temporary**, to indicate which statistics are permanent and which are temporary.  
 

docs/linux/sql-server-linux-migrate-ssms.md

@@ -13,7 +13,7 @@ ms.assetid: 2210cfc3-c23a-4025-a551-625890d6845f
 
 [!INCLUDE [SQL Server - Linux](../includes/applies-to-version/sql-linux.md)]
 
-This article shows how to use [SQL Server Management Studio (SSMS)](../ssms/download-sql-server-management-studio-ssms.md) and [SqlPackage.exe](../tools/sqlpackage.md) to export and import a database on SQL Server on Linux. SSMS and SqlPackage.exe are Windows applications, so use this technique when you have a Windows machine that can connect to a remote SQL Server instance on Linux.
+This article shows how to use [SQL Server Management Studio (SSMS)](../ssms/download-sql-server-management-studio-ssms.md) and [SqlPackage.exe](../tools/sqlpackage/sqlpackage.md) to export and import a database on SQL Server on Linux. SSMS and SqlPackage.exe are Windows applications, so use this technique when you have a Windows machine that can connect to a remote SQL Server instance on Linux.
 
 You should always install and use the most recent version of SQL Server Management Studio (SSMS) as described in [Use SSMS on Windows to connect to SQL Server on Linux](sql-server-linux-manage-ssms.md)
 
@@ -58,7 +58,7 @@ The *.BACPAC file is imported to create a new database in the target server you
 
 ## <a id="sqlpackage"></a> SqlPackage command-line option
 
-It is also possible to use the SQL Server Data Tools (SSDT) command-line tool, [SqlPackage.exe](../tools/sqlpackage.md), to export and import BACPAC files.
+It is also possible to use the SQL Server Data Tools (SSDT) command-line tool, [SqlPackage.exe](../tools/sqlpackage/sqlpackage.md), to export and import BACPAC files.
 
 The following example command exports a BACPAC file:
 
@@ -74,4 +74,4 @@ SqlPackage.exe /a:Import /tsn:tcp:<your_server> /tdn:<your_database> /tu:<userna
 ```
 
 ## See also
-For more information on how to use SSMS, see [Use SQL Server Management Studio](../ssms/sql-server-management-studio-ssms.md). For more information on SqlPackage.exe, see the [SqlPackage reference documentation](../tools/sqlpackage.md).
+For more information on how to use SSMS, see [Use SQL Server Management Studio](../ssms/sql-server-management-studio-ssms.md). For more information on SqlPackage.exe, see the [SqlPackage reference documentation](../tools/sqlpackage/sqlpackage.md).

docs/linux/sql-server-linux-overview.md

@@ -13,27 +13,17 @@ ms.assetid: 9dcc6a90-0add-42c2-815b-862e4e2a21ac
 
 [!INCLUDE [SQL Server - Linux](../includes/applies-to-version/sql-linux.md)]
 
-::: moniker range="= sql-server-2017 "
+::: moniker range="= sql-server-2017 || = sql-server-linux-2017"
 Starting with SQL Server 2017, SQL Server runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system.
-::: moniker-end
-
-::: moniker range=">= sql-server-ver15 || >= sql-server-linux-ver15"
-SQL Server 2019 runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system. To find out more about this release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md).
-::: moniker-end
 
-::: moniker range="= sql-server-2017"
 > [!TIP]
-> [SQL Server 2019](sql-server-linux-overview.md?view=sql-server-ver15) is available! To find out what's new for Linux in the latest release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md?view=sql-server-ver15).
+> [SQL Server 2019](sql-server-linux-overview.md?view=sql-server-ver15&preserve-view=true) is available! To find out what's new for Linux in the latest release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md?view=sql-server-ver15&preserve-view=true).
 ::: moniker-end
 
-::: moniker range="= sql-server-linux-2017"
-> [!TIP]
-> [SQL Server 2019](sql-server-linux-overview.md?view=sql-server-linux-ver15) is available! To find out what's new for Linux in the latest release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md?view=sql-server-linux-ver15).
+::: moniker range=">= sql-server-ver15 || >= sql-server-linux-ver15"
+SQL Server 2019 runs on Linux. It's the same SQL Server database engine, with many similar features and services regardless of your operating system. To find out more about this release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md).
 ::: moniker-end
 
-> [!TIP]
-> SQL Server 2019 is available! To find out what's new for Linux in the latest release, see [What's new in SQL Server 2019 for Linux](sql-server-linux-whats-new-2019.md).
-
 ## Install
 
 To get started, install SQL Server on Linux using one of the following quickstarts:
@@ -72,7 +62,7 @@ If you are already familiar with SQL Server, review the [Release notes](sql-serv
 
 [!INCLUDE[SQL Server 2019](../includes/sssqlv15-md.md)] has the same underlying database engine on all supported platforms, including Linux. Therefore, many existing features and capabilities operate the same way on Linux. This area of the documentation exposes some of these features from a Linux perspective. It also calls out areas that have unique requirements on Linux.
 
-If you are already familiar with SQL Server on Linux, review the [Release notes](sql-server-linux-release-notes-2019.md) for general guidelines and known issues for this release. Then look at [what's new for SQL Server 2019 on Linux](../sql-server/what-s-new-in-sql-server-ver15.md?view=sql-server-ver15).
+If you are already familiar with SQL Server on Linux, review the [Release notes](sql-server-linux-release-notes-2019.md) for general guidelines and known issues for this release. Then look at [what's new for SQL Server 2019 on Linux](../sql-server/what-s-new-in-sql-server-ver15.md).
 
 ::: moniker-end
 
@@ -96,4 +86,4 @@ Then look at what's new:
 
 [!INCLUDE[Get Help Options](../includes/paragraph-content/get-help-options.md)]
 
-[!INCLUDE[contribute-to-content](../includes/paragraph-content/contribute-to-content.md)]
+[!INCLUDE[contribute-to-content](../includes/paragraph-content/contribute-to-content.md)]

docs/relational-databases/security/encryption/always-encrypted-migrate-using-bacpac.md

@@ -30,7 +30,7 @@ For detailed information about how to export and import a database, see:
 - [Import a BACPAC File to Create a New User Database](../../data-tier-applications/import-a-bacpac-file-to-create-a-new-user-database.md)
 - [Export an Azure SQL database to a BACPAC file](/azure/sql-database/sql-database-export)
 - [Import a BACPAC file to a database in Azure SQL Database](/azure/sql-database/sql-database-import)
-- [SqlPackage.exe](../../../tools/sqlpackage.md)
+- [SqlPackage.exe](../../../tools/sqlpackage/sqlpackage.md)
 
 ## Permissions for migrating databases with encrypted columns