diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c6d340797c..f041acf3c8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ * Read our Pull Request guidelines: https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute#pull-requests. * Associate an issue with the Pull Request. -* Ensure that the code is up-to-date with the `master` branch. +* Ensure that the code is up-to-date with the `main` branch. * Include a description of the proposed changes and how to test them. --> diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb index c9db3fb69a..6e63103c87 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb @@ -23,7 +23,7 @@ { "cell_type": "markdown", "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/extensions/resource-deployment/images/microsoft-small-logo.png)\n", + "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/resource-deployment/images/microsoft-small-logo.png)\n", "## Run Azure SQL Edge image locally with Docker\n", "This notebook will use Docker to pull and run the Azure SQL Edge image and connect to it in Azure Data Studio\n", "\n", @@ -258,4 +258,4 @@ "execution_count": 8 } ] -} \ No newline at end of file +} diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb index 58ec30f1e0..031566d2e3 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb @@ -23,7 +23,7 @@ { "cell_type": "markdown", "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/extensions/resource-deployment/images/microsoft-small-logo.png)\n", + "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/resource-deployment/images/microsoft-small-logo.png)\n", "## Run Azure SQL DB Edge image on a remote machine with Docker\n", "This notebook will use SSH to connect to the remote machine, use Docker to pull and run the Azure SQL Edge image and connect to it in Azure Data Studio\n", "\n", @@ -363,4 +363,4 @@ "execution_count": null } ] -} \ No newline at end of file +} diff --git a/extensions/azurecore/README.md b/extensions/azurecore/README.md index 003e776621..80155f8f80 100644 --- a/extensions/azurecore/README.md +++ b/extensions/azurecore/README.md @@ -18,4 +18,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt). +Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt). diff --git a/extensions/query-history/README.md b/extensions/query-history/README.md index 145eac7843..cf6f86e1ea 100644 --- a/extensions/query-history/README.md +++ b/extensions/query-history/README.md @@ -64,4 +64,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt). +Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt). diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb index c93c2c333e..ddbd72c0b7 100644 --- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb +++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb @@ -23,7 +23,7 @@ { "cell_type": "markdown", "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", + "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/src/sql/media/microsoft-small-logo.png)\n", " \n", "## Create Azure Kubernetes Service cluster and deploy SQL Server 2019 Big Data Cluster\n", " \n", diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb index 3e524261fe..2090f9119c 100644 --- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb +++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb @@ -23,7 +23,7 @@ { "cell_type": "markdown", "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", + "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/src/sql/media/microsoft-small-logo.png)\n", " \n", "## Deploy SQL Server 2019 Big Data Cluster on an existing Azure Kubernetes Service (AKS) cluster\n", " \n", diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb index 6bb47a6e65..207ed76cca 100644 --- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb +++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb @@ -23,7 +23,7 @@ { "cell_type": "markdown", "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", + "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/src/sql/media/microsoft-small-logo.png)\n", " \n", "## Deploy SQL Server 2019 Big Data Cluster on an existing cluster deployed using kubeadm\n", " \n", diff --git a/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb b/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb index 7ddfdf3f68..6eb3f7fd1d 100644 --- a/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb +++ b/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb @@ -23,7 +23,7 @@ { "cell_type": "markdown", "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", + "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/src/sql/media/microsoft-small-logo.png)\n", "## Run SQL Server 2017 container images with Docker\n", "This notebook will use Docker to pull and run the SQL Server 2017 container image and connect to it in Azure Data Studio\n", "\n", diff --git a/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb b/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb index 5b04b8b2b7..f9b80f320b 100644 --- a/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb +++ b/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb @@ -23,7 +23,7 @@ { "cell_type": "markdown", "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", + "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/src/sql/media/microsoft-small-logo.png)\n", "## Run SQL Server 2019 container image with Docker\n", "This notebook will use Docker to pull and run the SQL Server 2019 container image and connect to it in Azure Data Studio\n", "\n", diff --git a/extensions/schema-compare/README.md b/extensions/schema-compare/README.md index 24d06999fc..70675099dd 100644 --- a/extensions/schema-compare/README.md +++ b/extensions/schema-compare/README.md @@ -28,4 +28,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt). +Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt). diff --git a/extensions/schema-compare/package.json b/extensions/schema-compare/package.json index 420c81f190..2eba0cf80b 100644 --- a/extensions/schema-compare/package.json +++ b/extensions/schema-compare/package.json @@ -9,7 +9,7 @@ "vscode": "^1.25.0", "azdata": ">=1.13.0" }, - "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", + "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "icon": "images/extension.png", "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e", "activationEvents": [ diff --git a/extensions/sql-assessment/README.md b/extensions/sql-assessment/README.md index dd95cf451a..2538b9e28d 100644 --- a/extensions/sql-assessment/README.md +++ b/extensions/sql-assessment/README.md @@ -13,4 +13,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt). +Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt). diff --git a/extensions/sql-assessment/package.json b/extensions/sql-assessment/package.json index 74434044fe..79fbf4655e 100644 --- a/extensions/sql-assessment/package.json +++ b/extensions/sql-assessment/package.json @@ -5,7 +5,7 @@ "version": "0.2.0", "publisher": "Microsoft", "preview": true, - "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", + "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "icon": "images/extension.png", "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e", "engines": { diff --git a/extensions/sql-database-projects/README.md b/extensions/sql-database-projects/README.md index 82a0cb65f4..ddd9353859 100644 --- a/extensions/sql-database-projects/README.md +++ b/extensions/sql-database-projects/README.md @@ -24,4 +24,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt). +Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt). diff --git a/extensions/sql-database-projects/package.json b/extensions/sql-database-projects/package.json index 70c067ee40..e251edc11b 100644 --- a/extensions/sql-database-projects/package.json +++ b/extensions/sql-database-projects/package.json @@ -9,7 +9,7 @@ "vscode": "^1.30.1", "azdata": ">=1.18.0" }, - "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", + "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "icon": "images/extension.png", "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e", "activationEvents": [ diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json index 30ba9e5881..b81b66fb16 100644 --- a/extensions/sql/syntaxes/sql.tmLanguage.json +++ b/extensions/sql/syntaxes/sql.tmLanguage.json @@ -1,6 +1,6 @@ { "information_for_contributors": [ - "This file has been converted from https://github.com/Microsoft/vscode-mssql/blob/master/syntaxes/SQL.plist", + "This file has been converted from https://github.com/Microsoft/vscode-mssql/blob/main/syntaxes/SQL.plist", "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], diff --git a/samples/notebookSamples/SampleTSQLNotebook.ipynb b/samples/notebookSamples/SampleTSQLNotebook.ipynb index b59cca9682..1ec76521fd 100644 --- a/samples/notebookSamples/SampleTSQLNotebook.ipynb +++ b/samples/notebookSamples/SampleTSQLNotebook.ipynb @@ -15,7 +15,7 @@ "cells": [ { "cell_type": "markdown", - "source": "\r\n\r\n## SQL Notebooks in Azure Data Studio\r\n\r\nNotebooks allow rich text, images, code, and resultsets to be easily shared. This is a concept that is widely used in data science and which we feel is well suited to SQL work. \r\n", + "source": "\r\n\r\n## SQL Notebooks in Azure Data Studio\r\n\r\nNotebooks allow rich text, images, code, and resultsets to be easily shared. This is a concept that is widely used in data science and which we feel is well suited to SQL work. \r\n", "metadata": {} }, { diff --git a/samples/sample-resource-deployment/package.json b/samples/sample-resource-deployment/package.json index 4a5097d742..5e32ca0ed8 100644 --- a/samples/sample-resource-deployment/package.json +++ b/samples/sample-resource-deployment/package.json @@ -5,7 +5,7 @@ "version": "0.0.1", "publisher": "Contoso", "preview": true, - "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", + "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "icon": "images/sqlserver.png", "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e", "engines": { diff --git a/samples/serverReports/README.md b/samples/serverReports/README.md index fa6a46070d..8d5d34d467 100644 --- a/samples/serverReports/README.md +++ b/samples/serverReports/README.md @@ -8,7 +8,7 @@ Welcome to **Server Reports** for Azure Data Studio! Server Reports give useful * Backup Growth Trend * Wait counts -Server Reports +Server Reports This extension is inspired by SQL Server Management Studio (SSMS)'s reports. We will continually add more useful server insights and tasks. @@ -17,7 +17,7 @@ This extension is also useful as a sample dashboard extension. It demonstrates b See the [Server Reports Extension Project] in the Azure Data Studio repository on Github for the extension source code. -[Server Reports Extension Project]:https://github.com/Microsoft/azuredatastudio/tree/master/samples/serverReports +[Server Reports Extension Project]:https://github.com/Microsoft/azuredatastudio/tree/main/samples/serverReports [extension authoring guide]:https://github.com/Microsoft/azuredatastudio/wiki/Getting-started-with-Extensibility diff --git a/samples/sp_whoIsActive/README.md b/samples/sp_whoIsActive/README.md index c62f3be43f..0a10da56a6 100644 --- a/samples/sp_whoIsActive/README.md +++ b/samples/sp_whoIsActive/README.md @@ -4,11 +4,11 @@ Welcome to **sp_whoisactive** for Azure Data Studio! Sp_whoisactive is a procedu ## Tasks and insights: -insights +insights Details: -insights +insights ## Why use sp_whoisactive? @@ -31,7 +31,7 @@ See [sp_whoisactive extension project] in the Azure Data Studio for the extensio [Adam Machanic’s blog]:http://sqlblog.com/blogs/adam_machanic/default.aspx [sp_whoisactive Documentation]:http://whoisactive.com/ -[sp_whoisactive extension project]:https://github.com/Microsoft/azuredatastudio/tree/master/samples/sp_whoIsActive +[sp_whoisactive extension project]:https://github.com/Microsoft/azuredatastudio/tree/main/samples/sp_whoIsActive [extension authoring guide]:https://github.com/Microsoft/azuredatastudio/wiki/Getting-started-with-Extensibility ## Contributions and "thank you" diff --git a/samples/sqlservices/package.json b/samples/sqlservices/package.json index d3aa108c77..cff5cb0f88 100644 --- a/samples/sqlservices/package.json +++ b/samples/sqlservices/package.json @@ -115,6 +115,6 @@ }, "repository": { "type": "git", - "url": "https://github.com/Microsoft/azuredatastudio/tree/master/samples/sqlservices" + "url": "https://github.com/Microsoft/azuredatastudio/tree/main/samples/sqlservices" } }