Skip to content

Commit 18a6eca

Browse files
gaelcolast3mijcoconnor
authored
Releasing new version with new CI (#50)
* UpdateServicesServer: fix spaces for ClientTargetingMode * UpdateServicesDSC/UpdateServicesServer - Fix Multiple Languages comparison (#38) * (Issue-36) Correct Multiple Language Comparison Ensure that WSUS.Languages is returned as an array of strings to allow multiple languages to be compared correctly in Test-TargetResource * Upgrading to new CI (#49) * first commit after adding new CI, DscResource.Common, updating Localization... * updates to new CI * fixing test and HRQM upgrade * updating shields * fixing annoying cab issue * fixing feedback (I think) Co-authored-by: t3mi <[email protected]> Co-authored-by: John O'Connor <[email protected]>
1 parent e28d2de commit 18a6eca

Some content is hidden

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

45 files changed

+3399
-2136
lines changed

‎.MetaTestOptIn.json‎

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

‎.gitattributes‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
# Needed for publishing of examples, build worker defaults to core.autocrlf=input.
22
* text eol=crlf
3+
4+
# Ensure any exe files are treated as binary
5+
*.exe binary
6+
*.jpg binary
7+
*.xl* binary
8+
*.pfx binary
9+
*.cab binary

‎.github/ISSUE_TEMPLATE/Problem_with_resource.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ about: If you have a problem, bug, or enhancement with a resource in this resour
5454
$PSVersionTable
5555
-->
5656

57-
#### Version of the DSC module that was used ('dev' if using current dev branch)
57+
#### Version of the DSC module that was used
5858
<!--
5959
To help with this information, please run this command:
6060
Get-Module -Name 'SqlServerDsc' -ListAvailable | ft Name,Version,Path

‎.gitignore‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
1-
DSCResource.Tests
1+
output/
2+
3+
**.bak
4+
*.local.*
5+
!**/README.md
6+
.kitchen/
7+
8+
*.suo
9+
*.user
10+
*.coverage
11+
.vs
12+
.psproj
13+
.sln
14+
markdownissues.txt
15+
node_modules
16+
package-lock.json

‎.markdownlint.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"default": true,
3+
"MD029": {
4+
"style": "one"
5+
},
6+
"MD013": true,
7+
"MD024": false,
8+
"MD034": false,
9+
"no-hard-tabs": true
10+
}

‎.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: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,48 @@
11
{
22
"powershell.codeFormatting.openBraceOnSameLine": false,
3-
"powershell.codeFormatting.newLineAfterOpenBrace": false,
3+
"powershell.codeFormatting.newLineAfterOpenBrace": true,
44
"powershell.codeFormatting.newLineAfterCloseBrace": true,
55
"powershell.codeFormatting.whitespaceBeforeOpenBrace": true,
66
"powershell.codeFormatting.whitespaceBeforeOpenParen": true,
77
"powershell.codeFormatting.whitespaceAroundOperator": true,
88
"powershell.codeFormatting.whitespaceAfterSeparator": true,
99
"powershell.codeFormatting.ignoreOneLineBlock": false,
10+
"powershell.codeFormatting.pipelineIndentationStyle": "IncreaseIndentationAfterEveryPipeline",
1011
"powershell.codeFormatting.preset": "Custom",
12+
"powershell.codeFormatting.alignPropertyValuePairs": true,
1113
"files.trimTrailingWhitespace": true,
1214
"files.insertFinalNewline": true,
13-
"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+
"HKLM",
23+
"ICONURI",
24+
"LICENSEURI",
25+
"Msft",
26+
"Oobe",
27+
"Optin",
28+
"PROJECTURI",
29+
"RELEASENOTES",
30+
"Rollup",
31+
"Rollups",
32+
"Sched",
33+
"Wsus",
34+
"buildhelpers",
35+
"endregion",
36+
"gitversion",
37+
"icontains",
38+
"keepachangelog",
39+
"notin",
40+
"notmatch",
41+
"pscmdlet",
42+
"steppable"
43+
],
44+
"[markdown]": {
45+
"files.trimTrailingWhitespace": false,
46+
"files.encoding": "utf8"
47+
}
1448
}

