diff options
| author | anmeng10101 <33647870+anmeng10101@users.noreply.github.com> | 2021-04-02 16:13:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 16:13:08 +0300 |
| commit | 35c9e2ba3d6b3ae2824a673c0235d275686861fd (patch) | |
| tree | cf6fdb02ef41b32b8fa271278a1e67cf15e5f0c0 | |
| parent | 244598685cb099cdb9cd9209df768ef91bf51c67 (diff) | |
| parent | 522b5aaa36589b9be9b0950638352c47b1c3f011 (diff) | |
Merge pull request #542 from mono/develop-merge
fix merge conflict for change master-main
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | azure-pipelines.yml | 3 | ||||
| -rw-r--r-- | mdoc/mdoc.nuspec | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2e35304..5ace2d3c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ If you are working in an area of the code that has transitioned to the new codin This project tries to avoid chatty in-progress commits that are common during development. Once you’ve completed your development and are ready to move to the next stage of the contribution workflow, collapse your changes into as few feature-scoped commits as possible. Ideally if possible, every commit should pass all unit tests and be standalone. -You can do so either by using an interactive rebase of your branch if you need multiple commits, or simply doing a soft reset `git reset origin/master —soft` … which will stage all of your changes and let you create a new single commit that contains all changes. +You can do so either by using an interactive rebase of your branch if you need multiple commits, or simply doing a soft reset `git reset origin/main —soft` … which will stage all of your changes and let you create a new single commit that contains all changes. The commit message should be verbose enough to explain what behavior is changing, bug is being fixed, or feature being added. It should also contain a reference to the github issue being resolved, as [described here](https://github.com/blog/1386-closing-issues-via-commit-messages). diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f91a68bb..07838959 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,11 +96,10 @@ steps: inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/zips' ArtifactName: 'mdoc.Artifact' - - task: PowerShell@2 name: 'mdocVersion' displayName: 'Checking remote and local version of mdoc' - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: filePath: 'mdoc/CheckNugetPublish.ps1' diff --git a/mdoc/mdoc.nuspec b/mdoc/mdoc.nuspec index 47ecba84..6adf740b 100644 --- a/mdoc/mdoc.nuspec +++ b/mdoc/mdoc.nuspec @@ -7,7 +7,7 @@ <authors>Microsoft</authors> <owners>Microsoft</owners> <projectUrl>https://github.com/mono/api-doc-tools</projectUrl> - <licenseUrl>https://github.com/mono/api-doc-tools/blob/master/LICENSE.md</licenseUrl> + <licenseUrl>https://github.com/mono/api-doc-tools/blob/main/LICENSE.md</licenseUrl> <requireLicenseAcceptance>true</requireLicenseAcceptance> <description>.NET API Documentation toolchain</description> <copyright>© Microsoft Corporation. All rights reserved.</copyright> |