Skip to content

Commit 51e2ddf

Browse files
authored
Merge branch 'PowerShell:main' into main
2 parents ddf9b76 + a4bce18 commit 51e2ddf

File tree

67 files changed

+2133
-783
lines changed

Some content is hidden

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

67 files changed

+2133
-783
lines changed

archive/registry/registry.dsc.resource.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,36 @@
1111
"executable": "registry",
1212
"args": [
1313
"config",
14-
"get"
15-
],
16-
"input": "stdin"
14+
"get",
15+
{
16+
"jsonInputArg": "--input",
17+
"mandatory": true
18+
}
19+
]
1720
},
1821
"set": {
1922
"executable": "registry",
2023
"args": [
2124
"config",
22-
"set"
25+
"set",
26+
{
27+
"jsonInputArg": "--input",
28+
"mandatory": true
29+
}
2330
],
24-
"input": "stdin",
2531
"implementsPretest": true,
2632
"return": "state"
2733
},
2834
"test": {
2935
"executable": "registry",
3036
"args": [
3137
"config",
32-
"test"
38+
"test",
39+
{
40+
"jsonInputArg": "--input",
41+
"mandatory": true
42+
}
3343
],
34-
"input": "stdin",
3544
"return": "state"
3645
},
3746
"exitCodes": {

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

0 commit comments

Comments
 (0)