Skip to content

Commit 8987eac

Browse files
Merge branch 'main' into develop
Signed-off-by: Rob Sewell <mrrobsewell@outlook.com>
2 parents 137f301 + 4f6a395 commit 8987eac

File tree

6 files changed

+8
-21
lines changed

6 files changed

+8
-21
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
2424
After the description, please concisely list the changes as per keepachangelog.com
2525
This **should** duplicate what you've updated in the changelog file.
26-
26+
2727
for example:
2828
2929
### Added
@@ -59,3 +59,5 @@
5959
- [ ] Unit tests added/updated..
6060
- [ ] Integration tests added/updated (where possible).
6161
- [ ] Documentation added/updated (where applicable).
62+
ed code adheres to [DSC Resource Style Guidelines](https://github.com/PowerShell/DscResources/blob/master/StyleGuidelines.md) and [Best Practices](https://github.com/PowerShell/DscResources/blob/master/BestPractices.md).
63+

CHANGELOG.md

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,7 @@ For a full list of changes and details, please see the commit history.
5656

5757
### Added
5858

59-
- For new features.
60-
61-
### Changed
62-
63-
- For changes in existing functionality.
64-
65-
### Deprecated
66-
67-
- For soon-to-be removed features.
68-
69-
### Removed
70-
71-
- For now removed features.
72-
73-
### Fixed
74-
75-
- For any bug fix.
76-
7759
### Security
7860

7961
- In case of vulnerabilities.
62+

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ The workflow for using this and developing the code is shown below.
8383
```PowerShell
8484
./build.ps1 -Tasks build,test
8585
```
86-
8786
8. Once you are ready to submit your changes for review please ensure that you update the `CHANGELOG.md` file with a summary of your changes. This is important as it helps us keep track of what has changed in the module and makes it easier for users to see what has been added or changed.
8887

8988
You can use the [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format for this.

build.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ BuildWorkflow:
8080
- publish_module_to_gallery
8181
# - Create_Changelog_Branch
8282

83+
8384
####################################################
8485
# PESTER Configuration #
8586
####################################################
@@ -120,7 +121,6 @@ Pester:
120121
#CodeCoverageFilePattern: JaCoCo_Merge.xml # the pattern used to search all pipeline test job artifacts
121122
#CodeCoverageMergedOutputFile: JaCoCo_coverage.xml # the file that is created for the merged code coverage
122123

123-
124124
# Import ModuleBuilder tasks from a specific PowerShell module using the build
125125
# task's alias. Wildcard * can be used to specify all tasks that has a similar
126126
# prefix and or suffix. The module contain the task must be added as a required
@@ -157,3 +157,4 @@ ChangelogConfig:
157157
GitConfig:
158158
UserName: Automation Bot
159159
UserEmail: automation_bot@fabrictools.io
160+

source/FabricTools.psd1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,4 @@ PrivateData = @{
137137
# DefaultCommandPrefix = ''
138138

139139
}
140+

source/Public/Capacity/Get-FabricCapacities.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,4 @@ function Get-FabricCapacities {
7272
# Return the results
7373
return $res
7474
}
75+

0 commit comments

Comments
 (0)