Skip to content

Commit fd13063

Browse files
authored
Merge pull request #637 from SteveL-MSFT/version-rc1
update version to rc.1
2 parents e1a3943 + b9bb7d2 commit fd13063

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

build.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,12 @@ if ($packageType -eq 'msixbundle') {
544544
$productName += "-Preview"
545545
}
546546
# save preview number
547-
$previewNumber = $productVersion -replace '.*?-[a-z]+\.([0-9]+)', '$1'
547+
$previewNumber = [int]($productVersion -replace '.*?-[a-z]+\.([0-9]+)', '$1' | Out-String)
548+
$productLabel = $productVersion.Split('-')[1]
549+
if ($productLabel.StartsWith('rc')) {
550+
# if RC, we increment by 100 to ensure it's newer than the last preview
551+
$previewNumber += 100
552+
}
548553
# remove label from version
549554
$productVersion = $productVersion.Split('-')[0]
550555
# replace revision number with preview number

dsc/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dsc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dsc"
3-
version = "3.0.0-rc"
3+
version = "3.0.0-rc.1"
44
edition = "2021"
55

66
[profile.release]

dsc/tests/dsc_tracing.tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Describe 'tracing tests' {
8383
"@
8484

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

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

0 commit comments

Comments
 (0)