Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,12 @@ if ($packageType -eq 'msixbundle') {
$productName += "-Preview"
}
# save preview number
$previewNumber = $productVersion -replace '.*?-[a-z]+\.([0-9]+)', '$1'
$previewNumber = [int]($productVersion -replace '.*?-[a-z]+\.([0-9]+)', '$1' | Out-String)
$productLabel = $productVersion.Split('-')[1]
if ($productLabel.StartsWith('rc')) {
# if RC, we increment by 100 to ensure it's newer than the last preview
$previewNumber += 100
}
# remove label from version
$productVersion = $productVersion.Split('-')[0]
# replace revision number with preview number
Expand Down
2 changes: 1 addition & 1 deletion dsc/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dsc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dsc"
version = "3.0.0-rc"
version = "3.0.0-rc.1"
edition = "2021"

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion dsc/tests/dsc_tracing.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Describe 'tracing tests' {
"@

$out = (dsc -l $level config get -i $configYaml 2> $null) | ConvertFrom-Json
$out.results[0].result.actualState.level | Should -BeExactly $level
$out.results[0].result.actualState.level | Should -BeExactly $level -Because ($out | Out-String)
}

It 'Pass-through tracing should only emit JSON for child processes' {
Expand Down