Merge branch 'main' into importer

PowerShell · Sep 18, 2024 · 81afa2e · 81afa2e
2 parents b8afe62 + 6b57f6f
commit 81afa2e
Show file tree

Hide file tree

Showing 18 changed files with 1,160 additions and 953 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -13,7 +13,8 @@ param(
     [switch]$GetPackageVersion,
     [switch]$SkipLinkCheck,
     [switch]$UseX64MakeAppx,
-    [switch]$UseCratesIO
+    [switch]$UseCratesIO,
+    [switch]$UpdateLockFile
 )
 
 if ($GetPackageVersion) {
@@ -240,7 +241,12 @@ if (!$SkipBuild) {
             Push-Location "$PSScriptRoot/$project" -ErrorAction Stop
 
             if ($project -eq 'tree-sitter-dscexpression') {
-                ./build.ps1
+                if ($UpdateLockFile) {
+                    cargo generate-lockfile
+                }
+                else {
+                    ./build.ps1
+                }
             }
 
             if (Test-Path "./Cargo.toml")
@@ -259,7 +265,12 @@ if (!$SkipBuild) {
                     }
                 }
                 else {
-                    cargo build @flags
+                    if ($UpdateLockFile) {
+                        cargo generate-lockfile
+                    }
+                    else {
+                        cargo build @flags
+                    }
                 }
             }