Skip to content

Commit

Permalink
Merge pull request #551 from SteveL-MSFT/update-preview11
Browse files Browse the repository at this point in the history
Update crates and dsc version
  • Loading branch information
SteveL-MSFT authored Sep 18, 2024
2 parents 623b1fb + 3912bb5 commit 6b57f6f
Show file tree
Hide file tree
Showing 18 changed files with 1,160 additions and 953 deletions.
17 changes: 14 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ param(
[switch]$GetPackageVersion,
[switch]$SkipLinkCheck,
[switch]$UseX64MakeAppx,
[switch]$UseCratesIO
[switch]$UseCratesIO,
[switch]$UpdateLockFile
)

if ($GetPackageVersion) {
Expand Down Expand Up @@ -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")
Expand All @@ -259,7 +265,12 @@ if (!$SkipBuild) {
}
}
else {
cargo build @flags
if ($UpdateLockFile) {
cargo generate-lockfile
}
else {
cargo build @flags
}
}
}

Expand Down
Loading

0 comments on commit 6b57f6f

Please sign in to comment.