Merge pull request #1435 from SteveL-MSFT/3.2-p13

Update to version 3.2-preview.13

Author: SteveL-MSFT

Cargo.lock

@@ -148,9 +148,9 @@ base64 = { version = "0.22" }
 # dsc-lib, sshdconfig
 chrono = { version = "0.4" }
 # dsc, dsc-lib, dsc-bicep-ext, dscecho, registry, runcommandonset, sshdconfig, dsctest, test_group_resource
-clap = { version = "4.5", features = ["derive"] }
+clap = { version = "4.6", features = ["derive"] }
 # dsc
-clap_complete = { version = "4.5" }
+clap_complete = { version = "4.6" }
 # dsc-lib
 const-str = {version = "1.1" }
 # dsc, registry, dsc-lib-registry, sshdconfig
@@ -192,7 +192,7 @@ regex = { version = "1.12" }
 # registry, dsc-lib, dsc-lib-registry, dsctest
 registry = { version = "1.3" }
 # dsc
-rmcp = { version = "0.16" }
+rmcp = { version = "1.2" }
 # dsc_lib
 rt-format = { version = "0.3" }
 # dsc, dsc-lib, dsc-bicep-ext, dscecho, registry, dsc-lib-registry, runcommandonset, sshdconfig
@@ -214,11 +214,11 @@ syntect = { version = "5.3", features = ["default-fancy"], default-features = fa
 # dsc, process
 sysinfo = { version = "0.38" }
 # sshdconfig
-tempfile = { version = "3.25" }
+tempfile = { version = "3.27" }
 # dsc, dsc-lib, registry, dsc-lib-registry, sshdconfig
 thiserror = { version = "2.0" }
 # dsc, dsc-lib, dsc-bicep-ext
-tokio = { version = "1.49" }
+tokio = { version = "1.50" }
 # dsc-bicep-ext
 tokio-stream = { version = "0.1" }
 # dsc
@@ -244,7 +244,7 @@ tree-sitter-rust = { version = "0.24" }
 # registry, dsc-lib-registry, dsctest
 utfx = { version = "0.1" }
 # dsc-lib
-uuid = { version = "1.21", features = ["v4"] }
+uuid = { version = "1.22", features = ["v4"] }
 # dsc-lib, dsc-lib-jsonschema
 url = { version = "2.5" }
 # dsc-lib, dsc-lib-jsonschema

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dsc-bicep-ext"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "dsc-bicep-ext"

dsc-bicep-ext/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dsc"
-version = "3.2.0-preview.12"
-edition = "2021"
+version = "3.2.0-preview.13"
+edition = "2024"
 
 [dependencies]
 # external dependencies

dsc/Cargo.toml

@@ -39,13 +39,13 @@ impl Default for McpServer {
 #[tool_handler]
 impl ServerHandler for McpServer {
     fn get_info(&self) -> ServerInfo {
-        ServerInfo {
-            capabilities: ServerCapabilities::builder()
+        let mut info = ServerInfo::new(
+            ServerCapabilities::builder()
                 .enable_tools()
-                .build(),
-            instructions: Some(t!("mcp.mod.instructions").to_string()),
-            ..Default::default()
-        }
+                .build()
+        );
+        info.instructions = Some(t!("mcp.mod.instructions").to_string());
+        info
     }
 
     async fn initialize(&self, _request: InitializeRequestParams, _context: RequestContext<RoleServer>) -> Result<InitializeResult, McpError> {

dsc/src/mcp/mcp_server.rs

@@ -429,7 +429,9 @@ pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Op
     }
 
     // set DSC_TRACE_LEVEL for child processes
-    env::set_var(DSC_TRACE_LEVEL, tracing_level.to_string().to_ascii_lowercase());
+    unsafe {
+        env::set_var(DSC_TRACE_LEVEL, tracing_level.to_string().to_ascii_lowercase());
+    }
     info!("Trace-level is {:?}", tracing_setting.level);
 }
 
@@ -549,7 +551,9 @@ pub fn set_dscconfigroot(config_path: &str) -> String
 
     // Set env var so child processes (of resources) can use it
     debug!("{} '{config_root_path}'", t!("util.settingDscConfigRoot"));
-    env::set_var(DSC_CONFIG_ROOT, config_root_path);
+    unsafe {
+        env::set_var(DSC_CONFIG_ROOT, config_root_path);
+    }
 
     full_path.to_string_lossy().into_owned()
 }
@@ -625,11 +629,11 @@ fn parse_input_to_json_value(input: &str, context: &str) -> Result<serde_json::V
 /// Returns an error if the input cannot be parsed or is not an object
 fn params_to_map(params: &str, context: &str) -> Result<serde_json::Map<String, serde_json::Value>, DscError> {
     let value = parse_input_to_json_value(params, context)?;
-    
+
     let Some(map) = value.as_object().cloned() else {
         return Err(DscError::Parser(t!("util.parametersNotObject").to_string()));
     };
-    
+
     Ok(map)
 }
 
@@ -653,7 +657,7 @@ fn params_to_map(params: &str, context: &str) -> Result<serde_json::Map<String,
 /// - The merged result cannot be serialized to JSON
 pub fn merge_parameters(file_params: &str, inline_params: &str) -> Result<String, DscError> {
     use serde_json::Value;
-    
+
     // Convert both parameter inputs to maps
     let mut file_map = params_to_map(file_params, "FileParameters")?;
     let inline_map = params_to_map(inline_params, "InlineParameters")?;

dsc/src/util.rs

@@ -1,7 +1,7 @@
 [package]
 name = "dsc-lib-osinfo"
 version = "1.0.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 doctest = false

lib/dsc-lib-osinfo/Cargo.toml

@@ -3,7 +3,7 @@
 [package]
 name = "dsc-lib-pal"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 doctest = false