Skip to content

Commit 1c1f48e

Browse files
committed
remove references to master to prepare branch for deletion
1 parent b00d26b commit 1c1f48e

16 files changed

+24
-24
lines changed

.github/policies/msgraph-sdk-javascript-branch-protection.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ configuration:
4444
# Restrict who can dismiss pull request reviews. boolean
4545
restrictsReviewDismissals: false
4646

47-
- branchNamePattern: master
47+
- branchNamePattern: main
4848
# This branch pattern applies to the following branches as of 08/30/2023:
49-
# master
49+
# main
5050

5151
# Specifies whether this branch can be deleted. boolean
5252
allowsDeletions: false

.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ dev, 3.0.0, master, support/v2, v2/dev ]
16+
branches: [ dev, 3.0.0, main, support/v2, v2/dev ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
1919
branches: [ dev ]

CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ To make the contribution process as seamless as possible, follow these steps.
100100

101101
#### To create a new branch
102102

103-
1.Open Git Bash. 2.At the Git Bash command prompt, type `git pull upstream master:<new branch name>`. This creates a new branch locally that is copied from the latest MicrosoftGraph master branch. 3.At the Git Bash command prompt, type `git push origin <new branch name>`. This alerts GitHub to the new branch. You should now see the new branch in your fork of the repository on GitHub. 4.At the Git Bash command prompt, type `git checkout <new branch name>` to switch to your new branch.
103+
1.Open Git Bash. 2.At the Git Bash command prompt, type `git pull upstream main:<new branch name>`. This creates a new branch locally that is copied from the latest MicrosoftGraph main branch. 3.At the Git Bash command prompt, type `git push origin <new branch name>`. This alerts GitHub to the new branch. You should now see the new branch in your fork of the repository on GitHub. 4.At the Git Bash command prompt, type `git checkout <new branch name>` to switch to your new branch.
104104

105105
#### Add new content or edit existing content
106106

@@ -154,7 +154,7 @@ When you're finished with your work and are ready to have it merged into the mai
154154
1. In the Git Bash command prompt, type `git push origin <new branch name>`. In your local repository, `origin` refers to your GitHub repository that you cloned the local repository from. This command pushes the current state of your new branch, including all commits made in the previous steps, to your GitHub fork.
155155
2. On the GitHub site, navigate in your fork to the new branch.
156156
3. Choose the **Pull Request** button at the top of the page.
157-
4. Verify the Base branch is `microsoftgraph/<repo name>@master` and the Head branch is `<your username>/<repo name>@<branch name>`.
157+
4. Verify the Base branch is `microsoftgraph/<repo name>@main` and the Head branch is `<your username>/<repo name>@<branch name>`.
158158
5. Choose the **Update Commit Range** button.
159159
6. Add a title to your pull request, and describe all the changes you're making.
160160
7. Submit the pull request.
@@ -165,10 +165,10 @@ One of the site administrators will process your pull request. Your pull request
165165

166166
After a branch is successfully merged (that is, your pull request is accepted), don't continue working in that local branch. This can lead to merge conflicts if you submit another pull request. To do another update, create a new local branch from the successfully merged upstream branch, and then delete your initial local branch.
167167

168-
For example, if your local branch X was successfully merged into the OfficeDev/microsoft-graph-docs master branch and you want to make additional updates to the content that was merged. Create a new local branch, X2, from the OfficeDev/microsoft-graph-docs master branch. To do this, open GitBash and execute the following commands:
168+
For example, if your local branch X was successfully merged into the OfficeDev/microsoft-graph-docs main branch and you want to make additional updates to the content that was merged. Create a new local branch, X2, from the OfficeDev/microsoft-graph-docs main branch. To do this, open GitBash and execute the following commands:
169169

170170
cd microsoft-graph-docs
171-
git pull upstream master:X2
171+
git pull upstream main:X2
172172
git push origin X2
173173

174174
You now have local copies (in a new local branch) of the work that you submitted in branch X. The X2 branch also contains all the work other writers have merged, so if your work depends on others' work (for example, shared images), it is available in the new branch. You can verify that your previous work (and others' work) is in the branch by checking out the new branch...
@@ -183,7 +183,7 @@ Once your changes are successfully merged into the main repository, delete the b
183183

184184
#### To delete a branch
185185

186-
1. In the Git Bash command prompt, type `git checkout master`. This ensures that you aren't in the branch to be deleted (which isn't allowed).
186+
1. In the Git Bash command prompt, type `git checkout main`. This ensures that you aren't in the branch to be deleted (which isn't allowed).
187187
2. Next, at the command prompt, type `git branch -d <branch name>`. This deletes the branch on your computer only if it has been successfully merged to the upstream repository. (You can override this behavior with the `–D` flag, but first be sure you want to do this.)
188188
3. Finally, type `git push origin :<branch name>` at the command prompt (a space before the colon and no space after it). This will delete the branch on your github fork.
189189

