use main branch instead of master (dotnet#7287)

turrisxyz · Apr 12, 2021 · d1e67ba · d1e67ba
1 parent e8b760c
commit d1e67ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/azure-pipelines-master.yml b/azure-pipelines-master.yml
@@ -1,4 +1,4 @@
-# This YAML is used for the docfx v2 master release CI (https://dev.azure.com/ceapex/Engineering/_build?definitionId=1503&_a=summary)
+# This YAML is used for the docfx v2 main release CI (https://dev.azure.com/ceapex/Engineering/_build?definitionId=1503&_a=summary)
 
 variables:
 - group: docfx-v2-pipeline-kv
@@ -36,7 +36,7 @@ steps:
   displayName: 'gulp build'
   inputs:
     filename: node
-    arguments: '.\node_modules\gulp\bin\gulp.js master:build'
+    arguments: '.\node_modules\gulp\bin\gulp.js main:build'
     workingFolder: tools/Deployment
   env:
     TOKEN: $(ServiceAccountGithubToken)
@@ -166,7 +166,7 @@ steps:
   displayName: 'gulp pack'
   inputs:
     filename: node
-    arguments: '.\node_modules\gulp\bin\gulp.js master:pack'
+    arguments: '.\node_modules\gulp\bin\gulp.js main:pack'
     workingFolder: tools/Deployment
 
 - task: EsrpCodeSigning@1
@@ -209,7 +209,7 @@ steps:
   displayName: 'gulp release'
   inputs:
     filename: node
-    arguments: '.\node_modules\gulp\bin\gulp.js master:release'
+    arguments: '.\node_modules\gulp\bin\gulp.js main:release'
     workingFolder: tools/Deployment
   env:
     NUGETAPIKEY: $(NugetAPIKey)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,10 +5,10 @@ trigger:
   branches:
     include:
     - dev
-    - master
+    - main
 pr:
 - dev
-- master
+- main
 
 pool:
   name: Hosted Windows 2019 with VS2019

diff --git a/build.ps1 b/build.ps1
@@ -19,7 +19,7 @@ $scriptRoot = $($MyInvocation.MyCommand.Definition) | Split-Path
 . "$scriptRoot/common.ps1"
 
 $ErrorActionPreference = 'Stop'
-$releaseBranch = "master"
+$releaseBranch = "main"
 $gitCommand = "git"
 $framework = "net472"
 $packageVersion = "1.0.0"
@@ -64,7 +64,7 @@ if ($prod -eq $true) {
         ProcessLastExitCode $lastexitcode "Get GIT branch name $branch"
     }
     else {
-        $branch = "master";
+        $branch = "main";
         Write-Host "Release version using $branch branch"
     }
 

diff --git a/tools/Deployment/gulpfile.js b/tools/Deployment/gulpfile.js
@@ -227,8 +227,8 @@ gulp.task("dev", gulp.series("clean", "build", "e2eTest"));
 gulp.task("dev:build", gulp.series("clean", "build", "e2eTest"));
 gulp.task("dev:release", gulp.series("pack", "publish:azdevops-perf-login", "publish:azdevops-perf", "publish:azdevops-internal-login", "publish:azdevops-internal", "publish:azdevops-ppe-login", "publish:azdevops-ppe"));
 
-gulp.task("master:build", gulp.series("clean", "build:release", "e2eTest", "updateGhPage"));
-gulp.task("master:pack", gulp.series("pack"));
-gulp.task("master:release", gulp.series("packAssetZip", "publish:azdevops-prod-login", "publish:azdevops-prod", "publish:nuget", "publish:gh-release", "publish:gh-asset", "publish:chocolatey"));
+gulp.task("main:build", gulp.series("clean", "build:release", "e2eTest", "updateGhPage"));
+gulp.task("main:pack", gulp.series("pack"));
+gulp.task("main:release", gulp.series("packAssetZip", "publish:azdevops-prod-login", "publish:azdevops-prod", "publish:nuget", "publish:gh-release", "publish:gh-asset", "publish:chocolatey"));
 
 gulp.task("default", gulp.series("dev"));