Skip to content

Commit 2e8d3e3

Browse files
authored
Merge pull request #42 from PlagueHO/Issue-41
BREAKING CHANGE: Update to new CI Pipeline - Fixes #41
2 parents 8d1dfdc + bc9fc17 commit 2e8d3e3

60 files changed

Lines changed: 1825 additions & 992 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.MetaTestOptIn.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

.codecov.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.gitattributes

Lines changed: 5 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,8 @@
33
###############################################################################
44
* text eol=crlf
55

6-
###############################################################################
7-
# Set default behavior for command prompt diff.
8-
#
9-
# This is need for earlier builds of msysgit that does not have it on by
10-
# default for csharp files.
11-
# Note: This is only used by command line
12-
###############################################################################
13-
#*.cs diff=csharp
14-
15-
###############################################################################
16-
# Set the merge driver for project and solution files
17-
#
18-
# Merging from the command prompt will add diff markers to the files if there
19-
# are conflicts (Merging from VS is not affected by the settings below, in VS
20-
# the diff markers are never inserted). Diff markers may cause the following
21-
# file extensions to fail to load in VS. An alternative would be to treat
22-
# these files as binary and thus will always conflict and require user
23-
# intervention with every merge. To do so, just uncomment the entries below
24-
###############################################################################
25-
#*.sln merge=binary
26-
#*.csproj merge=binary
27-
#*.vbproj merge=binary
28-
#*.vcxproj merge=binary
29-
#*.vcproj merge=binary
30-
#*.dbproj merge=binary
31-
#*.fsproj merge=binary
32-
#*.lsproj merge=binary
33-
#*.wixproj merge=binary
34-
#*.modelproj merge=binary
35-
#*.sqlproj merge=binary
36-
#*.wwaproj merge=binary
37-
38-
###############################################################################
39-
# behavior for image files
40-
#
41-
# image files are treated as binary by default.
42-
###############################################################################
43-
*.jpg binary
44-
*.png binary
45-
*.gif binary
46-
*.exe binary
47-
48-
###############################################################################
49-
# diff behavior for common document formats
50-
#
51-
# Convert binary document formats to text before diffing them. This feature
52-
# is only available from the command line. Turn it on by uncommenting the
53-
# entries below.
54-
###############################################################################
55-
#*.doc diff=astextplain
56-
#*.DOC diff=astextplain
57-
#*.docx diff=astextplain
58-
#*.DOCX diff=astextplain
59-
#*.dot diff=astextplain
60-
#*.DOT diff=astextplain
61-
#*.pdf diff=astextplain
62-
#*.PDF diff=astextplain
63-
#*.rtf diff=astextplain
64-
#*.RTF diff=astextplain
6+
# Ensure any exe files are treated as binary
7+
*.exe binary
8+
*.jpg binary
9+
*.xl* binary
10+
*.pfx binary

