diff --git a/CHANGELOG.md b/CHANGELOG.md index 05d1308..541bafe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - WSManDsc - Automatically publish documentation to GitHub Wiki - Fixes [Issue #82](https://github.com/dsccommunity/WSManDsc/issues/82). - Renamed `master` branch to `main` - Fixes [Issue #82](https://github.com/dsccommunity/WSManDsc/issues/82). +- Minor corrections to pipeline files and examples after renaming `master` + branch to `main`. ## [3.1.1] - 2020-01-31 diff --git a/GitVersion.yml b/GitVersion.yml index fcbaca9..406c46c 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -8,7 +8,7 @@ assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}' branches: master: tag: preview - regex: ^master$|^main$ + regex: ^main$ pull-request: tag: PR feature: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1358655..816e11c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -242,7 +242,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') diff --git a/source/Examples/Resources/WSManConfig/1-WSManConfig_Config.ps1 b/source/Examples/Resources/WSManConfig/1-WSManConfig_Config.ps1 index 2ca68b2..6da5acb 100644 --- a/source/Examples/Resources/WSManConfig/1-WSManConfig_Config.ps1 +++ b/source/Examples/Resources/WSManConfig/1-WSManConfig_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/WSManDsc/blob/master/LICENSE +.LICENSEURI https://github.com/dsccommunity/WSManDsc/blob/main/LICENSE .PROJECTURI https://github.com/dsccommunity/WSManDsc .ICONURI .EXTERNALMODULEDEPENDENCIES diff --git a/source/Examples/Resources/WSManListener/1-WSManListener_HTTP_Config.ps1 b/source/Examples/Resources/WSManListener/1-WSManListener_HTTP_Config.ps1 index 771ae18..64f482d 100644 --- a/source/Examples/Resources/WSManListener/1-WSManListener_HTTP_Config.ps1 +++ b/source/Examples/Resources/WSManListener/1-WSManListener_HTTP_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/WSManDsc/blob/master/LICENSE +.LICENSEURI https://github.com/dsccommunity/WSManDsc/blob/main/LICENSE .PROJECTURI https://github.com/dsccommunity/WSManDsc .ICONURI .EXTERNALMODULEDEPENDENCIES diff --git a/source/Examples/Resources/WSManListener/2-WSManListener_HTTPS_Config.ps1 b/source/Examples/Resources/WSManListener/2-WSManListener_HTTPS_Config.ps1 index f3f959e..033318a 100644 --- a/source/Examples/Resources/WSManListener/2-WSManListener_HTTPS_Config.ps1 +++ b/source/Examples/Resources/WSManListener/2-WSManListener_HTTPS_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/WSManDsc/blob/master/LICENSE +.LICENSEURI https://github.com/dsccommunity/WSManDsc/blob/main/LICENSE .PROJECTURI https://github.com/dsccommunity/WSManDsc .ICONURI .EXTERNALMODULEDEPENDENCIES diff --git a/source/Examples/Resources/WSManListener/3-WSManListener_HTTPS_WithDN_Config.ps1 b/source/Examples/Resources/WSManListener/3-WSManListener_HTTPS_WithDN_Config.ps1 index 7f73277..bd6b21e 100644 --- a/source/Examples/Resources/WSManListener/3-WSManListener_HTTPS_WithDN_Config.ps1 +++ b/source/Examples/Resources/WSManListener/3-WSManListener_HTTPS_WithDN_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/WSManDsc/blob/master/LICENSE +.LICENSEURI https://github.com/dsccommunity/WSManDsc/blob/main/LICENSE .PROJECTURI https://github.com/dsccommunity/WSManDsc .ICONURI .EXTERNALMODULEDEPENDENCIES diff --git a/source/Examples/Resources/WSManListener/4-WSManListener_HTTPS_WithThumbprint_Config.ps1 b/source/Examples/Resources/WSManListener/4-WSManListener_HTTPS_WithThumbprint_Config.ps1 index 2c3c61c..2d7eddc 100644 --- a/source/Examples/Resources/WSManListener/4-WSManListener_HTTPS_WithThumbprint_Config.ps1 +++ b/source/Examples/Resources/WSManListener/4-WSManListener_HTTPS_WithThumbprint_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/WSManDsc/blob/master/LICENSE +.LICENSEURI https://github.com/dsccommunity/WSManDsc/blob/main/LICENSE .PROJECTURI https://github.com/dsccommunity/WSManDsc .ICONURI .EXTERNALMODULEDEPENDENCIES diff --git a/source/Examples/Resources/WSManListener/5-WSManListener_HTTPS_WithThumbprintAndHostname_Config.ps1 b/source/Examples/Resources/WSManListener/5-WSManListener_HTTPS_WithThumbprintAndHostname_Config.ps1 index e1f46b5..ab194b3 100644 --- a/source/Examples/Resources/WSManListener/5-WSManListener_HTTPS_WithThumbprintAndHostname_Config.ps1 +++ b/source/Examples/Resources/WSManListener/5-WSManListener_HTTPS_WithThumbprintAndHostname_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/WSManDsc/blob/master/LICENSE +.LICENSEURI https://github.com/dsccommunity/WSManDsc/blob/main/LICENSE .PROJECTURI https://github.com/dsccommunity/WSManDsc .ICONURI .EXTERNALMODULEDEPENDENCIES diff --git a/source/Examples/Resources/WSManServiceConfig/1-WSManServiceConfig_Config.ps1 b/source/Examples/Resources/WSManServiceConfig/1-WSManServiceConfig_Config.ps1 index 48b3820..951905f 100644 --- a/source/Examples/Resources/WSManServiceConfig/1-WSManServiceConfig_Config.ps1 +++ b/source/Examples/Resources/WSManServiceConfig/1-WSManServiceConfig_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/WSManDsc/blob/master/LICENSE +.LICENSEURI https://github.com/dsccommunity/WSManDsc/blob/main/LICENSE .PROJECTURI https://github.com/dsccommunity/WSManDsc .ICONURI .EXTERNALMODULEDEPENDENCIES