Updated pipeline files to support renaming default branch to main (#24)

CHANGELOG.md

@@ -25,6 +25,10 @@ and [#9](https://github.com/dsccommunity/DscResource.AnalyzerRules/issues/9).
 - `Get-TokensFromDefinition.ps1`
   - Remove unused variable.
 
+### Changed
+
+- Renamed default branch to `main`. Fixes [#12](https://github.com/dsccommunity/DscResource.AnalyzerRules/issues/22).
+
 ## [0.2.0] - 2019-11-21
 
 - Fix issue with DSC composite resources.

GitVersion.yml

@@ -6,33 +6,22 @@ patch-version-bump-message: '\s?(fix|patch)'
 no-bump-message: '\+semver:\s?(none|skip)'
 assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'
 branches:
-  master:
+  main:
     tag: preview
+    regex: ^main$
   pull-request:
     tag: PR
   feature:
     tag: useBranchName
     increment: Minor
-    regex: f(eature(s)?)?[/-]
-    source-branches: ['master']
+    regex: f(eature(s)?)?[\/-]
+    source-branches: ['main']
   hotfix:
     tag: fix
     increment: Patch
-    regex: (hot)?fix(es)?[/-]
-    source-branches: ['master']
+    regex: (hot)?fix(es)?[\/-]
+    source-branches: ['main']
 
 ignore:
   sha: []
 merge-message-formats: {}
-
-
-# feature:
-#   tag: useBranchName
-#   increment: Minor
-#   regex: f(eature(s)?)?[/-]
-#   source-branches: ['master']
-# hotfix:
-#   tag: fix
-#   increment: Patch
-#   regex: (hot)?fix(es)?[/-]
-#   source-branches: ['master']

Source/DscResource.AnalyzerRules.psd1

@@ -92,13 +92,13 @@ PrivateData = @{
         Tags = @('PSScriptAnalyzer','PSSA','Analyzer','AnalyzerRules','DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource','Windows','MacOS','Linux')
 
         # A URL to the license for this module.
-        # LicenseUri = ''
+        LicenseUri   = 'https://github.com/dsccommunity/DscResource.AnalyzerRules/blob/main/LICENSE'
 
         # A URL to the main website for this project.
-        # ProjectUri = ''
+        ProjectUri   = 'https://github.com/dsccommunity/DscResource.AnalyzerRules'
 
         # A URL to an icon representing this module.
-        # IconUri = ''
+        IconUri      = 'https://dsccommunity.org/images/DSC_Logo_300p.png'
 
         Prerelease = ''
 

azure-pipelines.yml

@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - source/*
@@ -15,7 +15,7 @@ variables:
   buildArtifactName: output
   testResultFolderName: testResults
   testArtifactName: testResults
-  defaultBranch: master
+  defaultBranch: main
 
 stages:
   - stage: Build
@@ -257,7 +257,7 @@ stages:
       and(
         succeeded(),
         or(
-          eq(variables['Build.SourceBranch'], 'refs/heads/master'),
+          eq(variables['Build.SourceBranch'], 'refs/heads/main'),
           startsWith(variables['Build.SourceBranch'], 'refs/tags/')
         )
       )

tests/QA/module.tests.ps1

@@ -22,7 +22,7 @@ Describe 'Changelog Management' -Tag 'Changelog' {
         ) {
         # Get the list of changed files compared with branch main
         $HeadCommit = &git rev-parse HEAD
-        $defaultBranchCommit = &git rev-parse origin/master
+        $defaultBranchCommit = &git rev-parse origin/main
         $filesChanged = &git @('diff', "$defaultBranchCommit...$HeadCommit", '--name-only')
 
         if($HeadCommit -ne $defaultBranchCommit) { # if we're not testing same commit (i.e. main..main)