Updated pipeline files to support change of master to main

dsccommunity · Dec 31, 2020 · cc7c35c · cc7c35c
1 parent 169246a
commit cc7c35c
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Renamed `master` branch to `main` - Fixes [Issue #237](https://github.com/dsccommunity/CertificateDsc/issues/237).
+
 ## [5.0.0] - 2020-10-16
 
 ### Changed

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -8,19 +8,19 @@ assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'
 branches:
   master:
     tag: preview
+    regex: ^main$
   pull-request:
     tag: PR
   feature:
     tag: useBranchName
     increment: Minor
     regex: f(eature(s)?)?[\/-]
-    source-branches: ['master']
+    source-branches: ['main']
   hotfix:
     tag: fix
     increment: Patch
     regex: (hot)?fix(es)?[\/-]
-    source-branches: ['master']
-
+    source-branches: ['main']
 ignore:
   sha: []
 merge-message-formats: {}
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # CertificateDsc
 
-[![Build Status](https://dev.azure.com/dsccommunity/CertificateDsc/_apis/build/status/dsccommunity.CertificateDsc?branchName=master)](https://dev.azure.com/dsccommunity/CertificateDsc/_build/latest?definitionId=28&branchName=master)
-![Code Coverage](https://img.shields.io/azure-devops/coverage/dsccommunity/CertificateDsc/28/master)
-[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/CertificateDsc/28/master)](https://dsccommunity.visualstudio.com/CertificateDsc/_test/analytics?definitionId=28&contextType=build)
+[![Build Status](https://dev.azure.com/dsccommunity/CertificateDsc/_apis/build/status/dsccommunity.CertificateDsc?branchName=main)](https://dev.azure.com/dsccommunity/CertificateDsc/_build/latest?definitionId=28&branchName=main)
+![Code Coverage](https://img.shields.io/azure-devops/coverage/dsccommunity/CertificateDsc/28/main)
+[![Azure DevOps tests](https://img.shields.io/azure-devops/tests/dsccommunity/CertificateDsc/28/main)](https://dsccommunity.visualstudio.com/CertificateDsc/_test/analytics?definitionId=28&contextType=build)
 [![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/vpre/CertificateDsc?label=CertificateDsc%20Preview)](https://www.powershellgallery.com/packages/CertificateDsc/)
 [![PowerShell Gallery](https://img.shields.io/powershellgallery/v/CertificateDsc?label=CertificateDsc)](https://www.powershellgallery.com/packages/CertificateDsc/)
 
@@ -12,7 +12,7 @@ This project has adopted [this code of conduct](CODE_OF_CONDUCT.md).
 
 ## Releases
 
-For each merge to the branch `master` a preview release will be
+For each merge to the branch `main` a preview release will be
 deployed to [PowerShell Gallery](https://www.powershellgallery.com/).
 Periodically a release version tag will be pushed which will deploy a
 full release to [PowerShell Gallery](https://www.powershellgallery.com/).

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-    - master
+    - main
   paths:
     include:
     - source/*
@@ -248,7 +248,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/')
         ),
         contains(variables['System.TeamFoundationCollectionUri'], 'dsccommunity')
@@ -277,6 +277,8 @@ stages:
             env:
               GitHubToken: $(GitHubToken)
               GalleryApiToken: $(GalleryApiToken)
+              ReleaseBranch: main
+              MainGitBranch: main
 
           - task: PowerShell@2
             name: sendChangelogPR
@@ -287,3 +289,5 @@ stages:
               pwsh: true
             env:
               GitHubToken: $(GitHubToken)
+              ReleaseBranch: main
+              MainGitBranch: main
diff --git a/build.yaml b/build.yaml
@@ -74,6 +74,7 @@ DscTest:
     - output
   ExcludeModuleFile:
     - Modules/DscResource.Common
+  MainGitBranch: main
 
 Resolve-Dependency:
   Gallery: 'PSGallery'

diff --git a/source/CertificateDsc.psd1 b/source/CertificateDsc.psd1
@@ -54,7 +54,7 @@
             Tags         = @('DesiredStateConfiguration', 'DSC', 'DSCResource', 'Certificate', 'PKI')
 
             # A URL to the license for this module.
-            LicenseUri   = 'https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE'
+            LicenseUri   = 'https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE'
 
             # A URL to the main website for this project.
             ProjectUri   = 'https://github.com/dsccommunity/CertificateDsc'

diff --git a/source/Examples/Resources/CertReq/1-CertReq_RequestAltSSLCert_Config.ps1 b/source/Examples/Resources/CertReq/1-CertReq_RequestAltSSLCert_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/CertReq/2-CertReq_RequestSSLCert_Config.ps1 b/source/Examples/Resources/CertReq/2-CertReq_RequestSSLCert_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/...ce/Examples/Resources/CertificateExport/1-CertificateExport_CertByFriendlyName_Config.ps1 b/...ce/Examples/Resources/CertificateExport/1-CertificateExport_CertByFriendlyName_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/CertificateExport/2-CertificateExport_PfxByFriendlyName_Config.ps1 b/source/Examples/Resources/CertificateExport/2-CertificateExport_PfxByFriendlyName_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/CertificateImport/1-CertificateImport_MinimalUsage_Config.ps1 b/source/Examples/Resources/CertificateImport/1-CertificateImport_MinimalUsage_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/CertificateImport/2-CertificateImport_FriendlyName_Config.ps1 b/source/Examples/Resources/CertificateImport/2-CertificateImport_FriendlyName_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/PfxImport/1-PfxImport_InstallPFXForWebSite_Config.ps1 b/source/Examples/Resources/PfxImport/1-PfxImport_InstallPFXForWebSite_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/PfxImport/2-PfxImport_InstallPFX_Config.ps1 b/source/Examples/Resources/PfxImport/2-PfxImport_InstallPFX_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/PfxImport/3-PfxImport_RemovePFX_Config.ps1 b/source/Examples/Resources/PfxImport/3-PfxImport_RemovePFX_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/PfxImport/4-PfxImport_FriendlyName_Config.ps1 b/source/Examples/Resources/PfxImport/4-PfxImport_FriendlyName_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/Examples/Resources/PfxImport/5-PfxImport_InstallPFXAdministrator_Config.ps1 b/source/Examples/Resources/PfxImport/5-PfxImport_InstallPFXAdministrator_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/...WaitForCertificateServices/1-WaitForCertificateServices_RequestSSLCertWithWait_Config.ps1 b/...WaitForCertificateServices/1-WaitForCertificateServices_RequestSSLCertWithWait_Config.ps1
@@ -5,7 +5,7 @@
 .COMPANYNAME DSC Community
 .COPYRIGHT Copyright the DSC Community contributors. All rights reserved.
 .TAGS DSCConfiguration
-.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/master/LICENSE
+.LICENSEURI https://github.com/dsccommunity/CertificateDsc/blob/main/LICENSE
 .PROJECTURI https://github.com/dsccommunity/CertificateDsc
 .ICONURI
 .EXTERNALMODULEDEPENDENCIES

diff --git a/source/WikiSource/Home.md b/source/WikiSource/Home.md
@@ -33,4 +33,4 @@ Get-DscResource -Module CertificateDsc
 
 ## Change Log
 
-A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/CertificateDsc/blob/master/CHANGELOG.md).
+A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/CertificateDsc/blob/main/CHANGELOG.md).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,4 @@ Get-DscResource -Module CertificateDsc

		## Change Log

		A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/CertificateDsc/blob/master/CHANGELOG.md).
		A full list of changes in each version can be found in the [change log](https://github.com/dsccommunity/CertificateDsc/blob/main/CHANGELOG.md).