change master to main (#6679)

* change master to main

* master to main

Author: Elaheh Rashedi

.github/workflows/ci_linux.yml

@@ -2,9 +2,9 @@ name: CI (Linux)
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

.github/workflows/ci_mac.yml

@@ -2,9 +2,9 @@ name: CI (Mac)
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

.github/workflows/ci_windows.yml

@@ -2,9 +2,9 @@ name: CI (Windows)
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

Build/lldb-mi/lldb-mi.yml

@@ -6,7 +6,7 @@ variables:
   llvm_additional_parameters: "-DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_INCLUDE_TESTS=OFF -DLLDB_BUILD_FRAMEWORK=1"
   # TODO: fix lldb_mi_repo and lldb_mi_branch (https://github.com/lldb-tools/lldb-mi/pull/37 and https://github.com/lldb-tools/lldb-mi/pull/39)
   lldb_mi_repo: https://github.com/WardenGnaw/lldb-mi # TODO: Change to lldb-tools
-  lldb_mi_branch: release/cpptools # TODO: Change to master
+  lldb_mi_branch: release/cpptools # TODO: Change to main
   lldb_mi_additional_parameters: "-DUSE_LLDB_FRAMEWORK=1"
 
 jobs:

CONTRIBUTING.md

@@ -6,14 +6,14 @@
 * File an [issue](https://github.com/Microsoft/vscode-cpptools/issues) and a [pull request](https://github.com/Microsoft/vscode-cpptools/pulls) with the change and we will review it.
 * If the change affects functionality, add a line describing the change to [**CHANGELOG.md**](Extension/CHANGELOG.md).
 * Try and add a test in [**test/extension.test.ts**](Extension/test/unitTests/extension.test.ts).
-* Run tests via opening the [**Extension**](https://github.com/Microsoft/vscode-cpptools/tree/master/Extension) folder in Visual Studio Code, selecting the "Launch Tests" configuration in the Debug pane, and choosing "Start Debugging".
+* Run tests via opening the [**Extension**](https://github.com/Microsoft/vscode-cpptools/tree/main/Extension) folder in Visual Studio Code, selecting the "Launch Tests" configuration in the Debug pane, and choosing "Start Debugging".
 
 ## About the Code
 
 * Execution starts in the `activate` method in [**main.ts**](Extension/src/main.ts).
   * `processRuntimeDependencies` handles the downloading and installation of the OS-dependent files. Downloading code exists in [**packageManager.ts**](Extension/src/packageManager.ts).
   * `downloadCpptoolsJsonPkg` handles the **cpptools.json**, which can be used to enable changes to occur mid-update, such as turning the `intelliSenseEngine` to `"Default"` for a certain percentage of users.
-* The debugger code is in the [**Debugger**](https://github.com/Microsoft/vscode-cpptools/tree/master/Extension/src/Debugger) folder.
+* The debugger code is in the [**Debugger**](https://github.com/Microsoft/vscode-cpptools/tree/main/Extension/src/Debugger) folder.
 * [**LanguageServer/client.ts**](Extension/src/LanguageServer/client.ts) handles various language server functionality.
 * [**LanguageServer/configurations.ts**](Extension/src/LanguageServer/configurations.ts) handles functionality related to **c_cpp_properties.json**.
 * [**telemetry.ts**](Extension/src/telemetry.ts): Telemetry data gets sent to either `logLanguageServerEvent` or `logDebuggerEvent`.

Extension/CHANGELOG.md

@@ -444,7 +444,7 @@
 
 ## Version 0.24.0: July 3, 2019
 ### New Features
-* Semantic colorization [Documentation](https://github.com/microsoft/vscode-cpptools/blob/master/Documentation/LanguageServer/colorization.md) [#230](https://github.com/microsoft/vscode-cpptools/issues/230)
+* Semantic colorization [Documentation](https://github.com/microsoft/vscode-cpptools/blob/main/Documentation/LanguageServer/colorization.md) [#230](https://github.com/microsoft/vscode-cpptools/issues/230)
 * Add `Rescan Workspace` command. [microsoft/vscode-cpptools-api#11](https://github.com/microsoft/vscode-cpptools-api/issues/11)
 
 ### Enhancements

Extension/README.md

@@ -1,6 +1,6 @@
 # C/C++ for Visual Studio Code
 
-#### [Repository](https://github.com/microsoft/vscode-cpptools)  |  [Issues](https://github.com/microsoft/vscode-cpptools/issues)  |  [Documentation](https://code.visualstudio.com/docs/languages/cpp)  |  [Code Samples](https://github.com/microsoft/vscode-cpptools/tree/master/Code%20Samples)  |  [Offline Installers](https://github.com/microsoft/vscode-cpptools/releases)
+#### [Repository](https://github.com/microsoft/vscode-cpptools)  |  [Issues](https://github.com/microsoft/vscode-cpptools/issues)  |  [Documentation](https://code.visualstudio.com/docs/languages/cpp)  |  [Code Samples](https://github.com/microsoft/vscode-cpptools/tree/main/Code%20Samples)  |  [Offline Installers](https://github.com/microsoft/vscode-cpptools/releases)
 
 [![Badge](https://aka.ms/vsls-badge)](https://aka.ms/vsls)
 

Extension/package.json

@@ -2,7 +2,7 @@
   "name": "cpptools",
   "displayName": "C/C++",
   "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "1.1.3-master",
+  "version": "1.1.3-main",
   "publisher": "ms-vscode",
   "icon": "LanguageCCPP_color_128x.png",
   "readme": "README.md",

Extension/test/unitTests/updowngrade.test.ts

@@ -58,14 +58,14 @@ suite("UpgradeDowngrade", () => {
                 const targetBuild: Build | undefined = getTargetBuild(builds, userVersion, updateChannel, false);
                 assert.equal(targetBuild, undefined);
             });
-            test("Release to Insider (master)", () => {
+            test("Release to Insider (main)", () => {
                 const builds: Build[] = [{
                     name: insider3, assets: three_assets}, {
                     name: insider2, assets: three_assets}, {
                     name: insider1, assets: three_assets}, {
                     name: release0, assets: three_assets}];
-                // In internal testing, the name of the release has a "-master" at the end of it.
-                const userVersion: PackageVersion = new PackageVersion(release1 + "-master");
+                // In internal testing, the name of the release has a "-main" at the end of it.
+                const userVersion: PackageVersion = new PackageVersion(release1 + "-main");
                 const targetBuild: Build | undefined = getTargetBuild(builds, userVersion, updateChannel, false);
                 assert.equal(targetBuild, undefined);
             });
@@ -104,14 +104,14 @@ suite("UpgradeDowngrade", () => {
                     const targetBuild: Build | undefined = getTargetBuild(builds, userVersion, updateChannel, false);
                     assert.equal(targetBuild, undefined);
                 });
-                test("Release to Insider (master)", () => {
+                test("Release to Insider (main)", () => {
                     const builds: Build[] = [{
                         name: insider3, assets: three_assets}, {
                         name: insider2, assets: three_assets}, {
                         name: insider1, assets: three_assets}, {
                         name: release0, assets: three_assets}];
-                    // In internal testing, the name of the release has a "-master" at the end of it.
-                    const userVersion: PackageVersion = new PackageVersion(release1 + "-master");
+                    // In internal testing, the name of the release has a "-main" at the end of it.
+                    const userVersion: PackageVersion = new PackageVersion(release1 + "-main");
                     const targetBuild: Build | undefined = getTargetBuild(builds, userVersion, updateChannel, false);
                     assert.equal(targetBuild, undefined);
                 });

Extension/translations_auto_pr.js

@@ -6,7 +6,7 @@ const Octokit = require('@octokit/rest')
 const path = require('path');
 
 const branchName = 'localization';
-const mergeTo = 'master';
+const mergeTo = 'main';
 const commitComment = 'Localization - Translated Strings';
 const pullRequestTitle = '[Auto] Localization - Translated Strings';
 
@@ -92,7 +92,7 @@ if (!hasAnyChanges()) {
 
 console.log("Changes detected");
 
-console.log(`Ensure master ref is up to date locally (git fetch)`);
+console.log(`Ensure main ref is up to date locally (git fetch)`);
 cp.execSync('git fetch');
 
 // Remove old localization branch, if any
@@ -151,8 +151,8 @@ octokit.pulls.list({ owner: repoOwner, repo: repoName }).then(({data}) => {
     cp.execSync('git remote remove origin');
     cp.execSync(`git remote add origin https://github.com/${repoOwner}/${repoName}.git`);
 
-    console.log(`Switching back to master (git checkout master)`);
-    cp.execSync('git checkout master');
+    console.log(`Switching back to main (git checkout main)`);
+    cp.execSync('git checkout main');
 
     console.log(`Remove localization branch (git branch -D localization)`);
     cp.execSync('git branch -D localization');