Skip to content

Commit ab73e75

Browse files
authored
Merge pull request #606 from SteveL-MSFT/dscecho-i18n
Make `dscecho` resource internationalization compliant and add `osinfo` resource to package
2 parents 47f2245 + 6e3bdf5 commit ab73e75

File tree

7 files changed

+469
-92
lines changed

7 files changed

+469
-92
lines changed

build.ps1

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,15 @@ if ($GetPackageVersion) {
3030

3131
$filesForWindowsPackage = @(
3232
'dsc.exe',
33+
'dsc_default.settings.json',
34+
'dsc.settings.json',
3335
'dscecho.exe',
3436
'echo.dsc.resource.json',
3537
'assertion.dsc.resource.json',
3638
'group.dsc.resource.json',
3739
'NOTICE.txt',
40+
'osinfo.exe',
41+
'osinfo.dsc.resource.json',
3842
'powershell.dsc.resource.json',
3943
'psDscAdapter/',
4044
'reboot_pending.dsc.resource.json',
@@ -48,42 +52,44 @@ $filesForWindowsPackage = @(
4852
'wmi.resource.ps1',
4953
'windows_baseline.dsc.yaml',
5054
'windows_inventory.dsc.yaml'
51-
'dsc_default.settings.json',
52-
'dsc.settings.json'
5355
)
5456

5557
$filesForLinuxPackage = @(
5658
'dsc',
59+
'dsc_default.settings.json',
60+
'dsc.settings.json'
5761
'dscecho',
5862
'echo.dsc.resource.json',
5963
'assertion.dsc.resource.json',
6064
'apt.dsc.resource.json',
6165
'apt.dsc.resource.sh',
6266
'group.dsc.resource.json',
6367
'NOTICE.txt',
68+
'osinfo',
69+
'osinfo.dsc.resource.json',
6470
'powershell.dsc.resource.json',
6571
'psDscAdapter/',
6672
'RunCommandOnSet.dsc.resource.json',
67-
'runcommandonset',
68-
'dsc_default.settings.json',
69-
'dsc.settings.json'
73+
'runcommandonset'
7074
)
7175

7276
$filesForMacPackage = @(
7377
'dsc',
78+
'dsc_default.settings.json',
79+
'dsc.settings.json'
7480
'dscecho',
7581
'echo.dsc.resource.json',
7682
'assertion.dsc.resource.json',
7783
'brew.dsc.resource.json',
7884
'brew.dsc.resource.sh',
7985
'group.dsc.resource.json',
8086
'NOTICE.txt',
87+
'osinfo',
88+
'osinfo.dsc.resource.json',
8189
'powershell.dsc.resource.json',
8290
'psDscAdapter/',
8391
'RunCommandOnSet.dsc.resource.json',
84-
'runcommandonset',
85-
'dsc_default.settings.json',
86-
'dsc.settings.json'
92+
'runcommandonset'
8793
)
8894

8995
# the list of files other than the binaries which need to be executable

dsc/parallel.dsc.resource.json

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

dsc/tests/dsc_resource_list.tests.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Describe 'Tests for listing resources' {
99
$resources.Count | Should -BeGreaterThan 0
1010
$resources.type | Should -Contain 'Microsoft.DSC/Assertion'
1111
$resources.type | Should -Contain 'Microsoft.DSC/Group'
12-
$resources.type | Should -Contain 'Microsoft.DSC/Parallel'
1312
$resources.type | Should -Contain 'Microsoft/OSInfo'
1413
($resources | Where-Object { $_.type -eq 'Microsoft.DSC/Group' }).Kind | Should -BeExactly 'Group'
1514
($resources | Where-Object { $_.type -eq 'Microsoft/OSInfo' }).Kind | Should -BeExactly 'Resource'

0 commit comments

Comments
 (0)