Skip to content

Commit 7ee6e7a

Browse files
authored
Merge pull request #609 from SteveL-MSFT/preview-12-version
Update version to `preview.12` and updates crate versions
2 parents e1471e8 + 6d00330 commit 7ee6e7a

File tree

5 files changed

+119
-41
lines changed

5 files changed

+119
-41
lines changed

dsc/Cargo.lock

+105-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dsc/Cargo.toml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dsc"
3-
version = "3.1.0-preview.1"
3+
version = "3.0.0-preview.12"
44
edition = "2021"
55

66
[profile.release]
@@ -17,16 +17,15 @@ crossterm = { version = "0.28" }
1717
ctrlc = { version = "3.4" }
1818
dsc_lib = { path = "../dsc_lib" }
1919
indicatif = { version = "0.17" }
20-
jsonschema = { version = "0.23", default-features = false }
20+
jsonschema = { version = "0.26", default-features = false }
2121
path-absolutize = { version = "3.1" }
22-
# reqwest = { version = "0.12.8", features = ["native-tls"], default-features = false }
2322
schemars = { version = "0.8" }
2423
serde = { version = "1.0", features = ["derive"] }
2524
serde_json = { version = "1.0", features = ["preserve_order"] }
2625
serde_yaml = { version = "0.9" }
2726
syntect = { version = "5.0", features = ["default-fancy"], default-features = false }
28-
sysinfo = { version = "0.32" }
29-
thiserror = "1.0"
30-
tracing = { version = "0.1.37" }
27+
sysinfo = { version = "0.33" }
28+
thiserror = "2.0"
29+
tracing = { version = "0.1" }
3130
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }
3231
tracing-indicatif = { version = "0.3" }

dsc/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn ctrlc_handler() {
8181
warn!("Ctrl-C received");
8282

8383
// get process tree for current process and terminate all processes
84-
let sys = System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()));
84+
let sys = System::new_with_specifics(RefreshKind::nothing().with_processes(ProcessRefreshKind::everything()));
8585
info!("Found {} processes", sys.processes().len());
8686
let Ok(current_pid) = get_current_pid() else {
8787
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.
145145
146146
Press any key to close this window
147147
";
148-
let sys = System::new_with_specifics(RefreshKind::new().with_processes(ProcessRefreshKind::new()));
148+
let sys = System::new_with_specifics(RefreshKind::nothing().with_processes(ProcessRefreshKind::everything()));
149149
// get current process
150150
let Ok(current_pid) = get_current_pid() else {
151151
return;

dsc/src/util.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,7 @@ pub fn validate_json(source: &str, schema: &Value, json: &Value) -> Result<(), D
443443
};
444444

445445
if let Err(err) = compiled_schema.validate(json) {
446-
let mut error = format!("'{source}' failed validation: ");
447-
for e in err {
448-
error.push_str(&format!("\n{e} "));
449-
}
450-
return Err(DscError::Validation(error));
446+
return Err(DscError::Validation(format!("'{source}' failed validation: {err}")));
451447
};
452448

453449
Ok(())

runcommandonset/Cargo.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)