Merge branch 'main' into allow-module-without-version

dsc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.1.0-preview.1"
+version = "3.0.0-preview.12"
 edition = "2021"
 
 [profile.release]
@@ -17,16 +17,15 @@ crossterm = { version = "0.28" }
 ctrlc = { version = "3.4" }
 dsc_lib = { path = "../dsc_lib" }
 indicatif = { version = "0.17" }
-jsonschema = { version = "0.23", default-features = false }
+jsonschema = { version = "0.26", default-features = false }
 path-absolutize = { version = "3.1" }
-# reqwest = { version = "0.12.8", features = ["native-tls"], default-features = false }
 schemars = { version = "0.8" }
 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.32" }
-thiserror = "1.0"
-tracing = { version = "0.1.37" }
+sysinfo = { version = "0.33" }
+thiserror = "2.0"
+tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }
 tracing-indicatif = { version = "0.3" }

dsc/src/main.rs

@@ -81,7 +81,7 @@ fn ctrlc_handler() {
     warn!("Ctrl-C received");
 
     // get process tree for current process and terminate all processes
-    let sys = System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()));
+    let sys = System::new_with_specifics(RefreshKind::nothing().with_processes(ProcessRefreshKind::everything()));
     info!("Found {} processes", sys.processes().len());
     let Ok(current_pid) = get_current_pid() else {
         error!("Could not get current process id");
@@ -145,7 +145,7 @@ Visit https://aka.ms/dscv3-docs for more information on how to use DSC.exe.
 
 Press any key to close this window
 ";
-    let sys = System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()));
+    let sys = System::new_with_specifics(RefreshKind::nothing().with_processes(ProcessRefreshKind::everything()));
     // get current process
     let Ok(current_pid) = get_current_pid() else {
         return;

dsc/src/util.rs

@@ -443,11 +443,7 @@ pub fn validate_json(source: &str, schema: &Value, json: &Value) -> Result<(), D
     };
 
     if let Err(err) = compiled_schema.validate(json) {
-        let mut error = format!("'{source}' failed validation: ");
-        for e in err {
-            error.push_str(&format!("\n{e} "));
-        }
-        return Err(DscError::Validation(error));
+        return Err(DscError::Validation(format!("'{source}' failed validation: {err}")));
     };
 
     Ok(())