Merge branch 'main' into winget-manifest-uploader

Author: Gijsreyn

archive/registry/Cargo.toml

@@ -19,7 +19,7 @@ clap = { version = "4.1", features = ["derive"] }
 crossterm = { version = "0.26" }
 ntreg = { path = "../ntreg" }
 ntstatuserror = { path = "../ntstatuserror" }
-schemars = { version = "0.8" }
+schemars = { version = "1.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 

build.ps1

@@ -27,6 +27,8 @@ param(
 )
 
 $env:RUSTC_LOG=$null
+$env:RUSTFLAGS='-Dwarnings'
+
 if ($Verbose) {
     $env:RUSTC_LOG='rustc_codegen_ssa::back::link=info'
 }
@@ -43,6 +45,7 @@ if ($GetPackageVersion) {
 $filesForWindowsPackage = @(
     'appx.dsc.extension.json',
     'appx-discover.ps1',
+    'bicep.dsc.extension.json',
     'dsc.exe',
     'dsc_default.settings.json',
     'dsc.settings.json',
@@ -78,6 +81,7 @@ $filesForWindowsPackage = @(
 )
 
 $filesForLinuxPackage = @(
+    'bicep.dsc.extension.json',
     'dsc',
     'dsc_default.settings.json',
     'dsc.settings.json'
@@ -102,6 +106,7 @@ $filesForLinuxPackage = @(
 )
 
 $filesForMacPackage = @(
+    'bicep.dsc.extension.json',
     'dsc',
     'dsc_default.settings.json',
     'dsc.settings.json'
@@ -304,6 +309,7 @@ if (!$SkipBuild) {
         "dsc_lib",
         "dsc",
         "dscecho",
+        "extensions/bicep",
         "osinfo",
         "powershell-adapter",
         'resources/PSScript',
@@ -312,8 +318,7 @@ if (!$SkipBuild) {
         "sshdconfig",
         "tools/dsctest",
         "tools/test_group_resource",
-        "y2j",
-        "."
+        "y2j"
     )
     $pedantic_unclean_projects = @()
     $clippy_unclean_projects = @("tree-sitter-dscexpression", "tree-sitter-ssh-server-config")
@@ -553,7 +558,11 @@ if ($Test) {
         (Get-Module -Name Pester -ListAvailable).Path
     }
 
-    Invoke-Pester -ErrorAction Stop
+    try {
+        Invoke-Pester -ErrorAction Stop
+    } catch {
+        throw "Pester had unexpected error: $($_.Exception.Message)"
+    }
 }
 
 function Find-MakeAppx() {

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

@@ -70,7 +70,7 @@ dsc config set --input $document
 To verify the result, you can run the `winget.exe` command:
 
 ```powershell
-winget list --id Microsoft.PowerShell
+winget list --id Microsoft.PowerShell.Preview
 ```
 
 <!-- Link reference definitions -->

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

@@ -40,7 +40,7 @@ differingProperties:
 - StartupType
 ```
 
-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.
+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.
 
 ## Ensure a service is running with automatic startup
 

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

@@ -51,13 +51,13 @@ resources:
 - name: Echo bitness
   type: Microsoft.DSC.Debug/Echo
   properties:
-    output: "[reference(resourceId('Microsoft/OSInfo', 'System')).actualState.bitness]"
+    output: "[reference(resourceId('Microsoft/OSInfo', 'System')).bitness]"
   dependsOn:
   - "[resourceId('Microsoft/OSInfo', 'System')]"
 ```
 
 ```bash
-dsc config get --file reference.example.1.dsc.config.yaml config get
+dsc config get --file reference.example.1.dsc.config.yaml
 ```
 
 ```yaml

dsc/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.2.0-preview.2"
+version = "3.2.0-preview.3"
 edition = "2021"
 
 [profile.release]
@@ -23,12 +23,12 @@ jsonschema = { version = "0.30", default-features = false }
 path-absolutize = { version = "3.1" }
 regex = "1.11"
 rust-i18n = { version = "3.1" }
-schemars = { version = "0.8" }
+schemars = { version = "1.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde_yaml = { version = "0.9" }
 syntect = { version = "5.0", features = ["default-fancy"], default-features = false }
-sysinfo = { version = "0.35" }
+sysinfo = { version = "0.36" }
 thiserror = "2.0"
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }

dsc/Cargo.toml

@@ -0,0 +1,5 @@
+{
+  "experimentalFeaturesEnabled": {
+    "desiredStateConfiguration": true
+  }
+}

dsc/examples/bicepconfig.json

@@ -0,0 +1,11 @@
+// This is a very simple example Bicep file for testing
+
+targetScope = 'desiredStateConfiguration'
+
+// use workaround where Bicep currently requires version in date format
+resource echo 'Microsoft.DSC.Debug/Echo@2025-01-01' = {
+  name: 'exampleEcho'
+  properties: {
+    output: 'Hello, world!'
+  }
+}

dsc/examples/hello_world.dsc.bicep

@@ -280,6 +280,7 @@ pub enum SchemaType {
     TestResult,
     ResolveResult,
     DscResource,
+    Resource,
     ResourceManifest,
     Include,
     Configuration,