Replace references to master branch with new default, main

This commit is contained in:
Kyle Kamperschroer 2020-09-23 09:05:25 -05:00
Родитель 70cdf5e72f
Коммит 5a6ead0dce
3 изменённых файлов: 14 добавлений и 14 удалений

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

@ -1,4 +1,4 @@
[![Build Status](https://dev.azure.com/devdiv/DevDiv/_apis/build/status/Azure.azure-notificationhubs-xamarin?repoName=Azure%2Fazure-notificationhubs-xamarin&branchName=master)](https://dev.azure.com/devdiv/DevDiv/_build/latest?definitionId=13458&repoName=Azure%2Fazure-notificationhubs-xamarin&branchName=master)
[![Build Status](https://dev.azure.com/devdiv/DevDiv/_apis/build/status/Azure.azure-notificationhubs-xamarin?repoName=Azure%2Fazure-notificationhubs-xamarin&branchName=main)](https://dev.azure.com/devdiv/DevDiv/_build/latest?definitionId=13458&repoName=Azure%2Fazure-notificationhubs-xamarin&branchName=main)
# Azure Notification Hubs for Xamarin

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

@ -1,6 +1,6 @@
variables:
# job parameters
masterBranchName: 'master'
mainBranchName: 'main'
submodules: false
# job software version parameters
macosImage: 'macos-latest'
@ -55,12 +55,12 @@ jobs:
inputs:
checkLatest: true
displayName: 'Download the latest nuget.exe'
# determine the last successful build for "master" branch
# determine the last successful build for "main" branch
- pwsh: |
# determine the "master" branch
$masterBranch = "$(masterBranchName)"
$encodedBranch = [Uri]::EscapeDataString("refs/heads/$masterBranch")
Write-Host "Master branch: $masterBranch"
# determine the "main" branch
$mainBranch = "$(mainBranchName)"
$encodedBranch = [Uri]::EscapeDataString("refs/heads/$mainBranch")
Write-Host "Main branch: $mainBranch"
# determine the "current" branch
$branch = "$(Build.SourceBranch)"
if ("$env:SYSTEM_PULLREQUEST_TARGETBRANCH") {
@ -74,10 +74,10 @@ jobs:
$branch = $branch.Substring(10)
Write-Host "Current tag: $branch"
}
if (($branch -eq $masterBranch) -and ("$(System.PullRequest.IsFork)" -eq "False")) {
Write-Host "Branch is master, fetching last successful build commit..."
if (($branch -eq $mainBranch) -and ("$(System.PullRequest.IsFork)" -eq "False")) {
Write-Host "Branch is main, fetching last successful build commit..."
$url = "$(System.TeamFoundationCollectionUri)$(System.TeamProjectId)/_apis/build/builds/?definitions=$(System.DefinitionId)&branchName=$encodedBranch&statusFilter=completed&resultFilter=succeeded&api-version=5.0"
Write-Host "URL for last successful master build: $url"
Write-Host "URL for last successful main build: $url"
$json = Invoke-RestMethod -Uri $url -Headers @{
Authorization = "Bearer $(System.AccessToken)"
}
@ -88,7 +88,7 @@ jobs:
if ($lastSuccessfulBuildCommit) {
Write-Host "Last successful commit found: $lastSuccessfulBuildCommit"
} else {
$lastSuccessfulBuildCommit = "origin/$masterBranch"
$lastSuccessfulBuildCommit = "origin/$mainBranch"
Write-Host "No previously successful build found, using $lastSuccessfulBuildCommit."
}
Write-Host "##vso[task.setvariable variable=GitLastSuccessfulCommit]$lastSuccessfulBuildCommit"
@ -124,7 +124,7 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
- task: ComponentGovernanceComponentDetection@0
displayName: 'Run component detection'
condition: and(always(), eq('refs/heads/$(masterBranchName)', variables['Build.SourceBranch']))
condition: and(always(), eq('refs/heads/$(mainBranchName)', variables['Build.SourceBranch']))
inputs:
scanType: 'Register'
verbosity: 'Verbose'

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

@ -31,8 +31,8 @@
<PackOnBuild>true</PackOnBuild>
<PackageId>Microsoft.Azure.NotificationHubs.Client</PackageId>
<PackageVersion>1.0.0</PackageVersion>
<PackageIconUrl>https://raw.githubusercontent.com/Azure/azure-notificationhubs-xamarin/master/.github/icons/aznh-icon-128x128.png</PackageIconUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Azure/azure-notificationhubs-xamarin/master/LICENSE</PackageLicenseUrl>
<PackageIconUrl>https://raw.githubusercontent.com/Azure/azure-notificationhubs-xamarin/main/.github/icons/aznh-icon-128x128.png</PackageIconUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Azure/azure-notificationhubs-xamarin/main/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Azure/azure-notificationhubs-xamarin/</PackageProjectUrl>
<Authors>Microsoft</Authors>
<Owners>Microsoft</Owners>