Merge branch 'origin/main' into develop

This commit is contained in:
Matthew Leibowitz 2020-09-15 16:53:30 +02:00
Родитель 62e108533c 972bdda661
Коммит b8c56c7ea0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: ECDB25CC0E22FC46
5 изменённых файлов: 7 добавлений и 7 удалений

2
.github/ISSUE_TEMPLATE.md поставляемый
Просмотреть файл

@ -1,4 +1,4 @@
Bug report best practices: [Submitting Issues](https://github.com/xamarin/Essentials/blob/master/SUBMITTING-ISSUES.md)
Bug report best practices: [Submitting Issues](https://github.com/xamarin/Essentials/blob/main/SUBMITTING-ISSUES.md)
### Description

2
.github/PULL_REQUEST_TEMPLATE.md поставляемый
Просмотреть файл

@ -39,6 +39,6 @@ Describe any non-bug related behavioral changes that may change how users app be
- [ ] Has tests (if omitted, state reason in description)
- [ ] Has samples (if omitted, state reason in description)
- [ ] Rebased on top of master at time of PR
- [ ] Rebased on top of `main` at time of PR
- [ ] Changes adhere to coding standard
- [ ] Updated documentation ([see walkthrough](https://github.com/xamarin/Essentials/wiki/Documenting-your-code-with-mdoc))

Просмотреть файл

@ -93,7 +93,7 @@ Follow the style used by the [.NET Foundation](https://github.com/dotnet/runtime
- We will **not** use `_` or `s_` as a prefix for internal or private field names
- We will use `camelCaseFieldName` for naming internal or private fields in both instance and static implementations
Read and follow our [Pull Request template](https://github.com/xamarin/Essentials/blob/master/.github/PULL_REQUEST_TEMPLATE.md)
Read and follow our [Pull Request template](https://github.com/xamarin/Essentials/blob/main/.github/PULL_REQUEST_TEMPLATE.md)
### Proposals

Просмотреть файл

@ -10,9 +10,9 @@ iOS, Android, and UWP offer unique operating system and platform APIs that devel
| Build Server | Type | Platform | Status |
|--------------|--------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| VSTS | Build | Windows | [![Build Status](https://dev.azure.com/devdiv/DevDiv/_apis/build/status/Xamarin/Components/Xamarin.Essentials?branchName=master)](https://dev.azure.com/xamarin/public/_build?definitionId=7&_a=summary) |
| App Center | Sample App | Android | [![Build status](https://build.appcenter.ms/v0.1/apps/7a1f46ca-ba2f-477e-aacc-ff013c7d5f7a/branches/master/badge)](https://appcenter.ms) |
| App Center | Sample App | iOS | [![Build status](https://build.appcenter.ms/v0.1/apps/43b39e9e-2b2b-482f-8afa-e9906334c85e/branches/master/badge)](https://appcenter.ms) |
| VSTS | Build | Windows | [![Build Status](https://dev.azure.com/devdiv/DevDiv/_apis/build/status/Xamarin/Components/Xamarin.Essentials?branchName=main)](https://dev.azure.com/xamarin/public/_build?definitionId=7&_a=summary) |
| App Center | Sample App | Android | [![Build status](https://build.appcenter.ms/v0.1/apps/7a1f46ca-ba2f-477e-aacc-ff013c7d5f7a/branches/main/badge)](https://appcenter.ms) |
| App Center | Sample App | iOS | [![Build status](https://build.appcenter.ms/v0.1/apps/43b39e9e-2b2b-482f-8afa-e9906334c85e/branches/main/badge)](https://appcenter.ms) |
## Sample App

Просмотреть файл

@ -52,7 +52,7 @@
"ms.technology":"xamarin-essentials",
"feedback_system": "GitHub",
"feedback_github_repo": "MicrosoftDocs/xamarin-docs",
"feedback_product_url": "https://github.com/xamarin/Essentials/blob/master/PRODUCT-FEEDBACK.md"
"feedback_product_url": "https://github.com/xamarin/Essentials/blob/main/PRODUCT-FEEDBACK.md"
},
"fileMetadata": {
"author": {