Skip to content

Commit e17569e

Browse files
authored
Mention 'main' instead of 'master' (#29511)
- part of #29475 - primarily involves updating links to this repo nit: Remove broken links to old Travis environments (that happen to mention 'master')
1 parent c925f99 commit e17569e

File tree

28 files changed

+48
-52
lines changed

28 files changed

+48
-52
lines changed

.azure/pipelines/helix-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# We only want to run full helix matrix on master
1+
# We only want to run full helix matrix on main
22
pr: none
33
trigger: none
44
schedules:

.azure/pipelines/quarantined-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
# Configure which branches trigger builds
6-
# We want to run quarantined tests on release/5.0 and master as well as on PRs
6+
# We want to run quarantined tests on release/5.0 and main as well as on PRs
77
trigger:
88
batch: true
99
branches:

.azure/pipelines/quarantined-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# We only want to run quarantined tests on master
1+
# We only want to run quarantined tests on main
22
pr: none
33
trigger: none
44

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
<!-- Thank you for submitting a pull request to our repo. -->
33

4-
<!-- If this is your first PR in the ASP.NET Core repo, please run through the checklist
4+
<!-- If this is your first PR in the ASP.NET Core repo, please run through the checklist
55
below to ensure a smooth review and merge process for your PR. -->
66

7-
- [ ] You've read the [Contributor Guide](https://github.com/dotnet/aspnetcore/blob/master/CONTRIBUTING.md) and [Code of Conduct](https://github.com/dotnet/aspnetcore/blob/master/CODE-OF-CONDUCT.md).
7+
- [ ] You've read the [Contributor Guide](https://github.com/dotnet/aspnetcore/blob/main/CONTRIBUTING.md) and [Code of Conduct](https://github.com/dotnet/aspnetcore/blob/main/CODE-OF-CONDUCT.md).
88
- [ ] You've included unit or integration tests for your change, where applicable.
99
- [ ] You've included inline docs for your change, where applicable.
1010
- [ ] There's an open issue for the PR that you are making. If you'd like to propose a new feature or change, please open an issue to discuss the change or find an existing issue.

.github/workflows/runtime-sync.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
- name: Checkout aspnetcore
1919
uses: actions/[email protected]
2020
with:
21-
# Test this script using changes in a fork
21+
# Test this script using changes in a fork
2222
repository: 'dotnet/aspnetcore'
2323
path: aspnetcore
24-
ref: master
24+
ref: main
2525
- name: Checkout runtime
2626
uses: actions/[email protected]
2727
with:
28-
# Test this script using changes in a fork
28+
# Test this script using changes in a fork
2929
repository: 'dotnet/runtime'
3030
path: runtime
3131
ref: master
@@ -67,6 +67,6 @@ jobs:
6767
title: 'Sync shared code from runtime'
6868
body: 'This PR was automatically generated to sync shared code changes from runtime. Fixes #18943'
6969
labels: area-servers
70-
base: master
70+
base: main
7171
branch: github-action/sync-runtime
7272
branch-suffix: timestamp

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Follow the [Getting Started](https://docs.microsoft.com/aspnet/core/getting-star
99

1010
Also check out the [.NET Homepage](https://www.microsoft.com/net) for released versions of .NET, getting started guides, and learning resources.
1111

12-
See the [Triage Process](https://github.com/dotnet/aspnetcore/blob/master/docs/TriageProcess.md) document for more information on how we handle incoming issues.
12+
See the [Triage Process](https://github.com/dotnet/aspnetcore/blob/main/docs/TriageProcess.md) document for more information on how we handle incoming issues.
1313

1414
## How to Engage, Contribute, and Give Feedback
1515

build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Running tests.
116116
build.ps1 -test
117117
118118
.LINK
119-
Online version: https://github.com/dotnet/aspnetcore/blob/master/docs/BuildFromSource.md
119+
Online version: https://github.com/dotnet/aspnetcore/blob/main/docs/BuildFromSource.md
120120
#>
121121
[CmdletBinding(PositionalBinding = $false, DefaultParameterSetName='Groups')]
122122
param(
@@ -363,7 +363,7 @@ if($dotnetFormat)
363363
{
364364
Write-Host -f Magenta "dotnet format tool is already installed."
365365
}
366-
else
366+
else
367367
{
368368
Write-Host -f Magenta "Installing dotnet-format tool.."
369369
& dotnet tool install -g dotnet-format

docs/BuildFromSource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Studio because those projects are not listed in AspNetCore.sln.
155155
This will download the required tools and restore all projects inside the repository. At that point, you should be able
156156
to open the .sln file or one of the project specific .slnf files to work on the projects you care about.
157157

158-
> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the master
158+
> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the main
159159
> branch, we regularly update the versions of .NET Core SDK required to build the repo.
160160
> You will need to restart Visual Studio every time we update the .NET Core SDK.
161161

docs/Helix.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ This will restore, and then publish all the test project including some bootstra
1818

1919
## Overview of the helix usage in our pipelines
2020

21-
- Required queues: Windows10, OSX, Ubuntu1604
21+
- Required queues: Windows10, OSX, Ubuntu1604
2222
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian9, Redhat7, Fedora28, Arm64 (Win10, Debian9)
23-
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/master/eng/targets/Helix.Common.props)
23+
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/main/eng/targets/Helix.Common.props)
2424

2525
[aspnetcore-ci](https://dev.azure.com/dnceng/public/_build?definitionId=278) runs non quarantined tests against the required helix queues as a required PR check and all builds on all branches.
2626

27-
[aspnetcore-helix-matrix](https://dev.azure.com/dnceng/public/_build?definitionId=837) runs non quarantined tests against all queues twice a day only on public master.
27+
[aspnetcore-helix-matrix](https://dev.azure.com/dnceng/public/_build?definitionId=837) runs non quarantined tests against all queues twice a day only on public main.
2828

29-
[aspnetcore-quarantined-pr](https://dev.azure.com/dnceng/public/_build?definitionId=869) runs only quarantined tests against the required queues on PRs and on master every 4 hours.
29+
[aspnetcore-quarantined-pr](https://dev.azure.com/dnceng/public/_build?definitionId=869) runs only quarantined tests against the required queues on PRs and on main every 4 hours.
3030

31-
[aspnetcore-quarantined-tests](https://dev.azure.com/dnceng/public/_build?definitionId=331) runs only quarantined tests against all queues only on public master once a day at 11 PM.
31+
[aspnetcore-quarantined-tests](https://dev.azure.com/dnceng/public/_build?definitionId=331) runs only quarantined tests against all queues only on public main once a day at 11 PM.
3232

3333
You can always manually queue pipeline runs by clicking on the link to the pipeline -> Run Pipeline -> select your branch/tag and commit
3434

@@ -42,7 +42,7 @@ You can always manually queue pipeline runs by clicking on the link to the pipel
4242

4343
The easiest way to look at a test failure is via the tests tab in azdo which now should show a summary of the errors and have attachments to the relevant console logs.
4444

45-
You can also drill down into the helix web apis if you take the HelixJobId from the Debug tab of a failing test, and the HelixWorkItemName and go to: `https://helix.dot.net/api/2019-06-17/jobs/<jobId>/workitems/<workitemname>` which will show you more urls you can drill into for more info.
45+
You can also drill down into the helix web apis if you take the HelixJobId from the Debug tab of a failing test, and the HelixWorkItemName and go to: `https://helix.dot.net/api/2019-06-17/jobs/<jobId>/workitems/<workitemname>` which will show you more urls you can drill into for more info.
4646

4747
There's also a link embedded in the build.cmd log of the Tests: Helix x64 job on Azure Pipelines, near the bottom right that will look something like this:
4848

docs/ReferenceResolution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Once `darc` is installed and set-up, it can be used to modify the subscriptions
111111
Subscriptions are objects that define the ecosystem repos we are listening for updates to, the frequency we are looking for updates, and more.
112112

113113
```bash
114-
darc get-subscriptions --target-branch master --target-repo aspnetcore$ --regex
114+
darc get-subscriptions --target-branch main --target-repo aspnetcore$ --regex
115115
```
116116

117117
**Disable/enable a subscription**

0 commit comments

Comments
 (0)