Skip to content

Commit db9b259

Browse files
authored
Feature/common tasks (#204)
* Remove DscResource.Demo and FileSystemDsc modules * Update module versions in RequiredModules.psd1 * Refactor .gitignore to simplify output exclusions and include build logs * Update Sampler.DscPipeline to include CommonTasks module and remove DscConfig.Demo * Rename FileSystemObjects to FilesAndFolders across multiple YAML configuration files * Update CHANGELOG.md to reflect migration to CommonTasks module and related updates
1 parent d0c59fc commit db9b259

91 files changed

Lines changed: 56 additions & 8905 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.

.gitignore

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
**/testResults.xml
22

3-
!output/
4-
5-
output/*
6-
!output/RequiredModules
7-
8-
output/RequiredModules/*
9-
10-
!output/RequiredModules/FileSystemDsc
11-
!output/RequiredModules/DscConfig.Demo
3+
output
4+
.vscode/build-logs/

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
- Migrated from `DscConfig.Demo` to `CommonTasks` composite resource module.
15+
Updated `build.yaml`, `RequiredModules.psd1`, all Datum configuration data,
16+
and `DependsOn` references to match the resource names used by `CommonTasks`
17+
(e.g. `FilesAndFolders` replaces `FileSystemObjects`).
1418
- Updated all modules in the [RequiredModules.psd1](./RequiredModules.psd1).
1519
- Updated DscBuildHelpers to 0.3.0.
1620
- Updated Datum to 0.41.0.

RequiredModules.psd1

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
}
1010

1111
'powershell-yaml' = '0.4.12'
12-
InvokeBuild = '5.14.22'
12+
InvokeBuild = '5.14.23'
1313
PSScriptAnalyzer = '1.24.0'
1414
Pester = '5.7.1'
1515
Plaster = '1.1.4'
1616
ModuleBuilder = '3.1.8'
1717
ChangelogManagement = '3.1.0'
18-
Sampler = '0.118.3'
18+
Sampler = '0.119.1'
1919
'Sampler.GitHubTasks' = '0.3.5-preview0002'
2020
'Sampler.AzureDevOpsTasks' = '0.1.2'
2121
PowerShellForGitHub = '0.17.0'
@@ -26,32 +26,33 @@
2626
Datum = '0.41.0'
2727
ProtectedData = '5.0.0'
2828
'Datum.ProtectedData' = '0.0.1'
29-
'Datum.InvokeCommand' = '0.3.0'
29+
'Datum.InvokeCommand' = '0.4.1'
3030
Configuration = '1.6.0'
3131
Metadata = '1.5.7'
3232
xDscResourceDesigner = '1.13.0.0'
33-
'DscResource.Test' = '0.18.0'
33+
'DscResource.Test' = '0.19.0'
3434
'DscResource.DocGenerator' = '0.13.0'
35-
PSDesiredStateConfiguration = '2.0.7'
35+
PSDesiredStateConfiguration = '2.0.8'
36+
PowerShellGet = '2.2.5'
3637
GuestConfiguration = '4.11.0'
3738

38-
'Az.Accounts' = '4.0.2'
39-
'Az.Storage' = '8.2.0'
40-
'Az.ManagedServiceIdentity' = '1.3.0'
41-
'Az.Resources' = '7.9.0'
42-
'Az.PolicyInsights' = '1.7.1'
43-
'Az.Compute' = '9.1.0'
39+
'Az.Accounts' = '5.3.3'
40+
'Az.Storage' = '9.6.0'
41+
'Az.ManagedServiceIdentity' = '2.0.0'
42+
'Az.Resources' = '9.0.3'
43+
'Az.PolicyInsights' = '1.7.3'
44+
'Az.Compute' = '11.4.0'
4445

4546
# Composites
46-
#'DscConfig.Demo' = '0.8.3'
47+
CommonTasks = 'latest'
4748

4849
#DSC Resources
4950
xPSDesiredStateConfiguration = '9.2.1'
5051
ComputerManagementDsc = '10.0.0'
5152
NetworkingDsc = '9.1.0'
5253
JeaDsc = '4.0.0-preview0005'
5354
WebAdministrationDsc = '4.2.1'
54-
#FileSystemDsc = '1.1.1'
55+
FileSystemDsc = '1.1.1'
5556
SecurityPolicyDsc = '2.10.0.0'
5657
xDscDiagnostics = '2.8.0'
5758

build.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ TaskHeader: |
140140
Sampler.DscPipeline:
141141
DscCompositeResourceModules:
142142
- PSDesiredStateConfiguration
143-
- DscConfig.Demo
144-
#- Name: CommonTasks
145-
# Version: 0.3.259
143+
- CommonTasks
146144

147145
####################################################
148146
# Setting Sampler PSModulePath #

output/RequiredModules/DscConfig.Demo/0.8.3/DSCResources/ComputerSettings/ComputerSettings.psd1

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

output/RequiredModules/DscConfig.Demo/0.8.3/DSCResources/ComputerSettings/ComputerSettings.schema.psm1

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

output/RequiredModules/DscConfig.Demo/0.8.3/DSCResources/ConfigurationBase/ConfigurationBase.psd1

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

output/RequiredModules/DscConfig.Demo/0.8.3/DSCResources/ConfigurationBase/ConfigurationBase.schema.psm1

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

output/RequiredModules/DscConfig.Demo/0.8.3/DSCResources/DscDiagnostic/DscDiagnostic.psd1

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

0 commit comments

Comments
 (0)