Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch occurrences of master to main #51646

Merged
merged 4 commits into from
Mar 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/analyzer-suggestion.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ Any more additional information you would like to add.

**Documentation requirements:**

When this analyzer is implemented, it must be documented by following the steps at [Documentation for IDE CodeStyle analyzers](https://github.com/dotnet/roslyn/blob/master/docs/contributing/Documentation%20for%20IDE%20CodeStyle%20analyzers.md).
When this analyzer is implemented, it must be documented by following the steps at [Documentation for IDE CodeStyle analyzers](https://github.com/dotnet/roslyn/blob/main/docs/contributing/Documentation%20for%20IDE%20CodeStyle%20analyzers.md).
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Guidelines for contributing to the Roslyn repo.
- **DO** submit issues for other features. This facilitates discussion of a feature separately from its implementation, and increases the acceptance rates for pull requests.
- **DO NOT** submit large code formatting changes without discussing with the team first.

When you are ready to proceed with making a change, get set up to build (either on [Windows](https://github.com/dotnet/roslyn/blob/master/docs/contributing/Building%2C%20Debugging%2C%20and%20Testing%20on%20Windows.md) or on [Unix](https://github.com/dotnet/roslyn/blob/master/docs/contributing/Building%2C%20Debugging%2C%20and%20Testing%20on%20Unix.md)) the code and familiarize yourself with our developer workflow.
When you are ready to proceed with making a change, get set up to build (either on [Windows](https://github.com/dotnet/roslyn/blob/main/docs/contributing/Building%2C%20Debugging%2C%20and%20Testing%20on%20Windows.md) or on [Unix](https://github.com/dotnet/roslyn/blob/main/docs/contributing/Building%2C%20Debugging%2C%20and%20Testing%20on%20Unix.md)) the code and familiarize yourself with our developer workflow.

These two blogs posts on contributing code to open source projects are good too: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don’t “Push” Your Pull Requests](https://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik.

Expand All @@ -27,11 +27,11 @@ These two blogs posts on contributing code to open source projects are good too:

## Coding Style

The Roslyn project is a member of the [.NET Foundation](https://github.com/orgs/dotnet) and follows the same [developer guide](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/coding-style.md). The repo also includes [.editorconfig](http://editorconfig.org) files to help enforce this convention. Contributors should ensure they follow these guidelines when making submissions.
The Roslyn project is a member of the [.NET Foundation](https://github.com/orgs/dotnet) and follows the same [developer guide](https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/coding-style.md). The repo also includes [.editorconfig](http://editorconfig.org) files to help enforce this convention. Contributors should ensure they follow these guidelines when making submissions.

### CSharp

- **DO** use the coding style outlined in the [.NET Runtime Coding Guidelines](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/coding-style.md)
- **DO** use the coding style outlined in the [.NET Runtime Coding Guidelines](https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/coding-style.md)
- **DO** use plain code to validate parameters at public boundaries. Do not use Contracts or magic helpers.

```csharp
Expand Down
28 changes: 14 additions & 14 deletions README.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions azure-pipelines-integration-lsp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

# Branches that trigger a build on commit
trigger:
- master
- master-vs-deps
- main
- main-vs-deps
- release/*
- features/*
- demos/*

# Branches that trigger builds on PR
pr:
- master
- master-vs-deps
- main
- main-vs-deps
- release/*
- features/*
- demos/*
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines-integration.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Branches that trigger a build on commit
trigger:
- master
- master-vs-deps
- main
- main-vs-deps
- release/*
- features/*
- demos/*

# Branches that trigger builds on PR
pr:
- master
- master-vs-deps
- main
- main-vs-deps
- release/*
- features/*
- demos/*
Expand Down
10 changes: 5 additions & 5 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,20 @@ stages:
condition: and(succeeded(), ne(variables['PRNumber'], 'default'))

- task: tagBuildOrRelease@0
displayName: Tag master validation build
displayName: Tag main validation build
inputs:
type: 'Build'
tags: |
MasterValidationBuild
condition: and(succeeded(), eq(variables['SourceBranchName'], 'master'))
MainValidationBuild
condition: and(succeeded(), eq(variables['SourceBranchName'], 'main'))

- task: PowerShell@2
displayName: Merge master-vs-deps into source branch
displayName: Merge main-vs-deps into source branch
inputs:
filePath: 'scripts\merge-vs-deps.ps1'
${{ if eq(variables['System.TeamProject'], 'internal') }}:
arguments: '-accessToken $(dn-bot-dnceng-build-rw-code-rw)'
condition: and(succeeded(), eq(variables['SourceBranchName'], 'master'))
condition: and(succeeded(), eq(variables['SourceBranchName'], 'main'))

- powershell: Write-Host "##vso[task.setvariable variable=VisualStudio.DropName]Products/$(System.TeamProject)/$(Build.Repository.Name)/$(SourceBranchName)/$(Build.BuildNumber)"
displayName: Setting VisualStudio.DropName variable
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-richnav.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
trigger:
- master
- main
pr: none

jobs:
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Branches that trigger a build on commit
trigger:
- master
- master-vs-deps
- main
- main-vs-deps
- release/*
- features/*
- demos/*

# Branches that trigger builds on PR
pr:
- master
- master-vs-deps
- main
- main-vs-deps
- release/*
- features/*
- demos/*
Expand Down
Loading