Skip to content

Commit 9102db9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 20260224-mikeray/cdc-f1-help-removal
2 parents ec2ce61 + 1875e6a commit 9102db9

60 files changed

Lines changed: 774 additions & 234 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47780,6 +47780,11 @@
4778047780
"redirect_url": "/previous-versions/sql/2014/tools/osql-utility",
4778147781
"redirect_document_id": false
4778247782
},
47783+
{
47784+
"source_path": "docs/tools/mssql-cli.md",
47785+
"redirect_url": "/sql/tools/sqlcmd/sqlcmd-utility",
47786+
"redirect_document_id": false
47787+
},
4778347788
{
4778447789
"source_path": "docs/2014/tools/profiler-utility.md",
4778547790
"redirect_url": "/previous-versions/sql/2014/tools/profiler-utility",

docs/linux/includes/quickstart-connect-query.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
---
1111
## Connect locally
1212

13-
The following steps use **sqlcmd** to locally connect to your new [!INCLUDE [ssnoversion-md](../../includes/ssnoversion-md.md)] instance.
13+
The following steps use the [sqlcmd utility](../../tools/sqlcmd/sqlcmd-utility.md) to locally connect to your new [!INCLUDE [ssnoversion-md](../../includes/ssnoversion-md.md)] instance. [Download and install the sqlcmd utility](../../tools/sqlcmd/sqlcmd-download-install.md) for Windows, Linux and macOS.
1414

1515
> [!CAUTION]
1616
> [!INCLUDE [password-complexity](password-complexity.md)]
@@ -22,7 +22,7 @@ The following steps use **sqlcmd** to locally connect to your new [!INCLUDE [ssn
2222
```
2323

2424
> [!NOTE]
25-
> Newer versions of **sqlcmd** are secure by default. For more information about connection encryption, see [sqlcmd utility](../../tools/sqlcmd/sqlcmd-utility.md) for Windows, and [Connecting with sqlcmd](../../connect/odbc/linux-mac/connecting-with-sqlcmd.md) for Linux and macOS. If the connection doesn't succeed, you can add the `-No` option to **sqlcmd** to specify that encryption is optional, not mandatory.
25+
> Newer versions of **sqlcmd** are secure by default. For more information about connection encryption, see [sqlcmd utility](../../tools/sqlcmd/sqlcmd-utility.md) for Windows, Linux and macOS. If the connection doesn't succeed, you can add the `-No` option to **sqlcmd** to specify that encryption is optional, not mandatory.
2626
2727
You can omit the password on the command line to be prompted to enter it.
2828

@@ -137,7 +137,6 @@ In addition to **sqlcmd**, you can use the following cross-platform tools to man
137137
| --- | --- |
138138
| [Visual Studio Code](../../tools/visual-studio-code-extensions/mssql/connect-database-visual-studio-code.md) | A cross-platform GUI code editor that runs Transact-SQL statements with the [MSSQL extension](../../tools/visual-studio-code-extensions/mssql/mssql-extension-visual-studio-code.md). |
139139
| [PowerShell](../sql-server-linux-manage-powershell-core.md) | A cross-platform automation and configuration tool based on cmdlets. |
140-
| [mssql-cli](https://github.com/dbcli/mssql-cli/tree/master/doc) | A cross-platform command-line interface for running Transact-SQL commands. |
141140

142141
## Connect from Windows
143142

docs/linux/quickstart-install-connect-docker.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,6 @@ Other common tools to connect to [!INCLUDE [ssnoversion-md](../includes/ssnovers
15341534

15351535
- [MSSQL extension for Visual Studio Code](../tools/visual-studio-code-extensions/mssql/mssql-extension-visual-studio-code.md)
15361536
- [SQL Server Management Studio](sql-server-linux-manage-ssms.md)
1537-
- [mssql-cli (Preview)](https://github.com/dbcli/mssql-cli/blob/master/doc/usage_guide.md)
15381537
- [PowerShell](sql-server-linux-manage-powershell-core.md)
15391538

15401539
## Remove your container

docs/linux/sql-server-linux-faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sections:
6666
6767
1. **How do I verify the installed version and edition of SQL Server on Linux?**
6868
69-
Connect to the SQL Server instance with a client tool such as **sqlcmd**, **mssql-cli**, or Visual Studio Code. Then run the following Transact-SQL query to verify the version and edition of SQL Server that you are running:
69+
Connect to the SQL Server instance with a client tool such as the [sqlcmd utility](../tools/sqlcmd/sqlcmd-utility.md), or Visual Studio Code. Then run the following Transact-SQL query to verify the version and edition of SQL Server that you are running:
7070
7171
```sql
7272
SELECT @@VERSION
@@ -107,7 +107,7 @@ sections:
107107
108108
1. **Are commands like sqlcmd and bcp available on Linux?**
109109
110-
Yes, [sqlcmd and bcp](sql-server-linux-setup-tools.md) are natively available on Linux, macOS, and Windows. In addition, use the new [mssql-scripter](https://github.com/Microsoft/mssql-scripter) command-line tool on Linux, macOS, or Windows to generate T-SQL scripts for your SQL database running anywhere. Also, see the preview release for [mssql-cli](https://blogs.technet.microsoft.com/dataplatforminsider/2017/12/12/try-mssql-cli-a-new-interactive-command-line-tool-for-sql-server/).
110+
Yes, [sqlcmd and bcp](sql-server-linux-setup-tools.md) are natively available on Linux, macOS, and Windows. In addition, use the new [mssql-scripter](https://github.com/Microsoft/mssql-scripter) command-line tool on Linux, macOS, or Windows to generate T-SQL scripts for your SQL database running anywhere.
111111
112112
1. **Is it possible to view Activity Monitor when connected through SSMS on Windows for an instance running on Linux?**
113113

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ The Named Pipes protocol isn't supported for [!INCLUDE [ssnoversion-md](../inclu
3737

3838
SQL Server Management Studio (SSMS) is a Windows application that provides a graphical user interface for managing [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)]. Although it currently runs only on Windows, you can use it to remotely connect to your Linux [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] instances. For more information on using SSMS to manage [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)], see [Use SQL Server Management Studio on Windows to manage SQL Server on Linux](sql-server-linux-manage-ssms.md).
3939

40-
## mssql-cli (preview)
41-
42-
Microsoft has released a new cross-platform scripting tool for [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)], [mssql-cli](https://www.microsoft.com/sql-server/blog/2017/12/12/try-mssql-cli-a-new-interactive-command-line-tool-for-sql-server). This tool is currently in preview.
43-
4440
## PowerShell
4541

4642
PowerShell provides a rich command-line environment to manage [!INCLUDE [ssnoversion-md](../includes/ssnoversion-md.md)] on Linux. For more information, see [Use PowerShell on Windows to manage SQL Server on Linux](sql-server-linux-manage-powershell.md).

docs/toc.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8172,8 +8172,6 @@ items:
81728172
- name: Command prompt utilities
81738173
href: tools/command-prompt-utility-reference-database-engine.md
81748174
items:
8175-
- name: mssql-cli
8176-
href: tools/mssql-cli.md
81778175
- name: osql
81788176
href: tools/osql-utility.md
81798177
- name: Profiler utility
@@ -8964,25 +8962,21 @@ items:
89648962
- name: Use smart query builder
89658963
href: tools/visual-studio-code-extensions/github-copilot/smart-query-builder.md
89668964
- name: Fabric integration
8967-
items:
8968-
- name: Overview
8969-
href: tools/visual-studio-code-extensions/mssql/mssql-fabric-integration.md
8965+
href: tools/visual-studio-code-extensions/mssql/mssql-fabric-integration.md
89708966
- name: Local SQL Server container
8971-
items:
8972-
- name: Overview
8973-
href: tools/visual-studio-code-extensions/mssql/mssql-local-container.md
8967+
href: tools/visual-studio-code-extensions/mssql/mssql-local-container.md
8968+
- name: Transition from Azure Data Studio
8969+
href: tools/visual-studio-code-extensions/mssql/mssql-azure-data-studio-transition.md
8970+
- name: Database operations
8971+
href: tools/visual-studio-code-extensions/mssql/mssql-database-operations.md
8972+
- name: Query profiler
8973+
href: tools/visual-studio-code-extensions/mssql/mssql-query-profiler.md
89748974
- name: Schema compare
8975-
items:
8976-
- name: Overview
8977-
href: tools/visual-studio-code-extensions/mssql/mssql-schema-compare.md
8975+
href: tools/visual-studio-code-extensions/mssql/mssql-schema-compare.md
89788976
- name: Schema designer
8979-
items:
8980-
- name: Overview
8981-
href: tools/visual-studio-code-extensions/mssql/mssql-schema-designer.md
8982-
- name: Data-tier Application
8983-
items:
8984-
- name: Overview
8985-
href: tools/visual-studio-code-extensions/mssql/mssql-data-tier-application.md
8977+
href: tools/visual-studio-code-extensions/mssql/mssql-schema-designer.md
8978+
- name: Data-tier application
8979+
href: tools/visual-studio-code-extensions/mssql/mssql-data-tier-application.md
89868980
- name: SQL bindings for Azure Functions
89878981
items:
89888982
- name: Overview

docs/tools/Includes/sql-server-profiler/xevents-sql-server-profiler.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

docs/tools/mssql-cli.md

Lines changed: 0 additions & 88 deletions
This file was deleted.

docs/tools/sql-server-profiler/sql-server-profiler.md

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: SQL Server Profiler
44
description: Explore the features of SQL Server Profiler. Get help troubleshooting problems by using this tool to create traces and analyze and replay trace results.
55
author: rwestMSFT
66
ms.author: randolphwest
7-
ms.date: 01/28/2026
7+
ms.date: 02/21/2026
88
ms.service: sql
99
ms.subservice: profiler
1010
ms.topic: concept-article
@@ -18,23 +18,34 @@ ms.collection:
1818

1919
[!INCLUDE [ssSqlProfiler](../../includes/sssqlprofiler-md.md)] is an interface to create and manage traces and analyze and replay trace results. Events are saved in a trace file that you can later analyze or use to replay a specific series of steps when diagnosing a problem.
2020

21-
[!INCLUDE [xevents-sql-server-profiler](../Includes/sql-server-profiler/xevents-sql-server-profiler.md)]
22-
2321
When you try to connect to an Azure SQL Database from the SQL Server Profiler, it incorrectly throws a misleading error message as follows:
2422

2523
```output
26-
To run a trace against SQL Server, you must be a **sysadmin** fixed server role member or have the ALTER TRACE permission.
24+
To run a trace against SQL Server, you must be a sysadmin fixed server role member or have the ALTER TRACE permission.
2725
```
2826

29-
The message should have explained that Azure SQL Database isn't supported by SQL Server profiler.
27+
The message should state that Azure SQL Database isn't supported by SQL Server Profiler.
28+
29+
## Deprecation notice
30+
31+
> [!IMPORTANT]
32+
> SQL Trace and SQL Server Profiler are deprecated. Use [Extended Events](../../relational-databases/extended-events/extended-events.md) instead. [!INCLUDE [ssnotedepfutureavoid-md](../../includes/ssnotedepfutureavoid-md.md)]
33+
34+
The `Microsoft.SqlServer.Management.Trace` namespace that contains the SQL Server Trace and Replay objects is also deprecated. However, Analysis Services workloads are supported.
35+
36+
For more information on [Extended Events](../../relational-databases/extended-events/extended-events.md), see the following articles:
37+
38+
- [Quickstart: Extended Events](../../relational-databases/extended-events/quick-start-extended-events-in-sql-server.md)
39+
- For SQL Server Management Studio, use [XEvent Profiler](../../relational-databases/extended-events/use-the-ssms-xe-profiler.md)
40+
- For the [MSSQL extension for Visual Studio Code](../visual-studio-code-extensions/mssql/mssql-extension-visual-studio-code.md), use [Query Profiler (Preview)](../visual-studio-code-extensions/mssql/mssql-query-profiler.md).
3041

3142
## Where's the Profiler?
3243

3344
You can start the Profiler within [Run SQL Server Profiler](start-sql-server-profiler.md).
3445

3546
## Capture and replay trace data
3647

37-
The following table shows the features we recommend using in [!INCLUDE [ssnoversion](../../includes/ssnoversion-md.md)] to capture and replay your trace data.
48+
The following table shows the features you can use in [!INCLUDE [ssnoversion](../../includes/ssnoversion-md.md)] to capture and replay your trace data.
3849

3950
| Feature / target workload | Relational Engine | Analysis Services |
4051
| --- | --- | --- |

docs/tools/visual-studio-code-extensions/github-copilot/business-logic-explainer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const customerRevenue = await SalesOrderHeader.findAll({
210210

211211
## Share your experience
212212

213-
[!INCLUDE [feedback](../includes/feedback.md)]
213+
[!INCLUDE [copilot-feedback](../includes/copilot-feedback.md)]
214214

215215
## Related content
216216

0 commit comments

Comments
 (0)