.gitignore

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
*.user
33
*.coverage
44
.vs
5+
.vscode
56
.psproj
67
.sln
7-
DscResource.Tests
8-
DscResource.Tests/*
9-
Modules/xNetworking/DscResource.Tests
10-
Modules/xNetworking/DscResource.Tests/*
11-
node_modules
12-
node_modules/*
138
markdownissues.txt
149
TestResults.xml
15-
launch.json
10+
output/

.vscode/analyzersettings.psd1

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
@{
2-
<#
3-
For the custom rules to work, the DscResource.Tests repo must be
4-
cloned. It is automatically clone as soon as any unit or
5-
integration tests are run.
6-
#>
7-
CustomRulePath = '.\DSCResource.Tests\DscResource.AnalyzerRules'
8-
2+
CustomRulePath = '.\output\RequiredModules\DscResource.AnalyzerRules'
3+
includeDefaultRules = $true
94
IncludeRules = @(
105
# DSC Resource Kit style guideline rules.
116
'PSAvoidDefaultValueForMandatoryParameter',
@@ -43,11 +38,7 @@
4338
'PSUseDeclaredVarsMoreThanAssignments',
4439
'PSUsePSCredentialType',
4540

46-
<#
47-
This is to test all the DSC Resource Kit custom rules.
48-
The name of the function-blocks of each custom rule start
49-
with 'Measure*'.
50-
#>
5141
'Measure-*'
5242
)
43+
5344
}

.vscode/settings.json

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,38 @@
1-
// Place your settings in this file to overwrite default and user settings.
21
{
32
"powershell.codeFormatting.openBraceOnSameLine": false,
4-
"powershell.codeFormatting.newLineAfterOpenBrace": false,
3+
"powershell.codeFormatting.newLineAfterOpenBrace": true,
54
"powershell.codeFormatting.newLineAfterCloseBrace": true,
65
"powershell.codeFormatting.whitespaceBeforeOpenBrace": true,
76
"powershell.codeFormatting.whitespaceBeforeOpenParen": true,
87
"powershell.codeFormatting.whitespaceAroundOperator": true,
98
"powershell.codeFormatting.whitespaceAfterSeparator": true,
109
"powershell.codeFormatting.ignoreOneLineBlock": false,
10+
"powershell.codeFormatting.pipelineIndentationStyle": "IncreaseIndentationAfterEveryPipeline",
1111
"powershell.codeFormatting.preset": "Custom",
12+
"powershell.codeFormatting.alignPropertyValuePairs": true,
1213
"files.trimTrailingWhitespace": true,
1314
"files.insertFinalNewline": true,
14-
"powershell.scriptAnalysis.settingsPath": ".vscode\\analyzersettings.psd1"
15+
"powershell.scriptAnalysis.settingsPath": ".vscode\\analyzersettings.psd1",
16+
"powershell.scriptAnalysis.enable": true,
17+
"files.associations": {
18+
"*.ps1xml": "xml"
19+
},
20+
"cSpell.words": [
21+
"COMPANYNAME",
22+
"ICONURI",
23+
"LICENSEURI",
24+
"PROJECTURI",
25+
"RELEASENOTES",
26+
"buildhelpers",
27+
"endregion",
28+
"gitversion",
29+
"icontains",
30+
"keepachangelog",
31+
"notin",
32+
"pscmdlet",
33+
"steppable"
34+
],
35+
"[markdown]": {
36+
"files.encoding": "utf8"
37+
}
1538
}

CHANGELOG.md

Lines changed: 8 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,12 @@
1-
# Versions
1+
# Change log for FileContentDsc
22

3-
## Unreleased
3+
The format is based on and uses the types of changes according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
5+
6+
## [Unreleased]
47

58
- Transferred ownership to DSCCommunity.org -
69
fixes [Issue #31](https://github.com/dsccommunity/FileContentDsc/issues/39).
7-
8-
## 1.3.0.0
9-
10-
- Opted into Common Tests 'Common Tests - Validate Localization' -
11-
fixes [Issue #31](https://github.com/PlagueHO/FileContentDsc/issues/32).
12-
- Combined all `FileContent.ResourceHelper` module functions into
13-
`FileContent.Common` module - fixes [Issue #32](https://github.com/PlagueHO/FileContentDsc/issues/32).
14-
- Renamed all localization strings so that they are detected by
15-
'Common Tests - Validate Localization'.
16-
- Correct style violations in unit tests:
17-
- Adding `Get`, `Set` and `Test` tags to appropriate `describe` blocks.
18-
- Removing uneccesary `#region` blocks.
19-
- Conversion of double quotes to single quotes where possible.
20-
- Replace variables with string litterals in `describe` block description.
21-
- KeyValuePairFile:
22-
- Improve unit tests to simplify and cover additional test cases.
23-
- Fix error occuring when file is empty or does not exist - fixes [Issue #34](https://github.com/PlagueHO/FileContentDsc/issues/34).
24-
25-
## 1.2.0.0
26-
27-
- Added .VSCode settings for applying DSC PSSA rules - fixes [Issue #25](https://github.com/PlagueHO/FileContentDsc/issues/25).
28-
- Added an Encoding parameter to the KeyValuePairFile and ReplaceText
29-
resources - fixes [Issue #5](https://github.com/PlagueHO/FileContentDsc/issues/5).
30-
31-
## 1.1.0.0
32-
33-
- Enabled PSSA rule violations to fail build - Fixes [Issue #6](https://github.com/PlagueHO/FileContentDsc/issues/6).
34-
- Updated tests to meet Pester v4 standard.
35-
- Added Open Code of Conduct.
36-
- Refactored module folder structure to move resource
37-
to root folder of repository and remove test harness - Fixes [Issue #11](https://github.com/PlagueHO/FileContentDsc/issues/11).
38-
- Converted Examples to support format for publishing to PowerShell
39-
Gallery.
40-
- Refactor Test-TargetResource to return $false in all DSC resource - Fixes
41-
[Issue #12](https://github.com/PlagueHO/FileContentDsc/issues/13).
42-
- Correct configuration names in Examples - fixes [Issue #15](https://github.com/PowerShell/FileContentDsc/issues/15).
43-
- Refactor Test/Set-TargetResource in ReplaceText to be able to add a key if it
44-
doesn't exist but should -Fixes
45-
[Issue#20](https://github.com/PlagueHO/FileContentDsc/issues/20).
46-
- Opted into common tests:
47-
- Common Tests - Validate Example Files To Be Published
48-
- Common Tests - Validate Markdown Links
49-
- Common Tests - Relative Path Length
50-
- Common Tests - Relative Path Length
51-
- Correct test context description in IniSettingsFile tests to include 'When'.
52-
- Change IniSettingsFile unit tests to be non-destructive - fixes [Issue #22](https://github.com/PowerShell/FileContentDsc/issues/22).
53-
- Update to new format LICENSE.
54-
55-
## 1.0.0.0
56-
57-
- DSR_ReplaceText:
58-
- Created new resource for replacing text in text files.
59-
- DSR_KeyValuePairFile:
60-
- Created new resource for setting key value pairs in text files.
61-
- DSR_IniSettingsFile:
62-
- Created new resource for setting Windows INI file settings.
10+
- BREAKING CHANGE: Changed resource prefix from MSFT to DSC.
11+
- Updated to use continuous delivery pattern using Azure DevOps - fixes
12+
[Issue #41](https://github.com/dsccommunity/FileContentDsc/issues/41).

0 commit comments

Comments
 (0)