Skip to content

Commit e62edd4

Browse files
committed
Merge branch 'logical-functions-ref-docs' of https://github.com/Gijsreyn/operation-methods into logical-functions-ref-docs
2 parents e0d6390 + 07c24d8 commit e62edd4

Some content is hidden

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

64 files changed

+2075
-390
lines changed

archive/registry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ clap = { version = "4.1", features = ["derive"] }
1919
crossterm = { version = "0.26" }
2020
ntreg = { path = "../ntreg" }
2121
ntstatuserror = { path = "../ntstatuserror" }
22-
schemars = { version = "0.8" }
22+
schemars = { version = "1.0" }
2323
serde = { version = "1.0", features = ["derive"] }
2424
serde_json = { version = "1.0", features = ["preserve_order"] }
2525

build.ps1

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ param(
2424
)
2525

2626
$env:RUSTC_LOG=$null
27+
$env:RUSTFLAGS='-Dwarnings'
28+
2729
if ($Verbose) {
2830
$env:RUSTC_LOG='rustc_codegen_ssa::back::link=info'
2931
}
@@ -40,6 +42,7 @@ if ($GetPackageVersion) {
4042
$filesForWindowsPackage = @(
4143
'appx.dsc.extension.json',
4244
'appx-discover.ps1',
45+
'bicep.dsc.extension.json',
4346
'dsc.exe',
4447
'dsc_default.settings.json',
4548
'dsc.settings.json',
@@ -75,6 +78,7 @@ $filesForWindowsPackage = @(
7578
)
7679

7780
$filesForLinuxPackage = @(
81+
'bicep.dsc.extension.json',
7882
'dsc',
7983
'dsc_default.settings.json',
8084
'dsc.settings.json'
@@ -99,6 +103,7 @@ $filesForLinuxPackage = @(
99103
)
100104

101105
$filesForMacPackage = @(
106+
'bicep.dsc.extension.json',
102107
'dsc',
103108
'dsc_default.settings.json',
104109
'dsc.settings.json'
@@ -305,6 +310,7 @@ if (!$SkipBuild) {
305310
"dsc_lib",
306311
"dsc",
307312
"dscecho",
313+
"extensions/bicep",
308314
"osinfo",
309315
"powershell-adapter",
310316
'resources/PSScript',
@@ -313,8 +319,7 @@ if (!$SkipBuild) {
313319
"sshdconfig",
314320
"tools/dsctest",
315321
"tools/test_group_resource",
316-
"y2j",
317-
"."
322+
"y2j"
318323
)
319324
$pedantic_unclean_projects = @()
320325
$clippy_unclean_projects = @("tree-sitter-dscexpression", "tree-sitter-ssh-server-config")
@@ -564,7 +569,11 @@ if ($Test) {
564569
(Get-Module -Name Pester -ListAvailable).Path
565570
}
566571

567-
Invoke-Pester -ErrorAction Stop
572+
try {
573+
Invoke-Pester -ErrorAction Stop
574+
} catch {
575+
throw "Pester had unexpected error: $($_.Exception.Message)"
576+
}
568577
}
569578

570579
function Find-MakeAppx() {

docs/reference/resources/Microsoft/DSC/Transitional/RunCommandOnSet/examples/run-powershell-command.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dsc config set --input $document
7070
To verify the result, you can run the `winget.exe` command:
7171

7272
```powershell
73-
winget list --id Microsoft.PowerShell
73+
winget list --id Microsoft.PowerShell.Preview
7474
```
7575

7676
<!-- Link reference definitions -->

docs/reference/resources/Microsoft/Windows/WindowsPowerShell/examples/manage-a-windows-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ differingProperties:
4040
- StartupType
4141
```
4242
43-
The `inDesiredState` field of the result object is set to `false`, indicating that the instance isn't in the desired state. The `differingProperties` field indicates that the `property` property is mismatched between the desired state and actual state.
43+
The `inDesiredState` field of the result object is set to `false`, indicating that the instance isn't in the desired state. The `differingProperties` field indicates that the `StartupType` property is mismatched between the desired state and actual state.
4444

4545
## Ensure a service is running with automatic startup
4646

docs/reference/schemas/config/functions/reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ resources:
5151
- name: Echo bitness
5252
type: Microsoft.DSC.Debug/Echo
5353
properties:
54-
output: "[reference(resourceId('Microsoft/OSInfo', 'System')).actualState.bitness]"
54+
output: "[reference(resourceId('Microsoft/OSInfo', 'System')).bitness]"
5555
dependsOn:
5656
- "[resourceId('Microsoft/OSInfo', 'System')]"
5757
```
5858
5959
```bash
60-
dsc config get --file reference.example.1.dsc.config.yaml config get
60+
dsc config get --file reference.example.1.dsc.config.yaml
6161
```
6262

6363
```yaml

dsc/Cargo.lock

Lines changed: 14 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dsc/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dsc"
3-
version = "3.2.0-preview.2"
3+
version = "3.2.0-preview.3"
44
edition = "2021"
55

66
[profile.release]
@@ -23,12 +23,12 @@ jsonschema = { version = "0.30", default-features = false }
2323
path-absolutize = { version = "3.1" }
2424
regex = "1.11"
2525
rust-i18n = { version = "3.1" }
26-
schemars = { version = "0.8" }
26+
schemars = { version = "1.0" }
2727
serde = { version = "1.0", features = ["derive"] }
2828
serde_json = { version = "1.0", features = ["preserve_order"] }
2929
serde_yaml = { version = "0.9" }
3030
syntect = { version = "5.0", features = ["default-fancy"], default-features = false }
31-
sysinfo = { version = "0.35" }
31+
sysinfo = { version = "0.36" }
3232
thiserror = "2.0"
3333
tracing = { version = "0.1" }
3434
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }

dsc/examples/bicepconfig.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"experimentalFeaturesEnabled": {
3+
"desiredStateConfiguration": true
4+
}
5+
}

dsc/examples/hello_world.dsc.bicep

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// This is a very simple example Bicep file for testing
2+
3+
targetScope = 'desiredStateConfiguration'
4+
5+
// use workaround where Bicep currently requires version in date format
6+
resource echo 'Microsoft.DSC.Debug/Echo@2025-01-01' = {
7+
name: 'exampleEcho'
8+
properties: {
9+
output: 'Hello, world!'
10+
}
11+
}

dsc/src/args.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ pub enum SchemaType {
280280
TestResult,
281281
ResolveResult,
282282
DscResource,
283+
Resource,
283284
ResourceManifest,
284285
Include,
285286
Configuration,

0 commit comments

Comments
 (0)