From 6a586386a00edbff40afd10949e86334e7e15571 Mon Sep 17 00:00:00 2001
From: Johan Ljunggren <johan.ljunggren@shamn.se>
Date: Thu, 9 Apr 2020 15:45:33 +0200
Subject: [PATCH 1/3] Fix regular expression for bumping version (issue #588)

---
 CHANGELOG.md   | 5 +++++
 GitVersion.yml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 789dedf4c..e8d6f2984 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
 
 ### Fixed
 
+- ActiveDirectoryDsc
+  - The regular expression for `minor-version-bump-message` in the file
+    `GitVersion.yml` was changed to only raise minor version when the
+    commit message contain the word `add`, `adds`, `minor`, `feature`,
+    or `features`.
 - ADDomain
   - Added additional Get-ADDomain retry exceptions
     ([issue #581](https://github.com/dsccommunity/ActiveDirectoryDsc/issues/581)).
diff --git a/GitVersion.yml b/GitVersion.yml
index 044aebb2d..4d5e366fb 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,7 +1,7 @@
 mode: ContinuousDelivery
 next-version: 5.0.0
 major-version-bump-message: '\s?(breaking|major|breaking\schange)'
-minor-version-bump-message: '\s?(add|feature|minor)'
+minor-version-bump-message: '(adds?|features?|minor)\b'
 patch-version-bump-message: '\s?(fix|patch)'
 no-bump-message: '\+semver:\s?(none|skip)'
 assembly-informational-format: '{NuGetVersionV2}+Sha.{Sha}.Date.{CommitDate}'

From a549f79225dc5b0f1374bcded34532953abbc2a2 Mon Sep 17 00:00:00 2001
From: Johan Ljunggren <johan.ljunggren@shamn.se>
Date: Thu, 9 Apr 2020 15:50:11 +0200
Subject: [PATCH 2/3] Only run CI pipeline on changes to files in source

---
 CHANGELOG.md        | 4 ++--
 azure-pipelines.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8d6f2984..417ffce71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,8 +21,8 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
 ### Changed
 
 - ActiveDirectoryDsc
-  - When merging a commit with changes only to CHANGELOG.md the CI pipeline
-    will not run.
+  - Only run CI pipeline on branch `master` when there are changes to files
+    inside the `source` folder.
 
 ### Fixed
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7d8e3bec3..29c74963a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,8 +3,8 @@ trigger:
     include:
     - master
   paths:
-    exclude:
-    - CHANGELOG.md
+    include:
+    - source/*
   tags:
     include:
     - "v*"

From 8773e49b0bdf5adaa9c08a9471cbc638aeaf550a Mon Sep 17 00:00:00 2001
From: Johan Ljunggren <johan.ljunggren@shamn.se>
Date: Thu, 9 Apr 2020 16:24:41 +0200
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 417ffce71..021e6d33d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
   - The regular expression for `minor-version-bump-message` in the file
     `GitVersion.yml` was changed to only raise minor version when the
     commit message contain the word `add`, `adds`, `minor`, `feature`,
-    or `features`.
+    or `features` ([issue #588](https://github.com/dsccommunity/ActiveDirectoryDsc/issues/588)).
 - ADDomain
   - Added additional Get-ADDomain retry exceptions
     ([issue #581](https://github.com/dsccommunity/ActiveDirectoryDsc/issues/581)).