Update various branch references to main branch (#10913)

2026-01-13 17:22:15 -05:00 · 2020-06-13 14:26:18 -07:00
parent ddb210e971
commit 434d017a6b
35 changed files with 51 additions and 51 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,11 +3,11 @@ name: CI
 on:
  push:
    branches:
-      - master
+      - main
      - release/*
  pull_request:
    branches:
-      - master
+      - main
      - release/*

 jobs:
--- a/.github/workflows/on-issue-open.yml
+++ b/.github/workflows/on-issue-open.yml
@@ -11,7 +11,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/azuredatastudio'
-          ref: master
+          ref: main
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions/build/actions
--- a/.github/workflows/on-pr-open.yml
+++ b/.github/workflows/on-pr-open.yml
@@ -12,7 +12,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: 'microsoft/azuredatastudio'
-          ref: master
+          ref: main
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions/build/actions
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Azure Data Studio

 [![Join the chat at https://gitter.im/Microsoft/sqlopsstudio](https://badges.gitter.im/Microsoft/sqlopsstudio.svg)](https://gitter.im/Microsoft/sqlopsstudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://dev.azure.com/azuredatastudio/azuredatastudio/_apis/build/status/Azure%20Data%20Studio%20CI?branchName=master)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=master)
+[![Build Status](https://dev.azure.com/azuredatastudio/azuredatastudio/_apis/build/status/Azure%20Data%20Studio%20CI?branchName=main)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=main)
 [![Twitter Follow](https://img.shields.io/twitter/follow/azuredatastudio?style=social)](https://twitter.com/azuredatastudio)

 Azure Data Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
@@ -21,14 +21,14 @@ Azure Data Studio is a data management tool that enables you to work with SQL Se

 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.

-## Try out the latest insiders build from `master`:
+## Try out the latest insiders build from `main`:
 - [Windows User Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-user/insider)
 - [Windows System Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64/insider)
 - [Windows ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-archive/insider)
 - [macOS ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin/insider)
 - [Linux TAR.GZ - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/linux-x64/insider)

-See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
+See the [change log](https://github.com/Microsoft/azuredatastudio/blob/main/CHANGELOG.md) for additional details of what's in this release.

 ## **Feature Highlights**

@@ -47,7 +47,7 @@ See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CH

 Here are some of these features in action.

-<img src='https://github.com/Microsoft/azuredatastudio/blob/master/docs/overview_screen.jpg' width='800px'>
+<img src='https://github.com/Microsoft/azuredatastudio/blob/main/docs/overview_screen.jpg' width='800px'>

 ## Contributing
 If you are interested in fixing issues and contributing directly to the code base,
@@ -121,7 +121,7 @@ We would like to thank all our users who raised issues, and in particular the fo
 * olljanat for `Implemented npm version check (#314)`
 * Adam Machanic for helping with the `whoisactive` extension

-And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/ThirdPartyNotices.txt)
+And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/ThirdPartyNotices.txt)

 ## License

--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,5 +1,5 @@
 trigger:
-  - master
+  - main
  - release/*

 jobs:
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -216,10 +216,10 @@ async function publish(commit: string, quality: string, platform: string, type:
 	console.log('Asset:', JSON.stringify(asset, null, '  '));

 	// {{SQL CARBON EDIT}}
-	// Insiders: nightly build from master
+	// Insiders: nightly build from main
 	const isReleased = (
 		(
-			(quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch)) ||
+			(quality === 'insider' && /^main$|^refs\/heads\/main$/.test(sourceBranch)) ||
 			(quality === 'rc1' && /^release\/|^refs\/heads\/release\//.test(sourceBranch))
 		) &&
 		/Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy)
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -3,10 +3,10 @@ pool:

 trigger:
  branches:
-    include: ['master', 'release/*']
+    include: ['main', 'release/*']
 pr:
  branches:
-    include: ['master', 'release/*']
+    include: ['main', 'release/*']

 steps:
 - task: NodeTool@0
@@ -34,8 +34,8 @@ steps:
    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
    git fetch distro

-    # Push master branch into oss/master
-    git push distro origin/master:refs/heads/oss/master
+    # Push main branch into oss/master
+    git push distro origin/main:refs/heads/oss/master

    # Push every release branch into oss/release
    git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro
--- a/build/azure-pipelines/exploration-build.yml
+++ b/build/azure-pipelines/exploration-build.yml
@@ -3,10 +3,10 @@ pool:

 trigger:
  branches:
-    include: ['master']
+    include: ['main']
 pr:
  branches:
-    include: ['master']
+    include: ['main']

 steps:
 - task: NodeTool@0
@@ -32,9 +32,9 @@ steps:
    git config user.name "VSCode"

    git checkout origin/electron-8.0.x
-    git merge origin/master
+    git merge origin/main

-    # Push master branch into exploration branch
+    # Push main branch into exploration branch
    git push origin HEAD:electron-8.0.x

  displayName: Sync & Merge Exploration
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -160,4 +160,4 @@ schedules:
  displayName: Mon-Fri at 7:00
  branches:
    include:
-    - master
+    - main
--- a/build/azure-pipelines/sql-product-build.yml
+++ b/build/azure-pipelines/sql-product-build.yml
@@ -101,4 +101,4 @@ schedules:
  displayName: Mon-Fri at 7:00
  branches:
    include:
-    - master
+    - main
--- a/extensions/admin-pack/README.md
+++ b/extensions/admin-pack/README.md
@@ -29,4 +29,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).
--- a/extensions/admin-tool-ext-win/README.md
+++ b/extensions/admin-tool-ext-win/README.md
@@ -31,4 +31,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).
--- a/extensions/admin-tool-ext-win/package.json
+++ b/extensions/admin-tool-ext-win/package.json
@@ -5,7 +5,7 @@
  "version": "0.1.0",
  "publisher": "Microsoft",
  "preview": true,
-  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/admin-tool-ext-win/license/Azure%20Data%20Studio%20Extension%20-%20Standalone%20(free)%20Use%20Terms.txt",
+  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/extensions/admin-tool-ext-win/license/Azure%20Data%20Studio%20Extension%20-%20Standalone%20(free)%20Use%20Terms.txt",
  "icon": "images/extension.png",
  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
  "engines": {
--- a/extensions/agent/README.md
+++ b/extensions/agent/README.md
@@ -23,4 +23,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).
--- a/extensions/agent/package.json
+++ b/extensions/agent/package.json
@@ -5,7 +5,7 @@
  "version": "0.48.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": {
--- a/extensions/arc/README.md
+++ b/extensions/arc/README.md
@@ -14,4 +14,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).
--- a/extensions/arc/package.json
+++ b/extensions/arc/package.json
@@ -5,7 +5,7 @@
  "version": "0.1.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",
  "engines": {
    "vscode": "*",
--- a/extensions/big-data-cluster/README.md
+++ b/extensions/big-data-cluster/README.md
@@ -14,4 +14,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).
--- a/extensions/big-data-cluster/package.json
+++ b/extensions/big-data-cluster/package.json
@@ -5,7 +5,7 @@
 	"version": "1.0.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",
 	"engines": {
 		"vscode": "*",
--- a/extensions/cms/README.md
+++ b/extensions/cms/README.md
@@ -25,4 +25,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).
--- a/extensions/cms/package.json
+++ b/extensions/cms/package.json
@@ -5,7 +5,7 @@
  "version": "0.9.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",
  "engines": {
    "vscode": "^1.25.0",
--- a/extensions/dacpac/README.md
+++ b/extensions/dacpac/README.md
@@ -31,4 +31,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).
--- a/extensions/dacpac/package.json
+++ b/extensions/dacpac/package.json
@@ -9,7 +9,7 @@
    "vscode": "^1.25.0",
    "azdata": ">=1.15.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": [
--- a/extensions/import/README.md
+++ b/extensions/import/README.md
@@ -22,13 +22,13 @@ This wizard was created to improve the current import experience leveraging an i

 PROSE analyzes data patterns in your input file to infer column names, types, delimiters, and more. This framework learns the structure of the file and does all of the hard work so users don't have to.

- Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE  EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).
+ Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE  EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).

 ## License

 Copyright (c) Microsoft Corporation. All rights reserved.

-Licensed under the [MICROSOFT SQL SERVER IMPORT EXTENSION EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).
+Licensed under the [MICROSOFT SQL SERVER IMPORT EXTENSION EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).

 > Note: Microsoft SQL Server Import for Azure Data Studio extension contains the Microsoft SQL Tools Import Flat File component which is also licensed under the above EULA.

--- a/extensions/import/package.json
+++ b/extensions/import/package.json
@@ -9,7 +9,7 @@
 		"vscode": "^1.25.0",
 		"azdata": "*"
 	},
-	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx",
+	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx",
 	"icon": "images/extension.png",
 	"aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
 	"activationEvents": [
--- a/extensions/machine-learning/README.md
+++ b/extensions/machine-learning/README.md
@@ -52,4 +52,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).
--- a/extensions/machine-learning/package.json
+++ b/extensions/machine-learning/package.json
@@ -15,7 +15,7 @@
    "onCommand:ml.command.importModel",
    "onDashboardOpen"
  ],
-  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
+  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
  "icon": "images/extensionIcon.png",
  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
  "main": "./out/main",
--- a/extensions/notebook/README.md
+++ b/extensions/notebook/README.md
@@ -20,4 +20,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).
--- a/extensions/profiler/README.md
+++ b/extensions/profiler/README.md
@@ -40,4 +40,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).
--- a/extensions/profiler/package.json
+++ b/extensions/profiler/package.json
@@ -5,7 +5,7 @@
 	"version": "0.12.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": {
--- a/extensions/query-history/README.md
+++ b/extensions/query-history/README.md
@@ -6,11 +6,11 @@ Adds a Query History panel for viewing and running past executed queries.

 Query History is displayed as a tab in the tab panel, which is toggled by the **View: Toggle Panel** command.

-![Query History tab](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/extensions/query-history/images/QueryHistoryTab.PNG)
+![Query History tab](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/query-history/images/QueryHistoryTab.PNG)

 Initially this view will be empty but once you execute a query editor that will be captured in the window - with a separate row displayed for every query executed.

-![Query History tab with queries](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/extensions/query-history/images/QueryHistoryTabWithQueries.PNG)
+![Query History tab with queries](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/query-history/images/QueryHistoryTabWithQueries.PNG)

 Each row consists of 4 parts :
 - Status icon : This will be a ✔️ if the query executed successfully. If any errors occurred a ❌ is shown.
@@ -22,7 +22,7 @@ Each row consists of 4 parts :

 Right clicking on a history row will bring up a menu with a number of actions available.

-![Query History action menu](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/extensions/query-history/images/QueryHistoryActionMenu.PNG)
+![Query History action menu](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/query-history/images/QueryHistoryActionMenu.PNG)

 #### Open Query

--- a/extensions/query-history/package.json
+++ b/extensions/query-history/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": {
--- a/extensions/resource-deployment/README.md
+++ b/extensions/resource-deployment/README.md
@@ -14,4 +14,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).
--- a/extensions/resource-deployment/package.json
+++ b/extensions/resource-deployment/package.json
@@ -5,7 +5,7 @@
  "version": "0.0.1",
  "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": {
--- a/product.json
+++ b/product.json
@@ -5,7 +5,7 @@
 	"dataFolderName": ".azuredatastudio",
 	"win32MutexName": "azuredatastudio",
 	"licenseName": "Microsoft EULA",
-	"licenseUrl": "https://github.com/Microsoft/azuredatastudio/blob/master/LICENSE.txt",
+	"licenseUrl": "https://github.com/Microsoft/azuredatastudio/blob/main/LICENSE.txt",
 	"win32DirName": "Azure Data Studio",
 	"win32NameVersion": "Azure Data Studio",
 	"win32RegValueName": "azuredatastudio",