Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
RehanSaeed committed Nov 6, 2020
1 parent ead1e4f commit 46e9312
Show file tree
Hide file tree
Showing 38 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
Thank you good citizen for your hard work!
Please read the contributing guide before raising a pull request.
https://github.com/Dotnet-Boxed/Templates/blob/master/.github/CONTRIBUTING.md
https://github.com/Dotnet-Boxed/Templates/blob/main/.github/CONTRIBUTING.md
-->
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build

on:
push:
branches: master
branches: main
pull_request:
release:
types:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
push-github-packages:
name: 'Push GitHub Packages'
needs: [build, test]
if: github.ref == 'refs/heads/master' || github.event_name == 'release'
if: github.ref == 'refs/heads/main' || github.event_name == 'release'
runs-on: windows-latest
steps:
- name: 'Download Artefact'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [main]
schedule:
- cron: '0 8 * * 4'

Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- master
- main

jobs:
update_release_draft:
Expand Down
8 changes: 4 additions & 4 deletions Docs/Tweets.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ https://github.com/Dotnet-Boxed/Templates
dotnet new --install Boxed.Templates
dotnet new api
https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/API.md
https://github.com/Dotnet-Boxed/Templates/blob/main/Docs/API.md
#dotnet #dotnetcore #aspnetcore #swagger #openapi
```
Expand All @@ -45,7 +45,7 @@ https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/API.md
dotnet new --install Boxed.Templates
dotnet new graphql
https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/GraphQL.md
https://github.com/Dotnet-Boxed/Templates/blob/main/Docs/GraphQL.md
#dotnet #dotnetcore #aspnetcore #graphql
```
Expand All @@ -60,7 +60,7 @@ https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/GraphQL.md
dotnet new --install Boxed.Templates
dotnet new orleans
https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/Orleans.md
https://github.com/Dotnet-Boxed/Templates/blob/main/Docs/Orleans.md
#dotnet #dotnetcore #orleans @reubenbond
```
Expand All @@ -76,7 +76,7 @@ dotnet new nuget
git commit -a -m "Initial" && git push
GitHub Actions, Azure DevOps and AppVeyor CI Builds
https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/NuGet.md
https://github.com/Dotnet-Boxed/Templates/blob/main/Docs/NuGet.md
#dotnet #dotnetcore #nuget
```
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ You can find release notes for each version [here](https://github.com/Dotnet-Box

| Name | Operating System | Status | History |
| :--- | :--- | :--- | :--- |
| Azure Pipelines | Ubuntu | [![Azure Pipelines Ubuntu Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=master&stageName=Build&jobName=Build&configuration=Build%20Linux)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=master) | |
| Azure Pipelines | Mac | [![Azure Pipelines Mac Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=master&stageName=Build&jobName=Build&configuration=Build%20Mac)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=master) | |
| Azure Pipelines | Windows | [![Azure Pipelines Windows Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=master&stageName=Build&jobName=Build&configuration=Build%20Windows)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=master) | |
| Azure Pipelines | Overall | [![Azure Pipelines Overall Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=master)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=master) | [![Azure Pipelines Build History](https://buildstats.info/azurepipelines/chart/dotnet-boxed/Templates/2?branch=master&includeBuildsFromPullRequest=false)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=master) |
| GitHub Actions | Ubuntu, Mac & Windows | [![GitHub Actions Status](https://github.com/Dotnet-Boxed/Templates/workflows/Build/badge.svg?branch=master)](https://github.com/Dotnet-Boxed/Templates/actions) | [![GitHub Actions Build History](https://buildstats.info/github/chart/Dotnet-Boxed/Templates?branch=master&includeBuildsFromPullRequest=false)](https://github.com/Dotnet-Boxed/Templates/actions) |
| AppVeyor | Ubuntu & Windows | [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/munmh9if4vfeqy62/branch/master?svg=true)](https://ci.appveyor.com/project/RehanSaeed/templates/branch/master) | [![AppVeyor Build History](https://buildstats.info/appveyor/chart/RehanSaeed/Templates?branch=master&includeBuildsFromPullRequest=false)](https://ci.appveyor.com/project/RehanSaeed/Templates) |
| Azure Pipelines | Ubuntu | [![Azure Pipelines Ubuntu Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=main&stageName=Build&jobName=Build&configuration=Build%20Linux)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=main) | |
| Azure Pipelines | Mac | [![Azure Pipelines Mac Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=main&stageName=Build&jobName=Build&configuration=Build%20Mac)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=main) | |
| Azure Pipelines | Windows | [![Azure Pipelines Windows Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=main&stageName=Build&jobName=Build&configuration=Build%20Windows)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=main) | |
| Azure Pipelines | Overall | [![Azure Pipelines Overall Build Status](https://dev.azure.com/dotnet-boxed/Templates/_apis/build/status/Dotnet-Boxed.Templates?branchName=main)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=main) | [![Azure Pipelines Build History](https://buildstats.info/azurepipelines/chart/dotnet-boxed/Templates/2?branch=main&includeBuildsFromPullRequest=false)](https://dev.azure.com/dotnet-boxed/Templates/_build/latest?definitionId=2&branchName=main) |
| GitHub Actions | Ubuntu, Mac & Windows | [![GitHub Actions Status](https://github.com/Dotnet-Boxed/Templates/workflows/Build/badge.svg?branch=main)](https://github.com/Dotnet-Boxed/Templates/actions) | [![GitHub Actions Build History](https://buildstats.info/github/chart/Dotnet-Boxed/Templates?branch=main&includeBuildsFromPullRequest=false)](https://github.com/Dotnet-Boxed/Templates/actions) |
| AppVeyor | Ubuntu & Windows | [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/munmh9if4vfeqy62/branch/main?svg=true)](https://ci.appveyor.com/project/RehanSaeed/templates/branch/main) | [![AppVeyor Build History](https://buildstats.info/appveyor/chart/RehanSaeed/Templates?branch=main&includeBuildsFromPullRequest=false)](https://ci.appveyor.com/project/RehanSaeed/Templates) |

## Contributions and Thanks

Expand Down
2 changes: 1 addition & 1 deletion Source/ApiTemplate/.github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
Thank you good citizen for your hard work!
Please read the contributing guide before raising a pull request.
https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/blob/master/.github/CONTRIBUTING.md
https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/blob/main/.github/CONTRIBUTING.md
-->
2 changes: 1 addition & 1 deletion Source/ApiTemplate/.github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# release-drafter automatically creates a draft release for you each time you complete a PR in the master branch.
# release-drafter automatically creates a draft release for you each time you complete a PR in the main branch.
# It uses GitHub labels to categorize changes (See categories) and draft the release.
# release-drafter also generates a version for your release based on GitHub labels. You can add a label of 'major',
# 'minor' or 'patch' to determine which number in the version to increment.
Expand Down
6 changes: 3 additions & 3 deletions Source/ApiTemplate/.github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build

on:
push:
branches: master
branches: main
pull_request:
release:
types:
Expand Down Expand Up @@ -83,13 +83,13 @@ jobs:
- name: 'Install Docker BuildX'
uses: docker/setup-buildx-action@v1
- name: 'Docker Login'
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
env:
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
run: echo $env:DOCKER_PASSWORD | docker login --username "$($env:DOCKER_USERNAME)" --password-stdin
shell: pwsh
- name: 'Dotnet Cake DockerBuild'
run: dotnet cake --target=DockerBuild --tag=${{secrets.DOCKER_USERNAME}}/apitemplate --push=${{github.ref == 'refs/heads/master'}}
run: dotnet cake --target=DockerBuild --tag=${{secrets.DOCKER_USERNAME}}/apitemplate --push=${{github.ref == 'refs/heads/main'}}
shell: pwsh
#endif
4 changes: 2 additions & 2 deletions Source/ApiTemplate/.github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [main]
schedule:
- cron: '0 8 * * 4'

Expand Down
2 changes: 1 addition & 1 deletion Source/ApiTemplate/.github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- master
- main

jobs:
update_release_draft:
Expand Down
2 changes: 1 addition & 1 deletion Source/ApiTemplate/.template.config/ide.host.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json.schemastore.org/vs-2017.3.host",
"order": 0,
"learnMoreLink": "https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/API.md",
"learnMoreLink": "https://github.com/Dotnet-Boxed/Templates/blob/main/Docs/API.md",
"icon": "icon.png",
"symbolInfo": [
{
Expand Down
4 changes: 2 additions & 2 deletions Source/ApiTemplate/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# PROJECT-TITLE-XML

<!--#if GitHubActions-->
[![GitHub Actions Status](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/workflows/Build/badge.svg?branch=master)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)
[![GitHub Actions Status](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/workflows/Build/badge.svg?branch=main)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)

[![GitHub Actions Build History](https://buildstats.info/github/chart/GITHUB-USERNAME/GITHUB-PROJECT?branch=master&includeBuildsFromPullRequest=false)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)
[![GitHub Actions Build History](https://buildstats.info/github/chart/GITHUB-USERNAME/GITHUB-PROJECT?branch=main&includeBuildsFromPullRequest=false)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)

<!--#endif-->
PROJECT-DESCRIPTION-XML
2 changes: 1 addition & 1 deletion Source/ApiTemplate/TODO.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<a href="https://github.com/Dotnet-Boxed/Templates">
<img alt=".NET Boxed"
class="img-responsive"
src="https://media.githubusercontent.com/media/Dotnet-Boxed/Templates/master/Images/Banner.png"
src="https://media.githubusercontent.com/media/Dotnet-Boxed/Templates/main/Images/Banner.png"
style="margin-bottom: 20px">
</a>

Expand Down
2 changes: 1 addition & 1 deletion Source/GraphQLTemplate/.github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
Thank you good citizen for your hard work!
Please read the contributing guide before raising a pull request.
https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/blob/master/.github/CONTRIBUTING.md
https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/blob/main/.github/CONTRIBUTING.md
-->
2 changes: 1 addition & 1 deletion Source/GraphQLTemplate/.github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# release-drafter automatically creates a draft release for you each time you complete a PR in the master branch.
# release-drafter automatically creates a draft release for you each time you complete a PR in the main branch.
# It uses GitHub labels to categorize changes (See categories) and draft the release.
# release-drafter also generates a version for your release based on GitHub labels. You can add a label of 'major',
# 'minor' or 'patch' to determine which number in the version to increment.
Expand Down
6 changes: 3 additions & 3 deletions Source/GraphQLTemplate/.github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build

on:
push:
branches: master
branches: main
pull_request:
release:
types:
Expand Down Expand Up @@ -83,13 +83,13 @@ jobs:
- name: 'Install Docker BuildX'
uses: docker/setup-buildx-action@v1
- name: 'Docker Login'
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
env:
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
run: echo $env:DOCKER_PASSWORD | docker login --username "$($env:DOCKER_USERNAME)" --password-stdin
shell: pwsh
- name: 'Dotnet Cake DockerBuild'
run: dotnet cake --target=DockerBuild --tag=${{secrets.DOCKER_USERNAME}}/graphqltemplate --push=${{github.ref == 'refs/heads/master'}}
run: dotnet cake --target=DockerBuild --tag=${{secrets.DOCKER_USERNAME}}/graphqltemplate --push=${{github.ref == 'refs/heads/main'}}
shell: pwsh
#endif
4 changes: 2 additions & 2 deletions Source/GraphQLTemplate/.github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [main]
schedule:
- cron: '0 8 * * 4'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- master
- main

jobs:
update_release_draft:
Expand Down
2 changes: 1 addition & 1 deletion Source/GraphQLTemplate/.template.config/ide.host.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json.schemastore.org/vs-2017.3.host",
"order": 0,
"learnMoreLink": "https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/GraphQL.md",
"learnMoreLink": "https://github.com/Dotnet-Boxed/Templates/blob/main/Docs/GraphQL.md",
"icon": "icon.png",
"symbolInfo": [
{
Expand Down
4 changes: 2 additions & 2 deletions Source/GraphQLTemplate/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# PROJECT-TITLE-XML

<!--#if GitHubActions-->
[![GitHub Actions Status](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/workflows/Build/badge.svg?branch=master)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)
[![GitHub Actions Status](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/workflows/Build/badge.svg?branch=main)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)

[![GitHub Actions Build History](https://buildstats.info/github/chart/GITHUB-USERNAME/GITHUB-PROJECT?branch=master&includeBuildsFromPullRequest=false)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)
[![GitHub Actions Build History](https://buildstats.info/github/chart/GITHUB-USERNAME/GITHUB-PROJECT?branch=main&includeBuildsFromPullRequest=false)](https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/actions)

<!--#endif-->
PROJECT-DESCRIPTION-XML
2 changes: 1 addition & 1 deletion Source/GraphQLTemplate/TODO.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<a href="https://github.com/Dotnet-Boxed/Templates">
<img alt=".NET Boxed"
class="img-responsive"
src="https://media.githubusercontent.com/media/Dotnet-Boxed/Templates/master/Images/Banner.png"
src="https://media.githubusercontent.com/media/Dotnet-Boxed/Templates/main/Images/Banner.png"
style="margin-bottom: 20px">
</a>

Expand Down
2 changes: 1 addition & 1 deletion Source/NuGetTemplate/.github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
Thank you good citizen for your hard work!
Please read the contributing guide before raising a pull request.
https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/blob/master/.github/CONTRIBUTING.md
https://github.com/GITHUB-USERNAME/GITHUB-PROJECT/blob/main/.github/CONTRIBUTING.md
-->
2 changes: 1 addition & 1 deletion Source/NuGetTemplate/.github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# release-drafter automatically creates a draft release for you each time you complete a PR in the master branch.
# release-drafter automatically creates a draft release for you each time you complete a PR in the main branch.
# It uses GitHub labels to categorize changes (See categories) and draft the release.
# release-drafter also generates a version for your release based on GitHub labels. You can add a label of 'major',
# 'minor' or 'patch' to determine which number in the version to increment.
Expand Down
6 changes: 3 additions & 3 deletions Source/NuGetTemplate/.github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build

on:
push:
branches: master
branches: main
pull_request:
release:
types:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
push-github-packages:
name: 'Push GitHub Packages'
needs: build
if: github.ref == 'refs/heads/master' || github.event_name == 'release'
if: github.ref == 'refs/heads/main' || github.event_name == 'release'
runs-on: windows-latest
steps:
- name: 'Download Artefact'
Expand Down Expand Up @@ -86,4 +86,4 @@ jobs:
Get-ChildItem .\windows-latest -Filter *.nupkg |
Where-Object { !$_.Name.Contains('preview') } |
ForEach-Object { dotnet nuget push $_ --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}} }
shell: pwsh
shell: pwsh
4 changes: 2 additions & 2 deletions Source/NuGetTemplate/.github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [main]
schedule:
- cron: '0 8 * * 4'

Expand Down
2 changes: 1 addition & 1 deletion Source/NuGetTemplate/.github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- master
- main

jobs:
update_release_draft:
Expand Down
2 changes: 1 addition & 1 deletion Source/NuGetTemplate/.template.config/ide.host.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json.schemastore.org/vs-2017.3.host",
"order": 0,
"learnMoreLink": "https://github.com/Dotnet-Boxed/Templates/blob/master/Docs/NuGet.md",
"learnMoreLink": "https://github.com/Dotnet-Boxed/Templates/blob/main/Docs/NuGet.md",
"icon": "icon.png",
"symbolInfo": [
{
Expand Down
Loading

0 comments on commit 46e9312

Please sign in to comment.