Merge pull request #637 from SteveL-MSFT/version-rc1

update version to rc.1
PowerShell · Feb 6, 2025 · fd13063 · fd13063
2 parents e1a3943 + b9bb7d2
commit fd13063
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -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

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-rc"
+version = "3.0.0-rc.1"
 edition = "2021"
 
 [profile.release]

diff --git a/dsc/tests/dsc_tracing.tests.ps1 b/dsc/tests/dsc_tracing.tests.ps1
@@ -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' {