From 72c9f2115e5c9db62c4aa9b8c55a5766898a6985 Mon Sep 17 00:00:00 2001 From: Elaheh Rashedi Date: Thu, 17 Dec 2020 16:04:38 -0800 Subject: [PATCH] change master to main (#6679) * change master to main * master to main --- .github/workflows/ci_linux.yml | 4 ++-- .github/workflows/ci_mac.yml | 4 ++-- .github/workflows/ci_windows.yml | 4 ++-- Build/lldb-mi/lldb-mi.yml | 2 +- CONTRIBUTING.md | 4 ++-- Extension/CHANGELOG.md | 2 +- Extension/README.md | 2 +- Extension/package.json | 2 +- Extension/test/unitTests/updowngrade.test.ts | 12 ++++++------ Extension/translations_auto_pr.js | 8 ++++---- README.md | 2 +- Themes/README.md | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index c5da867fc7..3d04416bd4 100644 --- a/.github/workflows/ci_linux.yml +++ b/.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: diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml index a5e794dda4..7a33a17807 100644 --- a/.github/workflows/ci_mac.yml +++ b/.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: diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 5cfccedc98..3454f56800 100644 --- a/.github/workflows/ci_windows.yml +++ b/.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: diff --git a/Build/lldb-mi/lldb-mi.yml b/Build/lldb-mi/lldb-mi.yml index ee3751b767..80cde6ca2f 100644 --- a/Build/lldb-mi/lldb-mi.yml +++ b/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: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8f0061029d..50d9a5f0df 100644 --- a/CONTRIBUTING.md +++ b/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`. diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md index 6478a3ea18..dadccfe14b 100644 --- a/Extension/CHANGELOG.md +++ b/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 diff --git a/Extension/README.md b/Extension/README.md index 7c8b37fad0..a5fbaa9843 100644 --- a/Extension/README.md +++ b/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) diff --git a/Extension/package.json b/Extension/package.json index 265964ee67..327895d60c 100644 --- a/Extension/package.json +++ b/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", diff --git a/Extension/test/unitTests/updowngrade.test.ts b/Extension/test/unitTests/updowngrade.test.ts index 47e27de38b..c3480bfde5 100644 --- a/Extension/test/unitTests/updowngrade.test.ts +++ b/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); }); diff --git a/Extension/translations_auto_pr.js b/Extension/translations_auto_pr.js index 1cf158d49d..5a3903f56e 100644 --- a/Extension/translations_auto_pr.js +++ b/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'); diff --git a/README.md b/README.md index 3a6c9eb0d7..0d7392b1da 100644 --- a/README.md +++ b/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) diff --git a/Themes/README.md b/Themes/README.md index b34aee95f9..bf4e7c4700 100644 --- a/Themes/README.md +++ b/Themes/README.md @@ -10,11 +10,11 @@ VS Code has since provided an API for semantic colorization. The C/C++ Extension Light Theme -![Light Theme example](https://github.com/Microsoft/vscode-cpptools/raw/master/Themes/assets/light.png) +![Light Theme example](https://github.com/Microsoft/vscode-cpptools/raw/main/Themes/assets/light.png) Dark Theme -![Dark Theme example](https://github.com/Microsoft/vscode-cpptools/raw/master/Themes/assets/dark.png) +![Dark Theme example](https://github.com/Microsoft/vscode-cpptools/raw/main/Themes/assets/dark.png) ## Contributing