From e9e5c683605d6ebf6d94270c1d1c5bc4f95f4ebd Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 24 Jun 2020 18:58:14 +0100 Subject: [PATCH] [Build] Move from master to main --- azure-pipelines.yml | 8 ++++---- build/steps/build-nuget.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7e96b377d..f32a52337 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,7 +30,7 @@ resources: trigger: branches: include: - - master + - main - 3.* - 4.* tags: @@ -44,7 +44,7 @@ pr: autoCancel: false branches: include: - - master + - main - 4.* - 3.* @@ -53,7 +53,7 @@ schedules: displayName: Daily midnight build branches: include: - - master + - main stages: - stage: windows @@ -291,6 +291,6 @@ stages: msbuild steps: - template: build/steps/build-sign.yml - condition: and(succeeded(), ne(variables['signVmImage'], ''), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'],'refs/tags/')))) + condition: and(succeeded(), ne(variables['signVmImage'], ''), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'],'refs/tags/')))) diff --git a/build/steps/build-nuget.yml b/build/steps/build-nuget.yml index d4daf814c..ab3ed3208 100644 --- a/build/steps/build-nuget.yml +++ b/build/steps/build-nuget.yml @@ -53,7 +53,7 @@ steps: } failOnStderr: true displayName: 'Update nuspecs' - condition: and(succeeded(), or(eq(variables['DefaultBuildConfiguration'], 'Release'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))) + condition: and(succeeded(), or(eq(variables['DefaultBuildConfiguration'], 'Release'), eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))) - task: NuGetCommand@2 displayName: 'Make NuGet Package Release' @@ -64,7 +64,7 @@ steps: packDestination: '$(Build.ArtifactStagingDirectory)/nuget/release' versioningScheme: byEnvVar versionEnvVar: nugetPackageVersion - condition: and(succeeded(), or(eq(variables['DefaultBuildConfiguration'], 'Release'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))) + condition: and(succeeded(), or(eq(variables['DefaultBuildConfiguration'], 'Release'), eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))) - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: nuget'