Skip to content

Commit ec68aae

Browse files
authored
Rename msal-v5 to dev changes (#8361)
1 parent 46fa768 commit ec68aae

10 files changed

Lines changed: 17 additions & 19 deletions

File tree

.beachballrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"branch": "msal-v5",
2+
"branch": "dev",
33
"access": "public",
44
"changehint": "Need to run the following command before merging this PR: npm run beachball:change",
55
"scope": [

.github/workflows/beachball-bump.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
types: [closed]
77
branches:
88
- dev
9-
- msal-v5
109

1110
concurrency:
1211
group: beachball-bump

.github/workflows/beachball-check.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
pull_request:
77
branches:
88
- dev
9-
- msal-v5
109

1110
concurrency:
1211
group: beachball-${{github.ref}}

.pipelines/1p-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ resources:
2626
- repository: 1P
2727
type: git
2828
name: IDDP/msal-javascript-1p
29-
ref: master
29+
ref: dev
3030

3131
extends:
3232
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates

.pipelines/1p-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ resources:
3333
- repository: 1P
3434
type: git
3535
name: IDDP/msal-javascript-1p
36-
ref: master
36+
ref: dev
3737

3838
extends:
3939
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates

.pipelines/3p-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ resources:
5050
- repository: 1P
5151
type: git
5252
name: IDDP/msal-javascript-1p
53-
ref: master
53+
ref: dev
5454
extends:
5555
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
5656
parameters:

.pipelines/sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ resources:
1111
- repository: 1P
1212
type: git
1313
name: IDDP/msal-javascript-1p
14-
ref: master
14+
ref: dev
1515

1616
extends:
1717
template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates

contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ $ cd microsoft-authentication-library-for-js
1818
$ git remote add upstream git@github.com:AzureAD/microsoft-authentication-library-for-js.git
1919
```
2020

21-
Now decide if you want your feature or bug fix to go into the dev branch or the master branch. **All bug fixes and new features should go into the dev branch.**
21+
Now decide if you want your feature or bug fix to go into the `dev` branch or the `v4-lts` branch. **All new features and bug fixes for the current major version should go into the dev branch. Bug fixes for v4 should go into the v4-lts branch.**
2222

23-
The master branch is effectively frozen; patches that change the SDKs protocols or API surface area or affect the run-time behavior of the SDK will be rejected.
23+
The `v4-lts` branch is effectively frozen for new features; patches that change the SDKs protocols or API surface area or affect the run-time behavior of the SDK will be rejected.
2424

2525
Some of our SDKs have bundled dependencies that are not part of the project proper. Any changes to files in those directories or its subdirectories should be sent to their respective projects. Do not send your patch to us, we cannot accept it.
2626

@@ -202,7 +202,7 @@ You will need to add the changefiles to your branch before it can be merged. The
202202

203203
- `npm run beachball:change`
204204

205-
Generates a changefile based on the `master` branch. This should be run on your PR before merging to `dev`, **AFTER** you have created your PR. When this command is run, the type of change needs to be selected:
205+
Generates a changefile based on the `dev` branch. This should be run on your PR before merging to `dev`, **AFTER** you have created your PR. When this command is run, the type of change needs to be selected:
206206

207207
![Select Change Type](./docs/images/beachball-changetype.png)
208208

@@ -223,7 +223,7 @@ Checks that changefiles have been generated for relevant changed packages. Used
223223

224224
- `npm run beachball:bump`
225225

226-
Bumps versions for packages with relevant changefiles. Run on `master` branch to check which packages are slated for release.
226+
Bumps versions for packages with relevant changefiles. Run on `dev` branch to check which packages are slated for release.
227227

228228
**IMPORTANT NOTE**: This should **NOT** be done when merging a PR. You should ONLY do this on your local branch to ensure there are no unexpected changes.
229229

lib/msal-angular/FAQ.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Please see [here](https://github.com/AzureAD/microsoft-authentication-library-fo
4444

4545
### What versions of Angular are supported?
4646

47-
MSAL Angular v5 currently supports Angular 18, 19 and 20.
47+
MSAL Angular v5 currently supports Angular 19, 20, and 21.
4848

4949
MSAL Angular v4 currently supports Angular 15, 16, 17, 18, 19 and 20.
5050

@@ -157,7 +157,7 @@ Example:
157157
const account = msalInstance.getAccount({ username: "SEARCH_USERNAME" });
158158
```
159159

160-
See the [`@azure/msal-browser` Accounts doc](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/msal-v5/lib/msal-browser/docs/accounts.md#account-filter-object) for more details on account methods.
160+
See the [`@azure/msal-browser` Accounts doc](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/accounts.md#account-filter-object) for more details on account methods.
161161

162162
We recommend subscribing to the `inProgress$` observable of `MsalBroadcastService` and filtering for `InteractionStatus.None` before retrieving account information. This ensures that all interactions have completed before getting account information. See [our sample](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/samples/msal-angular-samples/angular-modules-sample/src/app/app.component.ts#L45) for an example of this use.
163163

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"doc": "npm run doc:generate && npm run doc:deploy",
3838
"doc:generate": "rimraf ./ref/* && typedoc",
3939
"doc:deploy": "gh-pages -d ref -a -e ref",
40-
"beachball:check": "beachball check --branch origin/msal-v5",
41-
"beachball:change": "beachball change --branch origin/msal-v5",
42-
"beachball:bump": "beachball bump --branch origin/msal-v5 --bumpDeps false && node release-scripts/updateVersion.js",
43-
"beachball:bump:alpha": "beachball bump --branch origin/msal-v5 --bumpDeps false --prerelease-prefix alpha",
44-
"beachball:bump:beta": "beachball bump --branch origin/msal-v5 --bumpDeps false --prerelease-prefix beta",
45-
"beachball:bump:official": "beachball bump --branch origin/msal-v5",
40+
"beachball:check": "beachball check --branch origin/dev",
41+
"beachball:change": "beachball change --branch origin/dev",
42+
"beachball:bump": "beachball bump --branch origin/dev --bumpDeps false && node release-scripts/updateVersion.js",
43+
"beachball:bump:alpha": "beachball bump --branch origin/dev --bumpDeps false --prerelease-prefix alpha",
44+
"beachball:bump:beta": "beachball bump --branch origin/dev --bumpDeps false --prerelease-prefix beta",
45+
"beachball:bump:official": "beachball bump --branch origin/dev",
4646
"beachball:release": "node ./.github/create-releases.js"
4747
},
4848
"workspaces": [

0 commit comments

Comments
 (0)