Merge branch 'main' into docs/main/v3-reference

Author: SteveL-MSFT

.config/tsaoptions.json

@@ -3,7 +3,7 @@
     "projectName": "One",
     "areaPath": "One\\MGMT\\Compute\\PowerShell Desired State Configuration",
     "notificationAliases": [
-        "anmenaga@microsoft.com",
+        "tessgauthier@microsoft.com",
         "[email protected]"
     ]
 }

.pipelines/DSC-Official.yml

@@ -207,7 +207,7 @@ extends:
             apt -y install gcc-multilib
             apt -y install libssl-dev
             apt -y install pkg-config
-            rustup default stable-aarch64-unknown-linux-musl
+            msrustup default stable-aarch64-unknown-linux-musl
             if ((openssl version -d) -match 'OPENSSLDIR: "(?<dir>.*?)"') {
               $env:OPENSSL_LIB_DIR = $matches['dir']
             }

build.ps1

@@ -124,14 +124,14 @@ function Find-LinkExe {
 }
 
 $channel = 'stable'
-if ($null -ne (Get-Command rustup -ErrorAction Ignore)) {
-    $rustup = 'rustup'
-} elseif ($null -ne (Get-Command msrustup -ErrorAction Ignore)) {
+if ($null -ne (Get-Command msrustup -CommandType Application -ErrorAction Ignore)) {
     $rustup = 'msrustup'
     $channel = 'ms-stable'
     if ($architecture -eq 'current') {
         $env:MSRUSTUP_TOOLCHAIN = "$architecture"
     }
+} elseif ($null -ne (Get-Command rustup -CommandType Application -ErrorAction Ignore)) {
+        $rustup = 'rustup'
 } else {
     $rustup = 'echo'
 }

dsc/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.1.0-preview.2"
+version = "3.1.0-preview.3"
 edition = "2021"
 
 [profile.release]
@@ -13,7 +13,7 @@ lto = true
 [dependencies]
 clap = { version = "4.5", features = ["derive"] }
 clap_complete = { version = "4.5" }
-crossterm = { version = "0.28" }
+crossterm = { version = "0.29" }
 ctrlc = { version = "3.4" }
 dsc_lib = { path = "../dsc_lib" }
 indicatif = { version = "0.17" }
@@ -25,7 +25,7 @@ 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.33" }
+sysinfo = { version = "0.34" }
 thiserror = "2.0"
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }

dsc/Cargo.toml

@@ -11,6 +11,7 @@
       "pass-through",
       "config",
       "--as-group",
+      "--as-assert",
       "test",
       "--as-get",
       {
@@ -26,6 +27,7 @@
       "pass-through",
       "config",
       "--as-group",
+      "--as-assert",
       "test",
       {
         "jsonInputArg": "--input",
@@ -42,6 +44,7 @@
       "pass-through",
       "config",
       "--as-group",
+      "--as-assert",
       "test",
       "--as-config",
       {
@@ -59,7 +62,8 @@
     "4": "Invalid input format",
     "5": "Resource instance failed schema validation",
     "6": "Command cancelled",
-    "7": "Resource not found"
+    "7": "Resource not found",
+    "8": "Assertion failed"
   },
   "validate": {
     "executable": "dsc",

dsc/assertion.dsc.resource.json

@@ -23,5 +23,5 @@ resources:
         keyPath: HKLM\Software\Microsoft\Windows NT\CurrentVersion
         valueName: SystemRoot
         valueData:
-          # this is deliberately set to z: drive so that the assertion fails
-          String: Z:\Windows
+          # this is deliberately set to L: drive so that the assertion fails
+          String: L:\Windows

dsc/examples/assertion.dsc.yaml

@@ -73,6 +73,7 @@ testInputEmpty = "Expected input is required"
 [subcommand]
 actualStateNotObject = "actual_state is not an object"
 unexpectedTestResult = "Unexpected Group TestResult"
+assertionFailed = "Assertion failed for resource '%{resource_type}'"
 message = "message"
 currentDirectory = "current directory"
 noParameters = "No parameters specified"

dsc/locales/en-us.toml

@@ -58,6 +58,8 @@ pub enum SubCommand {
         // Used to inform when DSC is used as a group resource to modify it's output
         #[clap(long, hide = true)]
         as_group: bool,
+        #[clap(long, hide = true)]
+        as_assert: bool,
         // Used to inform when DSC is used as a include group resource
         #[clap(long, hide = true)]
         as_include: bool,