README-Localized/README-es-es.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ La biblioteca cliente de JavaScript de Microsoft Graph es un envase reducido en
66

77
**¿Busca IntelliSense en los modelos (usuarios, grupos, etc.)? Vea el repositorio de [tipos de Microsoft Graph](https://github.com/microsoftgraph/msgraph-typescript-typings).**
88

9-
[![Demostración de TypeScript](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/master/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
9+
[![Demostración de TypeScript](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/main/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
1010

1111
## Instalación
1212

README-Localized/README-fr-fr.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ La bibliothèque client JavaScript de Microsoft Graph est une enveloppe légère
66

77
**Vous recherchez IntelliSense sur les modèles (utilisateurs, groupes, etc.) ? Consultez les [types Microsoft Graph](https://github.com/microsoftgraph/msgraph-typescript-typings) référentiel !**
88

9-
[![TypeScript demo](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/master/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
9+
[![TypeScript demo](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/main/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
1010

1111
## Installation
1212

README-Localized/README-ja-jp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Microsoft Graph JavaScript クライアント ライブラリは、Microsoft Gra
66

77
**モデル (ユーザー、グループなど) で IntelliSense を探していますか ?[Microsoft Graph Types](https://github.com/microsoftgraph/msgraph-typescript-typings) リポジトリをご覧ください !**
88

9-
[![TypeScript でも](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/master/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
9+
[![TypeScript でも](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/main/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
1010

1111
## インストール
1212

README-Localized/README-pt-br.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A biblioteca do cliente Microsoft Graph JavaScript é um invólucro leve em torn
66

77
**Procurando o IntelliSense nos modelos (usuários, grupos, etc.)? Confira o](https://github.com/microsoftgraph/msgraph-typescript-typings) repositório [do Microsoft Graph Types!**
88

9-
[![Demonstração TypeScript ](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/master/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
9+
[![Demonstração TypeScript ](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/main/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
1010

1111
## Instalação
1212

README-Localized/README-ru-ru.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
**Требуется IntelliSense для моделей (пользователи, группы и т. п.)? Ознакомьтесь с репозиторием [Microsoft Graph Types](https://github.com/microsoftgraph/msgraph-typescript-typings).**
88

9-
[![Демонстрация TypeScript](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/master/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
9+
[![Демонстрация TypeScript](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/main/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
1010

1111
## Установка
1212

README-Localized/README-zh-cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Microsoft Graph JavaScript 客户端库轻型 Microsoft Graph API 包装器,
66

77
**正常查找模型上的 IntelliSense(用户、组等)?查看 [Microsoft Graph 类型](https://github.com/microsoftgraph/msgraph-typescript-typings)存储库!**
88

9-
[![TypeScript 演示](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/master/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
9+
[![TypeScript 演示](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/main/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
1010

1111
## 安装
1212

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The Microsoft Graph JavaScript client library is a lightweight wrapper around th
5555

5656
**Looking for IntelliSense on models (Users, Groups, etc.)? Check out the Microsoft Graph Types [v1.0](https://github.com/microsoftgraph/msgraph-typescript-typings) and [beta](https://github.com/microsoftgraph/msgraph-beta-typescript-typings)!!**
5757

58-
[![TypeScript demo](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/master/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
58+
[![TypeScript demo](https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-javascript/main/types-demo.PNG)](https://github.com/microsoftgraph/msgraph-typescript-typings)
5959

6060
## Node version requirement
6161

design/large-file-upload-task-design.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ sliceFile(range: Range): ArrayBuffer | Blob {
7171
###### 2. Support large file uploads to Outlook API
7272

7373
- Bug in the current implemenation - `response.id !== undefined` this condition to mark the completion of an upload does not work for Outlook API since the final response does not contain a response body.
74-
- An upload task should be marked as completed if the response status is a 201. [SDK-design document](https://github.com/microsoftgraph/msgraph-sdk-design/blob/master/tasks/FileUploadTask.md).
74+
- An upload task should be marked as completed if the response status is a 201. [SDK-design document](https://github.com/microsoftgraph/msgraph-sdk-design/blob/main/tasks/FileUploadTask.md).
7575
- The LargeFileUploadTask should allow uploads to OneDrive API, Outlook API and PrintDocument API.
7676
- Proposed changes-
7777
- Add class `UploadResult` containing `location` and `responseBody` properties.

docs/CreatingClientInstance.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const client = Client.initWithMiddleware(clientOptions);
3333

3434
The Microsoft Graph JavaScript Client Library has an adapter implementation for the following -
3535

36-
- ([TokenCredentialAuthenticationProvider](../src/authentication/azureTokenCredentials/TokenCredentialAuthenticationProvider.ts)) to support [Azure Identity TokenCredential](https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/identity/identity/README.md) (Azure Identity client library for JavaScript) which takes care of getting the `accessToken`. @azure/identity library does not ship with this library, user has to include it externally (For including @azure/identity, refer [this](https://www.npmjs.com/package/@azure/identity)).
36+
- ([TokenCredentialAuthenticationProvider](../src/authentication/azureTokenCredentials/TokenCredentialAuthenticationProvider.ts)) to support [Azure Identity TokenCredential](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/README.md) (Azure Identity client library for JavaScript) which takes care of getting the `accessToken`. @azure/identity library does not ship with this library, user has to include it externally (For including @azure/identity, refer [this](https://www.npmjs.com/package/@azure/identity)).
3737

3838
> Learn how to [create an instance of TokenCredentialAuthenticationProvider](./TokenCredentialAuthenticationProvider.md).
3939

docs/TokenCredentialAuthenticationProvider.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
###### Links for more information -
66

7-
- [GitHub - Azure Identity client library for JavaScript ](https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/identity/identity/README.md)
7+
- [GitHub - Azure Identity client library for JavaScript ](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/README.md)
88

99
- [npm - Azure Identity client library for JavaScript](https://www.npmjs.com/package/@azure/identity)
1010

@@ -22,7 +22,7 @@ import { TokenCredentialAuthenticationProvider, TokenCredentialAuthenticationPro
2222
// Create an instance of the TokenCredential class that is imported
2323
const tokenCredential = new ClientSecretCredential("your_tenantId", "your_clientId", "your_clientSecret");
2424

25-
// Set your scopes and options for TokenCredential.getToken (Check the ` interface GetTokenOptions` in (TokenCredential Implementation)[https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/core/core-auth/src/tokenCredential.ts])
25+
// Set your scopes and options for TokenCredential.getToken (Check the ` interface GetTokenOptions` in (TokenCredential Implementation)[https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/core/core-auth/src/tokenCredential.ts])
2626

2727
const options: TokenCredentialAuthenticationProviderOptions = { scopes: [scopes], getTokenOptions };
2828

@@ -45,7 +45,7 @@ const { TokenCredentialAuthenticationProvider } = require("@microsoft/microsoft-
4545
// Create an instance of the TokenCredential class that is imported
4646
const credential = new ClientSecretCredential(tenantId, clientId, clientSecret);
4747

48-
// Set your scopes and options for TokenCredential.getToken (Check the ` interface GetTokenOptions` in (TokenCredential Implementation)[https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/core/core-auth/src/tokenCredential.ts])
48+
// Set your scopes and options for TokenCredential.getToken (Check the ` interface GetTokenOptions` in (TokenCredential Implementation)[https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/core/core-auth/src/tokenCredential.ts])
4949

5050
const authProvider = new TokenCredentialAuthenticationProvider(credential, { scopes: [scopes] });
5151

scripts/src/MergeChangesTillLastestRelease.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Param(
77
Write-Host "Merge and Commit the changes into '$($branchName)' till last release:" -ForegroundColor Magenta;
88

99
Write-Host "Checking out '$($branchName)'" -ForegroundColor Blue;
10-
git checkout master | Write-Host;
10+
git checkout main | Write-Host;
1111
Write-Host "Checked out" -ForegroundColor Green;
1212

1313
Write-Host "Pulling '$($branchName)'" -ForegroundColor Blue;
14-
git pull origin master --allow-unrelated-histories | Write-Host;
14+
git pull origin main --allow-unrelated-histories | Write-Host;
1515
Write-Host "Pulled '$($branchName)'" -ForegroundColor Green;
1616

1717
Write-Host "Getting SHA for last commit in the latest release" -ForegroundColor Blue;

src/authentication/azureTokenCredentials/TokenCredentialAuthenticationProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { TokenCredentialAuthenticationProviderOptions } from "./ITokenCredential
2020
* Class representing TokenCredentialAuthenticationProvider
2121
* This feature is introduced in Version 3.0.0
2222
* @extends AuthenticationProvider
23-
* Reference - https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/identity/identity/README.md
23+
* Reference - https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/README.md
2424
*/
2525
export class TokenCredentialAuthenticationProvider implements AuthenticationProvider {
2626
/**

src/content/BatchRequestContent.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export interface BatchRequestStep {
4444
* @interface
4545
* Signature representing single request in a Batching
4646
* @extends RequestInit
47-
* @see {@link https://github.com/Microsoft/TypeScript/blob/master/lib/lib.dom.d.ts#L1337} and {@link https://fetch.spec.whatwg.org/#requestinit}
47+
* @see {@link https://github.com/Microsoft/TypeScript/blob/main/lib/lib.dom.d.ts#L1337} and {@link https://fetch.spec.whatwg.org/#requestinit}
4848
*
4949
* @property {string} url - The url value of the request
5050
*/

0 commit comments

Comments
 (0)