‎.vscode/tasks.json‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
{
2+
"version": "2.0.0",
3+
"_runner": "terminal",
4+
"windows": {
5+
"options": {
6+
"shell": {
7+
"executable": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
8+
"args": [
9+
"-NoProfile",
10+
"-ExecutionPolicy",
11+
"Bypass",
12+
"-Command"
13+
]
14+
}
15+
}
16+
},
17+
"linux": {
18+
"options": {
19+
"shell": {
20+
"executable": "/usr/bin/pwsh",
21+
"args": [
22+
"-NoProfile",
23+
"-Command"
24+
]
25+
}
26+
}
27+
},
28+
"osx": {
29+
"options": {
30+
"shell": {
31+
"executable": "/usr/local/bin/pwsh",
32+
"args": [
33+
"-NoProfile",
34+
"-Command"
35+
]
36+
}
37+
}
38+
},
39+
"tasks": [
40+
{
41+
"label": "build",
42+
"type": "shell",
43+
"command": "&${cwd}/build.ps1",
44+
"args": ["-AutoRestore"],
45+
"presentation": {
46+
"echo": true,
47+
"reveal": "always",
48+
"focus": true,
49+
"panel": "new",
50+
"clear": false
51+
},
52+
"runOptions": {
53+
"runOn": "default"
54+
},
55+
"problemMatcher": [
56+
{
57+
"owner": "powershell",
58+
"fileLocation": [
59+
"absolute"
60+
],
61+
"severity": "error",
62+
"pattern": [
63+
{
64+
"regexp": "^\\s*(\\[-\\]\\s*.*?)(\\d+)ms\\s*$",
65+
"message": 1
66+
},
67+
{
68+
"regexp": "(.*)",
69+
"code": 1
70+
},
71+
{
72+
"regexp": ""
73+
},
74+
{
75+
"regexp": "^.*,\\s*(.*):\\s*line\\s*(\\d+).*",
76+
"file": 1,
77+
"line": 2
78+
}
79+
]
80+
}
81+
]
82+
},
83+
{
84+
"label": "test",
85+
"type": "shell",
86+
"command": "&${cwd}/build.ps1",
87+
"args": ["-AutoRestore","-Tasks","test"],
88+
"presentation": {
89+
"echo": true,
90+
"reveal": "always",
91+
"focus": true,
92+
"panel": "dedicated",
93+
"showReuseMessage": true,
94+
"clear": false
95+
},
96+
"problemMatcher": [
97+
{
98+
"owner": "powershell",
99+
"fileLocation": [
100+
"absolute"
101+
],
102+
"severity": "error",
103+
"pattern": [
104+
{
105+
"regexp": "^\\s*(\\[-\\]\\s*.*?)(\\d+)ms\\s*$",
106+
"message": 1
107+
},
108+
{
109+
"regexp": "(.*)",
110+
"code": 1
111+
},
112+
{
113+
"regexp": ""
114+
},
115+
{
116+
"regexp": "^.*,\\s*(.*):\\s*line\\s*(\\d+).*",
117+
"file": 1,
118+
"line": 2
119+
}
120+
]
121+
}
122+
]
123+
}
124+
]
125+
}

‎CHANGELOG.md‎

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,57 @@
11
# Change log for UpdateServicesDsc
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]
7+
8+
### Changed
49

510
- Update for HQRM standard
6-
- Changes to Project layout
11+
- Changing to new CI pipeline
12+
13+
## [1.1.0.0] - 2019-06-20
14+
15+
### Changed
16+
17+
- Resolve feedback for HQRM
18+
- Accept PR for client side targeting
19+
20+
### Fixed
21+
22+
- Fixed PSSA rule override
23+
24+
## [1.0.75.0] - 2018-03-31
25+
26+
### Changed
27+
28+
- Adjusted PDT to let processes run for up to 3 minutes
29+
30+
## [1.0.74.0] - 2018-03-31
31+
32+
### Fixed
33+
34+
- Test issues
35+
- A number of PSSA rules evolved since the tests were written. Made all corrections.
36+
37+
## [1.0.73.0] - 2018-03-07
38+
39+
### Fixed
40+
41+
- Resolve issues
42+
-* Get was failing during deployment because ReferenceObject was null
743

8-
## 1.0.75.0
44+
## [1.0.72.0] - 2018-03-06
945

10-
- bug fixes
46+
### Added
1147

12-
## 1.0.72.0
48+
- High quality DSC module with the following updates:
49+
- Rename to UpdateServicesDsc
50+
- Fix typo in ReadMe
51+
- Add RunRuleNow param to WSUSApprovalRule resource
52+
- Fix error in WSUSServer resource causing Get- to fail
1353

14-
- First release of UpdateServicesDsc
54+
- Initial release of xWSUS module with coverage for the following areas:
55+
- Managing xWSUS rules for content synchronization.
56+
- Managing xWSUS rules for content cleanup and compression.
57+
- Managing xWSUS service configuration

‎CODE_OF_CONDUCT.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Code of conduct
1+
# Code of Conduct
22

3-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
4-
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
5-
or contact [[email protected]](mailto:[email protected]) with any additional
6-
questions or comments.
3+
This project has adopted the [DSC Community Code of Conduct](https://dsccommunity.org/code_of_conduct).

0 commit comments

Comments
 (0)