Merge branch 'PowerShell:main' into export-multi-methods

PowerShell · Oct 25, 2024 · 6f547da · 6f547da
2 parents 7aca82a + 27fe013
commit 6f547da
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 7 deletions.
diff --git a/dsc/Cargo.lock b/dsc/Cargo.lock
diff --git a/dsc/Cargo.toml b/dsc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.0.0-preview.11"
+version = "3.0.0-rc.1"
 edition = "2021"
 
 [profile.release]

diff --git a/dsc_lib/Cargo.lock b/dsc_lib/Cargo.lock
diff --git a/dsc_lib/Cargo.toml b/dsc_lib/Cargo.toml
@@ -25,10 +25,11 @@ tokio = { version = "1.40.0", features = ["full"] }
 tracing = "0.1.37"
 tracing-indicatif = { version = "0.3.6" }
 tree-sitter = "0.24.3"
+tree-sitter-rust = "0.23.0"
 tree-sitter-dscexpression = { path = "../tree-sitter-dscexpression" }
 
 [dev-dependencies]
 serde_yaml = "0.9.3"
 
 [build-dependencies]
-cc="1.1.30"
+cc="1.1"
diff --git a/tools/test_group_resource/Cargo.lock b/tools/test_group_resource/Cargo.lock
diff --git a/tree-sitter-dscexpression/Cargo.lock b/tree-sitter-dscexpression/Cargo.lock
diff --git a/tree-sitter-dscexpression/Cargo.toml b/tree-sitter-dscexpression/Cargo.toml
@@ -5,7 +5,7 @@ version = "1.0.0"
 keywords = ["incremental", "parsing", "DSCExpression"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/powershell/dsc"
-edition = "2018"
+edition = "2021"
 license = "MIT"
 
 build = "bindings/rust/build.rs"
@@ -20,8 +20,9 @@ include = [
 path = "bindings/rust/lib.rs"
 
 [dependencies]
+tree-sitter-rust = "0.23.0"
 tree-sitter = "0.24.3"
 tree-sitter-language = "0.1.2"
 
 [build-dependencies]
-cc = "1.1.29"
+cc = "1.1"