Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit72c9f21

Browse files
author
Elaheh Rashedi
authored
change master to main (microsoft#6679)
* change master to main* master to main
1 parent805f884 commit72c9f21

File tree

12 files changed

+25
-25
lines changed

12 files changed

+25
-25
lines changed

‎.github/workflows/ci_linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI (Linux)
22

33
on:
44
push:
5-
branches:[master ]
5+
branches:[main ]
66
pull_request:
7-
branches:[master ]
7+
branches:[main ]
88

99
jobs:
1010
build:

‎.github/workflows/ci_mac.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI (Mac)
22

33
on:
44
push:
5-
branches:[master ]
5+
branches:[main ]
66
pull_request:
7-
branches:[master ]
7+
branches:[main ]
88

99
jobs:
1010
build:

‎.github/workflows/ci_windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI (Windows)
22

33
on:
44
push:
5-
branches:[master ]
5+
branches:[main ]
66
pull_request:
7-
branches:[master ]
7+
branches:[main ]
88

99
jobs:
1010
build:

‎Build/lldb-mi/lldb-mi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ variables:
66
llvm_additional_parameters:"-DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_INCLUDE_TESTS=OFF -DLLDB_BUILD_FRAMEWORK=1"
77
# 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)
88
lldb_mi_repo:https://github.com/WardenGnaw/lldb-mi# TODO: Change to lldb-tools
9-
lldb_mi_branch:release/cpptools# TODO: Change tomaster
9+
lldb_mi_branch:release/cpptools# TODO: Change tomain
1010
lldb_mi_additional_parameters:"-DUSE_LLDB_FRAMEWORK=1"
1111

1212
jobs:

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
* 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.
77
* If the change affects functionality, add a line describing the change to[**CHANGELOG.md**](Extension/CHANGELOG.md).
88
* Try and add a test in[**test/extension.test.ts**](Extension/test/unitTests/extension.test.ts).
9-
* 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".
9+
* 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".
1010

1111
##About the Code
1212

1313
* Execution starts in the`activate` method in[**main.ts**](Extension/src/main.ts).
1414
*`processRuntimeDependencies` handles the downloading and installation of the OS-dependent files. Downloading code exists in[**packageManager.ts**](Extension/src/packageManager.ts).
1515
*`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.
16-
* The debugger code is in the[**Debugger**](https://github.com/Microsoft/vscode-cpptools/tree/master/Extension/src/Debugger) folder.
16+
* The debugger code is in the[**Debugger**](https://github.com/Microsoft/vscode-cpptools/tree/main/Extension/src/Debugger) folder.
1717
*[**LanguageServer/client.ts**](Extension/src/LanguageServer/client.ts) handles various language server functionality.
1818
*[**LanguageServer/configurations.ts**](Extension/src/LanguageServer/configurations.ts) handles functionality related to**c_cpp_properties.json**.
1919
*[**telemetry.ts**](Extension/src/telemetry.ts): Telemetry data gets sent to either`logLanguageServerEvent` or`logDebuggerEvent`.

‎Extension/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444

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

450450
###Enhancements

‎Extension/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#C/C++ for Visual Studio Code
22

3-
####[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)
3+
####[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)
44

55
[![Badge](https://aka.ms/vsls-badge)](https://aka.ms/vsls)
66

‎Extension/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"cpptools",
33
"displayName":"C/C++",
44
"description":"C/C++ IntelliSense, debugging, and code browsing.",
5-
"version":"1.1.3-master",
5+
"version":"1.1.3-main",
66
"publisher":"ms-vscode",
77
"icon":"LanguageCCPP_color_128x.png",
88
"readme":"README.md",

‎Extension/test/unitTests/updowngrade.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ suite("UpgradeDowngrade", () => {
5858
consttargetBuild:Build|undefined=getTargetBuild(builds,userVersion,updateChannel,false);
5959
assert.equal(targetBuild,undefined);
6060
});
61-
test("Release to Insider (master)",()=>{
61+
test("Release to Insider (main)",()=>{
6262
constbuilds:Build[]=[{
6363
name:insider3,assets:three_assets},{
6464
name:insider2,assets:three_assets},{
6565
name:insider1,assets:three_assets},{
6666
name:release0,assets:three_assets}];
67-
// In internal testing, the name of the release has a "-master" at the end of it.
68-
constuserVersion:PackageVersion=newPackageVersion(release1+"-master");
67+
// In internal testing, the name of the release has a "-main" at the end of it.
68+
constuserVersion:PackageVersion=newPackageVersion(release1+"-main");
6969
consttargetBuild:Build|undefined=getTargetBuild(builds,userVersion,updateChannel,false);
7070
assert.equal(targetBuild,undefined);
7171
});
@@ -104,14 +104,14 @@ suite("UpgradeDowngrade", () => {
104104
consttargetBuild:Build|undefined=getTargetBuild(builds,userVersion,updateChannel,false);
105105
assert.equal(targetBuild,undefined);
106106
});
107-
test("Release to Insider (master)",()=>{
107+
test("Release to Insider (main)",()=>{
108108
constbuilds:Build[]=[{
109109
name:insider3,assets:three_assets},{
110110
name:insider2,assets:three_assets},{
111111
name:insider1,assets:three_assets},{
112112
name:release0,assets:three_assets}];
113-
// In internal testing, the name of the release has a "-master" at the end of it.
114-
constuserVersion:PackageVersion=newPackageVersion(release1+"-master");
113+
// In internal testing, the name of the release has a "-main" at the end of it.
114+
constuserVersion:PackageVersion=newPackageVersion(release1+"-main");
115115
consttargetBuild:Build|undefined=getTargetBuild(builds,userVersion,updateChannel,false);
116116
assert.equal(targetBuild,undefined);
117117
});

‎Extension/translations_auto_pr.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Octokit = require('@octokit/rest')
66
constpath=require('path');
77

88
constbranchName='localization';
9-
constmergeTo='master';
9+
constmergeTo='main';
1010
constcommitComment='Localization - Translated Strings';
1111
constpullRequestTitle='[Auto] Localization - Translated Strings';
1212

@@ -92,7 +92,7 @@ if (!hasAnyChanges()) {
9292

9393
console.log("Changes detected");
9494

95-
console.log(`Ensuremaster ref is up to date locally (git fetch)`);
95+
console.log(`Ensuremain ref is up to date locally (git fetch)`);
9696
cp.execSync('git fetch');
9797

9898
// Remove old localization branch, if any
@@ -151,8 +151,8 @@ octokit.pulls.list({ owner: repoOwner, repo: repoName }).then(({data}) => {
151151
cp.execSync('git remote remove origin');
152152
cp.execSync(`git remote add origin https://github.com/${repoOwner}/${repoName}.git`);
153153

154-
console.log(`Switching back tomaster (git checkoutmaster)`);
155-
cp.execSync('git checkoutmaster');
154+
console.log(`Switching back tomain (git checkoutmain)`);
155+
cp.execSync('git checkoutmain');
156156

157157
console.log(`Remove localization branch (git branch -D localization)`);
158158
cp.execSync('git branch -D localization');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp